HandsON-BuildHat-API 1.0.7__tar.gz → 1.0.9__tar.gz

{handson_buildhat_api-1.0.7/src/HandsON_BuildHat_API.egg-info → handson_buildhat_api-1.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: HandsON-BuildHat-API
-Version: 1.0.7
+Version: 1.0.9
 Summary: A third-party API for controlling LEGO SPIKE devices
 Author-email: HaNeul Jung <hnjung@handsontech.co.kr>
 License: Proprietary - Personal/Educational Use Only

{handson_buildhat_api-1.0.7 → handson_buildhat_api-1.0.9}/pyproject.toml

@@ -1,7 +1,7 @@
 
 [project]
 name = "HandsON-BuildHat-API"
-version = "1.0.7"
+version = "1.0.9"
 description = "A third-party API for controlling LEGO SPIKE devices"
 authors = [
   { name="HaNeul Jung", email="hnjung@handsontech.co.kr" }

{handson_buildhat_api-1.0.7 → handson_buildhat_api-1.0.9}/src/HandsON_BuildHat_API/SpikePI.py

@@ -8,6 +8,10 @@
 from serial import Serial
 import time
 
+class _ConstLedID:
+    START_LED = 1
+    STOP_LED = 0
+
 class _ConstButtonID:
     START = 0
     STOP = 1
@@ -31,7 +35,8 @@ class _ConstValue:
     '''
     기타 상수 모음
     '''
-    HUB_DATA = 0b1010 << 4
+    HUB_GET_DATA = 0b1010 << 4
+    HUB_TRA_DATA = 0b1011 << 4
     TRA_DATA = 0b1000 << 4
     GET_DATA = 0b1001 << 4
 
@@ -99,25 +104,6 @@ class _SerialManager:
 
     if serial == None:
         raise Exception('사용 가능한 시리얼 포트를 찾을 수 없습니다.')
-        
-class _button:
-    def __init__(self, button_id = _ConstButtonID.STOP):
-        self.button_id = button_id
-
-    def is_pressed(self):
-        command = b'\xa0\x00\x00\x00\x00\x00\x00'
-        command += _Availability.make_checksum(command)
-        while True:
-            _SerialManager.serial.write(command)
-            data = _SerialManager.serial.read(16)
-            if _Availability.checksum_check(data): break
-        result = True if data[self.button_id + 1] == 1 else False
-        return result
-
-class BuildHat:
-    def __init__(self):
-        self.stop_button = _button(_ConstButtonID.STOP)
-        self.start_button = _button(_ConstButtonID.START)
 
 class _ModuleParent:
     def _get_data(self, byte:bytes) -> bytes:
@@ -141,6 +127,33 @@ class _ModuleParent:
         command = [_ConstValue.GET_DATA + _ConstValue.ALL_PORT]
         if not self._get_data(byte=bytes(command))[port + 1] in ID:
             raise Exception('해당 포트에 연결된 모듈이 다르거나 없습니다.')
+             
+class _button(_ModuleParent):
+    def __init__(self, button_id = _ConstButtonID.STOP):
+        self.button_id = button_id
+
+    def is_pressed(self):
+        command = [_ConstValue.HUB_GET_DATA]
+        data = self._get_data(bytes(command))
+        result = True if data[1 + self.button_id] == 1 else False
+        return result
+    
+class _led(_ModuleParent):
+    def __init__(self, led_id = _ConstLedID.STOP_LED):
+        self.led_id = led_id
+
+    def set(self, status):
+        command = [_ConstValue.HUB_TRA_DATA, self.led_id, status, 0, 0, 0, 0]
+        self._get_data(bytes(command))
+        return None
+
+class BuildHat:
+    def __init__(self):
+        self.stop_button = _button(_ConstButtonID.STOP)
+        self.start_button = _button(_ConstButtonID.START)
+
+        self.stop_led = _led(_ConstLedID.STOP_LED)
+        self.start_led = _led(_ConstLedID.START_LED)
 
 class ColorSensor(_ModuleParent):
     def __init__(self, port:str):
@@ -216,10 +229,11 @@ class Motor(_ModuleParent):
         if not speed in range(-100, 101):
             raise Exception('모터의 속도는 ~100 ~ 100 사이의 정수만 입력 가능합니다.')
         
-        if speed > 0: sw = 1
-        else: sw = 0
+        # if speed > 0: sw = 1
+        # else: sw = 0
+        if speed < 0: speed = speed & 0xFF
 
-        com = bytes((_ConstValue.TRA_DATA + self._PORT, _ConstValue.MOTOR_PWM, abs(speed), sw))
+        com = bytes((_ConstValue.TRA_DATA + self._PORT, _ConstValue.MOTOR_PWM, speed))
         self._get_data(com)
 
     def run_to_position(self, degrees, speed) -> None:
@@ -272,7 +286,7 @@ class MotorPair(_ModuleParent):
 
     def stop(self) -> None:
         for i in self._PORTs:
-            com = bytes((_ConstValue.TRA_DATA + i, _ConstValue.MOTOR_PWM, 0, 0))
+            com = bytes((_ConstValue.TRA_DATA + i, _ConstValue.MOTOR_STOP, 0, 0))
             self._get_data(com)
 
     def start(self, steering, speed) -> None:

{handson_buildhat_api-1.0.7 → handson_buildhat_api-1.0.9/src/HandsON_BuildHat_API.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: HandsON-BuildHat-API
-Version: 1.0.7
+Version: 1.0.9
 Summary: A third-party API for controlling LEGO SPIKE devices
 Author-email: HaNeul Jung <hnjung@handsontech.co.kr>
 License: Proprietary - Personal/Educational Use Only