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

smartpi/__init__.py

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

smartpi/base_driver.py

@@ -450,9 +450,9 @@ def single_operate_sensor(op_struct: bytes) -> Optional[bytes]:
         response =process_received_data()
         if response:
             display_data = response[6:-3]
-            for x in display_data:
-                print(f"{x:02X}", end=' ')
-            print("\n")
+#            for x in display_data:
+#                print(f"{x:02X}", end=' ')
+#            print("\n")
             return display_data
         else:
             if time.time() - start_time > 3:

smartpi/color_sensor.py

@@ -8,10 +8,10 @@ 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:
+    response = base_driver.single_operate_sensor(color_str)        
+    if response == -1:
         return -1
+    else:
+        return response[4]
         
         

smartpi/humidity.py

@@ -6,15 +6,14 @@ 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[4]=1 
-    response = base_driver.single_operate_sensor(humiture_str)
-    if response:
-        return response[4]
-    else:
+    humi_str=[0XA0, 0X0C, 0X01, 0X71, 0X00, 0XBE]
+    humi_str[0]=0XA0+port
+    humi_str[4]=0X01 
+    response = base_driver.single_operate_sensor(humi_str)
+    if response == -1:
         return -1
-
+    else:
+        return response[4]
 
 
 

smartpi/light_sensor.py

@@ -8,35 +8,11 @@ def get_value(port:bytes) -> Optional[bytes]:
     light_str=[0xA0, 0x02, 0x00, 0xBE]
     light_str[0]=0XA0+port
     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:
+    response = base_driver.single_operate_sensor(light_str)       
+    if response == -1:
         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:
         light_data=response[4:-1]
         light_num=int.from_bytes(light_data, byteorder='big', signed=True)
         return light_num
-    else:
-        return -1
         

smartpi/motor.py

@@ -8,13 +8,13 @@ from smartpi import base_driver
 def get_motor_encoder(port:bytes) -> Optional[bytes]:
     motor_str=[0xA0, 0x01, 0x01, 0xBE]           
     motor_str[0]=0XA0+port       
-    response = base_driver.single_operate_sensor(motor_str)
-    if response:
+    response = base_driver.single_operate_sensor(motor_str)        
+    if response == -1:
+        return -1
+    else:
         code_data=response[4:-1]
         code_num=int.from_bytes(code_data, byteorder='big', signed=True)
         return code_num
-    else:
-        return -1
         
 #����������� port:����M�˿ڣ�
 def reset_motor_encoder(port:bytes) -> Optional[bytes]:
@@ -135,17 +135,17 @@ def set_motor_constspeed(port:bytes,speed:int) -> Optional[bytes]:
     else:
         return -1
         
-#��������ȡ port:����M�˿ڣ�
+#�����ٶȶ�ȡ 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:
+    response = base_driver.single_operate_sensor(motor_str)        
+    if response == -1:
+        return -1
+    else:
         code_data=response[4:-1]
         code_num=int.from_bytes(code_data, byteorder='big', signed=True)
-        return code_num
-    else:
-        return -1        
+        return code_num   
 
   
 

smartpi/servo.py

@@ -69,13 +69,13 @@ def set_init(port:bytes) -> Optional[bytes]:
 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:
+    response = base_driver.single_operate_sensor(servo_str)       
+    if response == -1:
+        return -1
+    else:
         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]:
@@ -135,13 +135,13 @@ def reset_encode(port:bytes) -> Optional[bytes]:
 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:
+    response = base_driver.single_operate_sensor(servo_str)        
+    if response == -1:
+        return -1
+    else:
         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

@@ -6,12 +6,12 @@ from smartpi import base_driver
 
 #�¶ȶ�ȡ port:����P�˿ڣ�
 def get_value(port:bytes) -> Optional[bytes]:
-    temp_str=[0xA0, 0x0C, 0x01, 0x71, 0x00, 0xBE]
+    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 response[4]
-    else:
+    if response == -1:
         return -1
+    else:
+        return response[4]
         

smartpi/touch_sensor.py

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

smartpi/ultrasonic.py

@@ -9,10 +9,11 @@ def get_value(port:bytes) -> Optional[bytes]:
     ultrasonic_str[0]=0XA0+port
     ultrasonic_str[2]=1 
     response = base_driver.single_operate_sensor(ultrasonic_str)
-    if response:
+        
+    if response == -1:
+        return -1
+    else:
         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.4.dist-info → smartpi-0.1.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: smartpi
-Version: 0.1.4
+Version: 0.1.5
 Summary: A library use for H2-RCU
 Author: ZMROBO
 Classifier: Programming Language :: Python :: 3

smartpi-0.1.5.dist-info/RECORD

@@ -0,0 +1,15 @@
+smartpi/__init__.py,sha256=YiOQYNSL9JyXp6tMC2Qk7gNu5e8xpCGFFzmLdnoVEG4,54
+smartpi/base_driver.py,sha256=LNdUw4LyMuUTZyw8PGj0fw6sPc6qYDX_yT23KfqyoDA,17444
+smartpi/color_sensor.py,sha256=q6NcaE8lXbU4BXEeiWYVoJH-X3ot4Sb_u_0vpiJy6Ho,460
+smartpi/humidity.py,sha256=06NEK1KyH1ZC5QOuWoXxBkVAp39wRmt-27ntOIjw1jc,447
+smartpi/led.py,sha256=f8K7ebHFy9kIlCLWKEyQbmPQv4z2TMTNGs1vaKOtMAs,495
+smartpi/light_sensor.py,sha256=KjIXoEQKmvTk7qQ8GIl0ZUXaPw_vVsB8qCXk5Fiw-4g,511
+smartpi/motor.py,sha256=ePBKQu7FSrqjnM-d1kDcT1nYMLpnLeALJ0agI2dznoQ,4447
+smartpi/servo.py,sha256=n6T_3F9WsZYatogg8hnhvSlXvJaSg2zc5wjuTD_qyqI,4519
+smartpi/temperature.py,sha256=5-T8LYZXhqwdtYFZLvuDcMtA89PyEzSZkK-RghFZLgQ,424
+smartpi/touch_sensor.py,sha256=R7LRPvhEeLGzXkujp2_Jb3D4Hb0y0HVRbcfIZ3ptMak,402
+smartpi/ultrasonic.py,sha256=Xu4EqeFWadsepyRCOdJIXl3Uu-Y8_9pkw3EWsRXWyAs,555
+smartpi-0.1.5.dist-info/METADATA,sha256=5B1ruRb_8L9s_Pq7s-zJrhye8PgYn2gN-uU68DgZi3k,310
+smartpi-0.1.5.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+smartpi-0.1.5.dist-info/top_level.txt,sha256=PoLhUCmWAiQUg5UeN2fS-Y1iQyBbF2rdUlizXtpHGRQ,8
+smartpi-0.1.5.dist-info/RECORD,,

smartpi-0.1.4.dist-info/RECORD

@@ -1,15 +0,0 @@
-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,,