Merge branch 'main' of https://github.com/linkerbotai/linker_hand_python_sdk

Author: hejianxin79

LinkerHand/config/L20_positions.yaml

@@ -1,71 +0,0 @@
-LEFT_HAND:
-- ACTION_NAME: 张开
-  POSITION:
-  - 96
-  - 255
-  - 255
-  - 255
-  - 255
-  - 150
-  - 114
-  - 151
-  - 189
-  - 255
-  - 180
-  - 255
-  - 255
-  - 255
-  - 255
-  - 255
-  - 255
-  - 255
-  - 255
-  - 255
-
-RIGHT_HAND:
-- ACTION_NAME: 张开
-  POSITION:
-  - 96
-  - 255
-  - 255
-  - 255
-  - 255
-  - 150
-  - 114
-  - 151
-  - 189
-  - 255
-  - 180
-  - 255
-  - 255
-  - 255
-  - 255
-  - 255
-  - 255
-  - 255
-  - 255
-  - 255
-
-- ACTION_NAME: 握拳
-  POSITION:
-  - 230
-  - 80
-  - 51
-  - 42
-  - 7
-  - 35
-  - 114
-  - 151
-  - 189
-  - 255
-  - 58
-  - 255
-  - 255
-  - 255
-  - 255
-  - 133
-  - 5
-  - 0
-  - 0
-  - 0
-

LinkerHand/config/setting.yaml

@@ -1,4 +1,4 @@
-VERSION: 2.1.4 # 支持新传感器
+VERSION: 2.1.7 # 支持新传感器
 LINKER_HAND:  # 手部配置信息
   LEFT_HAND:
     EXISTS: False # 是否存在左手

LinkerHand/core/can/__pycache__/linker_hand_l10_can.cpython-38.pyc

@@ -65,7 +65,7 @@ def __init__(self, can_channel='can0', baudrate=1000000, can_id=0x28):
             )
         elif sys.platform == "win32":
             self.bus = can.interface.Bus(
-                channel='PCAN_USBBUS1', interface='pcan', bitrate=baudrate, 
+                channel=can_channel, interface='pcan', bitrate=baudrate, 
                 can_filters=[{"can_id": can_id, "can_mask": 0x7FF}]
             )
         else:

LinkerHand/core/can/linker_hand_l20_can.py

@@ -152,7 +152,7 @@ def __init__(self, can_channel='can0', baudrate=1000000, can_id=0x28):
             )
         elif sys.platform == "win32":
             self.bus = can.interface.Bus(
-                channel='PCAN_USBBUS1', interface='pcan', bitrate=baudrate, 
+                channel=can_channel, interface='pcan', bitrate=baudrate, 
                 can_filters=[{"can_id": can_id, "can_mask": 0x7FF}]
             )
         else:

LinkerHand/core/can/linker_hand_l21_can.py

@@ -126,7 +126,7 @@ def __init__(self, config, can_channel='can0', baudrate=1000000, can_id=0x28):
             )
         elif sys.platform == "win32":
             self.bus = can.interface.Bus(
-                channel='PCAN_USBBUS1', interface='pcan', bitrate=baudrate, 
+                channel=can_channel, interface='pcan', bitrate=baudrate, 
                 can_filters=[{"can_id": can_id, "can_mask": 0x7FF}]
             )
         else:

LinkerHand/core/can/linker_hand_l24_can.py

@@ -155,7 +155,7 @@ def __init__(self, can_channel='can0', baudrate=1000000, can_id=0x28):
             )
         elif sys.platform == "win32":
             self.bus = can.interface.Bus(
-                channel='PCAN_USBBUS1', interface='pcan', bitrate=baudrate, 
+                channel=can_channel, interface='pcan', bitrate=baudrate, 
                 can_filters=[{"can_id": can_id, "can_mask": 0x7FF}]
             )
         else: