smartpi 0.1.3__py3-none-any.whl → 0.1.4__py3-none-any.whl

smartpi/__init__.py

@@ -1,4 +1,4 @@
 __all__ = ["base_driver"]
 
-__version__ = "0.1.3"
+__version__ = "0.1.4"
 

smartpi/base_driver.py

@@ -290,7 +290,7 @@ def write_device_name(send_data: str) -> Optional[bytes]:
                 buffer.clear() 
                 return -1
         
-"""读取连接方式"""#长度位少了1
+"""读取连接方式"""
 def read_connected() -> Optional[bytes]: 
     write_data(READ_CONNECT_H, READ_CONNECT_L)
     start_time = time.time()
@@ -440,7 +440,7 @@ def read_peripheral() -> Optional[bytes]:
             if time.time() - start_time > 3:
                 print("读取超时")
                 buffer.clear() 
-                return -1 
+                return -1
 
 """单次操作外设"""         
 def single_operate_sensor(op_struct: bytes) -> Optional[bytes]:       
@@ -458,7 +458,17 @@ def single_operate_sensor(op_struct: bytes) -> Optional[bytes]:
             if time.time() - start_time > 3:
                 print("读取超时")
                 buffer.clear() 
-                return -1    
+                return -1  
+
+#P端口初始化释放     
+def P_port_init(port:bytes) -> Optional[bytes]:
+    servo_str=[0xA0, 0x0F, 0x00, 0xBE]
+    servo_str[0]=0XA0+port
+    response = single_operate_sensor(servo_str)
+    if response:
+        return 0
+    else:
+        return -1
               
 """从机模式转换"""         
 def mode_change(send_data: str) -> Optional[bytes]:     

smartpi/color_sensor.py

@@ -3,4 +3,15 @@ import time
 from typing import List, Optional
 from smartpi import base_driver
 
-
+#����ֵ��1-��ɫ��2-��ɫ��3-��ɫ��4-��ɫ��5-��ɫ��6-��ɫ
+def get_value(port:bytes) -> Optional[bytes]:
+    color_str=[0xA0, 0x04, 0x00, 0xBE]
+    color_str[0]=0XA0+port
+    color_str[2]=1
+    response = base_driver.single_operate_sensor(color_str)
+    if response:
+        return response[4]
+    else:
+        return -1
+        
+        

smartpi/humidity.py

@@ -8,10 +8,10 @@ from smartpi import base_driver
 def get_value(port:bytes) -> Optional[bytes]:
     humiture_str=[0xA0, 0x0C, 0x01, 0x71, 0x00, 0xBE]
     humiture_str[0]=0XA0+port
-    humiture_str[2]=0 
+    humiture_str[4]=1 
     response = base_driver.single_operate_sensor(humiture_str)
     if response:
-        return 0
+        return response[4]
     else:
         return -1
 

smartpi/light_sensor.py

@@ -3,25 +3,40 @@ import time
 from typing import List, Optional
 from smartpi import base_driver
 
-
-
-#����ȡ port:����P�˿ڣ�command:1:��ȡ��2:���ƣ�3:�صƣ�
-#def get_value(port:bytes,command:bytes) -> Optional[bytes]:
-#    light_str=[0xA0, 0x02, 0x00, 0xBE]
-#    light_str[0]=0XA0+port
-#    light_str[2]=command 
-#    response = base_driver.single_operate_sensor(light_str)
-#    if response:
-#        return 0
-#    else:
-#        return -1
         
 def get_value(port:bytes) -> Optional[bytes]:
     light_str=[0xA0, 0x02, 0x00, 0xBE]
     light_str[0]=0XA0+port
-    light_str[2]=1 
+    light_str[2]=1
+    response = base_driver.single_operate_sensor(light_str)
+    if response:
+        light_data=response[4:-1]
+        light_num=int.from_bytes(light_data, byteorder='big', signed=True)
+        return light_num
+    else:
+        return -1
+        
+def light_on(port:bytes) -> Optional[bytes]:
+    light_str=[0xA0, 0x02, 0x00, 0xBE]
+    light_str[0]=0XA0+port
+    light_str[2]=2
+    response = base_driver.single_operate_sensor(light_str)
+    if response:
+        light_data=response[4:-1]
+        light_num=int.from_bytes(light_data, byteorder='big', signed=True)
+        return light_num
+    else:
+        return -1
+        
+def light_off(port:bytes) -> Optional[bytes]:
+    light_str=[0xA0, 0x02, 0x00, 0xBE]
+    light_str[0]=0XA0+port
+    light_str[2]=3
     response = base_driver.single_operate_sensor(light_str)
     if response:
-        return 0
+        light_data=response[4:-1]
+        light_num=int.from_bytes(light_data, byteorder='big', signed=True)
+        return light_num
     else:
-        return -1
+        return -1
+        

smartpi/motor.py

@@ -4,15 +4,6 @@ from typing import List, Optional
 from smartpi import base_driver
 
 
-##############################################################
-#            motor.write_motor_dir(1,0)
-#            motor.write_motor_speed(1,100)
-#            time.sleep(0.5)
-#            motor.write_motor_dir(1,1)
-#            motor.write_motor_speed(1,50)
-#            time.sleep(0.5)
-##############################################################
-
 #��������ȡ port:����M�˿ڣ�
 def get_motor_encoder(port:bytes) -> Optional[bytes]:
     motor_str=[0xA0, 0x01, 0x01, 0xBE]           
@@ -46,18 +37,28 @@ def set_motor_direction(port:bytes,direc:bytes) -> Optional[bytes]:
     else:
         return -1
         
-#�������ٶ�ת�� port:����M�˿ڣ�speed:0~100
-def set_motor(port:bytes,speed:bytes) -> Optional[bytes]:
+#�����ٶ�ת�� port:����M�˿ڣ�speed:-100~100
+def set_motor(port:bytes,speed:int) -> Optional[bytes]:
     motor_str=[0xA0, 0x01, 0x02, 0x71, 0x00, 0xBE]           
     motor_str[0]=0XA0+port
-    motor_str[4]=speed
+    if speed>100:
+        m_par=100
+    elif speed>=0 and speed<=100:
+        m_par=speed        
+    elif speed<-100:
+        m_par=156
+    elif speed<=0 and speed>=-100:
+        m_par=256+speed
+        
+    motor_str[4]=m_par
+        
     response = base_driver.single_operate_sensor(motor_str)
     if response:
         return 0
     else:
         return -1
         
-#����ֹͣ port:����M�˿ڣ�speed:0~100
+#����ֹͣ port:����M�˿ڣ�
 def set_motor_stop(port:bytes) -> Optional[bytes]:
     motor_str=[0xA0, 0x01, 0x0B, 0xBE]           
     motor_str[0]=0XA0+port
@@ -67,18 +68,85 @@ def set_motor_stop(port:bytes) -> Optional[bytes]:
     else:
         return -1
         
-#���������� port:����M�˿ڣ�speed:0~100��code:0~65535
-def motor_servoctl(port:bytes,speed:bytes,code:int) -> Optional[bytes]:
+#���������� port:����M�˿ڣ�speed:-100~100��code:0~65535
+def set_motor_angle(port:bytes,speed:int,degree:int) -> Optional[bytes]:
     motor_str=[0xA0, 0x01, 0x04, 0x81, 0x00, 0x81, 0x00, 0x00, 0xBE]           
     motor_str[0]=0XA0+port
-    motor_str[4]=speed
-    motor_str[6]=code//256
-    motor_str[7]=code%256
+    
+    if speed>100:
+        m_par=100
+    elif speed>=0 and speed<=100:
+        m_par=speed        
+    elif speed<-100:
+        m_par=156
+    elif speed<=0 and speed>=-100:
+        m_par=256+speed
+        
+    motor_str[4]=m_par
+    motor_str[6]=degree//256
+    motor_str[7]=degree%256
     response = base_driver.single_operate_sensor(motor_str)
     if response:
         return 0
     else:
         return -1
         
+#���ﶨʱת�� port:����M�˿ڣ�speed:-100~100��second:1~256
+def set_motor_second(port:bytes,speed:int,second:bytes) -> Optional[bytes]:
+    motor_str=[0xA0, 0x01, 0x08, 0x81, 0x00, 0x71, 0x00, 0xBE]           
+    motor_str[0]=0XA0+port
+    
+    if speed>100:
+        m_par=100
+    elif speed>=0 and speed<=100:
+        m_par=speed        
+    elif speed<-100:
+        m_par=156
+    elif speed<=0 and speed>=-100:
+        m_par=256+speed
+        
+    motor_str[4]=m_par
+    motor_str[6]=second
+    response = base_driver.single_operate_sensor(motor_str)
+    if response:
+        return 0
+    else:
+        return -1
+
+#���ﶨ��ת�� port:����M�˿ڣ�speed:-100~100
+def set_motor_constspeed(port:bytes,speed:int) -> Optional[bytes]:
+    motor_str=[0xA0, 0x01, 0x09, 0x71, 0x00, 0xBE]           
+    motor_str[0]=0XA0+port
+    
+    if speed>100:
+        m_par=100
+    elif speed>=0 and speed<=100:
+        m_par=speed        
+    elif speed<-100:
+        m_par=156
+    elif speed<=0 and speed>=-100:
+        m_par=256+speed
+        
+    motor_str[4]=m_par
+    
+    response = base_driver.single_operate_sensor(motor_str)
+    if response:
+        return 0
+    else:
+        return -1
+        
+#��������ȡ port:����M�˿ڣ�
+def get_motor_speed(port:bytes) -> Optional[bytes]:
+    motor_str=[0xA0, 0x01, 0x10, 0xBE]           
+    motor_str[0]=0XA0+port       
+    response = base_driver.single_operate_sensor(motor_str)
+    if response:
+        code_data=response[4:-1]
+        code_num=int.from_bytes(code_data, byteorder='big', signed=True)
+        return code_num
+    else:
+        return -1        
+
+  
 
         

smartpi/servo.py

@@ -4,22 +4,145 @@ from typing import List, Optional
 from smartpi import base_driver
 
 
-###############################################
-#                  servo.servo_operate(1,1,0)                  
-#                  time.sleep(0.5)
-#                  servo.servo_operate(1,1,180)
-#                  time.sleep(0.5)
-###############################################
-
-#������� port:����P�˿ڣ�command:1:����  angle:�Ƕ�
-def servo_operate(port:bytes,command:bytes,angle:bytes) -> Optional[bytes]:
+#С������� port:����P�˿ڣ�angle:�Ƕ�0~270��
+def steer_angle(port:bytes,angle:bytes) -> Optional[bytes]:
     servo_str=[0xA0, 0x0E, 0x01, 0x71, 0x00, 0xBE]
     servo_str[0]=0XA0+port
-    servo_str[2]=command
     servo_str[4]=angle
     response = base_driver.single_operate_sensor(servo_str)
     if response:
         return 0
     else:
         return -1
-        
+        
+#С������� port:����P�˿ڣ�angle:�Ƕ�0~270��second:1~256
+def steer_angle_delay(port:bytes,angle:bytes,second:bytes) -> Optional[bytes]:
+    servo_str=[0xA0, 0x10, 0x01, 0x81, 0x00, 0x00, 0x81, 0x00, 0xBE]
+    servo_str[0]=0XA0+port
+    servo_str[4]=angle//256
+    servo_str[5]=angle%256
+    servo_str[7]=second
+    response = base_driver.single_operate_sensor(servo_str)
+    if response:
+        return 0
+    else:
+        return -1
+        
+#BE-9528������� port:����P�˿ڣ�angle:�Ƕ�(0~360)��speed:�ٶ�(0~100)��
+def set_angle_speed(port:bytes,angle:bytes,speed:bytes) -> Optional[bytes]:
+    servo_str=[0xA0, 0x0D, 0x01, 0x81, 0x00, 0x00, 0x81, 0x00, 0xBE]
+    servo_str[0]=0XA0+port
+    servo_str[4]=angle//256
+    servo_str[5]=angle%256
+    servo_str[7]=speed
+    response = base_driver.single_operate_sensor(servo_str)
+    if response:
+        return 0
+    else:
+        return -1
+        
+#���ֶ��ת�����Ƕ���ʱʱ�� port:����P�˿ڣ�angle:�Ƕ�(0~360)��ms:��ʱʱ��(0~65535)��
+def set_angle_ms(port:bytes,angle:bytes,ms:int) -> Optional[bytes]:
+    servo_str=[0xA0, 0x11, 0x01, 0x81, 0x00, 0x00, 0x81, 0x00, 0x00, 0xBE]
+    servo_str[0]=0XA0+port
+    servo_str[4]=angle//256
+    servo_str[5]=angle%256
+    servo_str[7]=ms//256
+    servo_str[8]=ms%256
+    response = base_driver.single_operate_sensor(servo_str)
+    if response:
+        return 0
+    else:
+        return -1
+
+#���ֶ����λ port:����P�˿ڣ�
+def set_init(port:bytes) -> Optional[bytes]:
+    servo_str=[0xA0, 0x12, 0x01, 0xBE]
+    servo_str[0]=0XA0+port
+    response = base_driver.single_operate_sensor(servo_str)
+    if response:
+        return 0
+    else:
+        return -1
+        
+#��ȡ���ֶ���Ƕ� port:����P�˿ڣ�
+def get_angle(port:bytes) -> Optional[bytes]:
+    servo_str=[0xA0, 0x13, 0x01, 0xBE]
+    servo_str[0]=0XA0+port
+    response = base_driver.single_operate_sensor(servo_str)
+    if response:
+        angle_data=response[4:-1]
+        angle_num=int.from_bytes(angle_data, byteorder='big', signed=True)
+        return angle_num
+    else:
+        return -1
+        
+#���ֶ���ٶ�ת�� port:����P�˿ڣ�
+def set_speed(port:bytes,speed:int) -> Optional[bytes]:
+    servo_str=[0xA0, 0x14, 0x01, 0x71, 0x00, 0xBE]
+    servo_str[0]=0XA0+port
+    if speed>100:
+        m_par=100
+    elif speed>=0 and speed<=100:
+        m_par=speed        
+    elif speed<-100:
+        m_par=156
+    elif speed<=0 and speed>=-100:
+        m_par=256+speed
+        
+    servo_str[4]=m_par
+    response = base_driver.single_operate_sensor(servo_str)
+    if response:
+        return 0
+    else:
+        return -1      
+        
+#���ֶ������ת�� port:����P�˿ڣ�code:����(0~65535)��speed:�ٶ�(-100~100)��
+def set_code_speed(port:bytes,code:int,speed:int) -> Optional[bytes]:
+    servo_str=[0xA0, 0x15, 0x01, 0x81, 0x00, 0x00, 0x71, 0x00, 0xBE]
+    servo_str[0]=0XA0+port
+    
+    servo_str[4]=code//256
+    servo_str[5]=code%256
+    
+    if speed>100:
+        m_par=100
+    elif speed>=0 and speed<=100:
+        m_par=speed        
+    elif speed<-100:
+        m_par=156
+    elif speed<=0 and speed>=-100:
+        m_par=256+speed      
+    servo_str[7]=m_par
+
+    response = base_driver.single_operate_sensor(servo_str)
+    if response:
+        return 0
+    else:
+        return -1  
+
+#���ֶ������ֵ���� port:����P�˿ڣ�
+def reset_encode(port:bytes) -> Optional[bytes]:
+    servo_str=[0xA0, 0x16, 0x01, 0xBE]
+    servo_str[0]=0XA0+port
+    response = base_driver.single_operate_sensor(servo_str)
+    if response:
+        return 0
+    else:
+        return -1
+        
+#��ȡ���ֶ������ֵ port:����P�˿ڣ�
+def get_encoder(port:bytes) -> Optional[bytes]:
+    servo_str=[0xA0, 0x17, 0x01, 0xBE]
+    servo_str[0]=0XA0+port
+    response = base_driver.single_operate_sensor(servo_str)
+    if response:
+        code_data=response[4:-1]
+        code_num=int.from_bytes(code_data, byteorder='big', signed=True)
+        return code_num
+    else:
+        return -1
+
+
+
+

smartpi/temperature.py

@@ -4,15 +4,14 @@ from typing import List, Optional
 from smartpi import base_driver
 
 
-
 #�¶ȶ�ȡ port:����P�˿ڣ�
 def get_value(port:bytes) -> Optional[bytes]:
-    humiture_str=[0xA0, 0x0C, 0x01, 0x71, 0x00, 0xBE]
-    humiture_str[0]=0XA0+port
-    humiture_str[2]=1 
-    response = base_driver.single_operate_sensor(humiture_str)
+    temp_str=[0xA0, 0x0C, 0x01, 0x71, 0x00, 0xBE]
+    temp_str[0]=0XA0+port
+    temp_str[4]=0 
+    response = base_driver.single_operate_sensor(temp_str)
     if response:
-        return 0
+        return response[4]
     else:
         return -1
         

smartpi/touch_sensor.py

@@ -9,7 +9,7 @@ def get_value(port:bytes) -> Optional[bytes]:
     read_sw_str[0]=0XA0+port   
     response = base_driver.single_operate_sensor(read_sw_str)
     if response:
-        return 0
+        return response[4]
     else:
         return -1
         

smartpi/ultrasonic.py

@@ -2,17 +2,6 @@
 import time
 from typing import List, Optional
 from smartpi import base_driver
-
-#��������ȡ port:����P�˿ڣ�command:1:��ȡ��
-#def get_value(port:bytes,command:bytes) -> Optional[bytes]:
-#    ultrasonic_str=[0xA0, 0x06, 0x00, 0xBE]
-#    ultrasonic_str[0]=0XA0+port
-#    ultrasonic_str[2]=command 
-#    response = base_driver.single_operate_sensor(ultrasonic_str)
-#    if response:
-#        return 0
-#    else:
-#        return -1
         
         
 def get_value(port:bytes) -> Optional[bytes]:
@@ -21,7 +10,9 @@ def get_value(port:bytes) -> Optional[bytes]:
     ultrasonic_str[2]=1 
     response = base_driver.single_operate_sensor(ultrasonic_str)
     if response:
-        return 0
+        distance_data=response[4:-1]
+        distance_num=int.from_bytes(distance_data, byteorder='big', signed=True)
+        return distance_num
     else:
         return -1
         

{smartpi-0.1.3.dist-info → smartpi-0.1.4.dist-info}/METADATA

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: smartpi
-Version: 0.1.3
+Version: 0.1.4
 Summary: A library use for H2-RCU
-Author-email: Driver_cai <1547363120@qq.com>
+Author: ZMROBO
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent

smartpi-0.1.4.dist-info/RECORD

@@ -0,0 +1,15 @@
+smartpi/__init__.py,sha256=Pavr-N-hqEpqeTD1ck9SZw9vGtn_Ju7cbQF81qkkDxg,54
+smartpi/base_driver.py,sha256=xnAfn8PjaJUhlFLxKRXDbtKY5nmp_yiDGtx4lyHEp9U,17441
+smartpi/color_sensor.py,sha256=HJAUGO8CPaoodgLwgzx_LVdvf0MoG63fg91-Y5Qp3fk,446
+smartpi/humidity.py,sha256=Y8vLrK8FD5hdR_KshQxka2ygfJcCbuWs48gGr7zBqu4,456
+smartpi/led.py,sha256=f8K7ebHFy9kIlCLWKEyQbmPQv4z2TMTNGs1vaKOtMAs,495
+smartpi/light_sensor.py,sha256=QdY5jB_yg0mh3r7eUBsULqAEmQgaQgaUQHnKR0z3FAs,1279
+smartpi/motor.py,sha256=igk9OFJjsS4nq16Sfl8s1ok8qolALreTFWXUeuDmHi4,4424
+smartpi/servo.py,sha256=NFaoiDPdgs6wUklNWhL175CHIF0dJSRNDyOYRfum1xM,4492
+smartpi/temperature.py,sha256=FUSoR7FeLZ4a_xj7ej60jXqXbX1frUTz3wDXzSTkob8,418
+smartpi/touch_sensor.py,sha256=Y491KYiQBljX3IAvldld3Z8nXkBOAqqx7cTXda3Y-tA,396
+smartpi/ultrasonic.py,sha256=lGPJRxDZN_uIIxqFMUa715miuN7ZXoKJ9npD03dyuXU,539
+smartpi-0.1.4.dist-info/METADATA,sha256=fevHCCy6ZRYLCt1tl8cHMi-eIC8WHRIMc768xVPaIzo,310
+smartpi-0.1.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+smartpi-0.1.4.dist-info/top_level.txt,sha256=PoLhUCmWAiQUg5UeN2fS-Y1iQyBbF2rdUlizXtpHGRQ,8
+smartpi-0.1.4.dist-info/RECORD,,

smartpi-0.1.3.dist-info/RECORD

@@ -1,19 +0,0 @@
-smartpi/GUI.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-smartpi/__init__.py,sha256=4UycFLLmMwwRxajcaSr0T68R5vTZc35EXNWL9NN2hsc,54
-smartpi/base_driver.py,sha256=EIJp-H02io5S09u7oQTxV8plIfCcf9yvFUxhwVPF0zc,17197
-smartpi/color_sensor.py,sha256=COa4bh_yrcBMJbb-iFCf4k5fNwfEdpYvPdTbIwFis4M,101
-smartpi/humidity.py,sha256=CJVjulD4Gk_c9iwy4zmaGLv-Ta6M00koDmR2qfahkZ4,446
-smartpi/led.py,sha256=f8K7ebHFy9kIlCLWKEyQbmPQv4z2TMTNGs1vaKOtMAs,495
-smartpi/light_sensor.py,sha256=PHonOg7d3POjZnB6uETHeOQk8dWszxNoMfn6u9Tl1ow,726
-smartpi/motor.py,sha256=NhV4xNCVTgENKji4pBmq0K1wxr_qQgJySYiReC3e1lM,2688
-smartpi/move.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-smartpi/photosensitive.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-smartpi/servo.py,sha256=uoitiCWzh4dnfztpXXo5ABkGF-a3qdvXMxjlIBZZQaU,783
-smartpi/temperature.py,sha256=p89_AYIeEQsF7UKKnTexOCIRNXipYKKZWrULqjKeMLM,426
-smartpi/touch_sensor.py,sha256=MyzghSoTkwAGp2_uNemYKRu9zeR3A2PeW3f0S8su3SI,386
-smartpi/trace.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-smartpi/ultrasonic.py,sha256=xdSZe6uyihbfaBLiGmFahKYXTsOgVailMyq5ZYHrlFU,768
-smartpi-0.1.3.dist-info/METADATA,sha256=b7bLyKyuslaR_vecXKPVVjUl4rToY3XaJ2Txi4hiyTk,340
-smartpi-0.1.3.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-smartpi-0.1.3.dist-info/top_level.txt,sha256=PoLhUCmWAiQUg5UeN2fS-Y1iQyBbF2rdUlizXtpHGRQ,8
-smartpi-0.1.3.dist-info/RECORD,,