libs/hardware/ir.py: Fix the error when importing hardware in XIAO.

Signed-off-by: lbuque <[email protected]>

Author: lbuque

m5stack/libs/hardware/__init__.py

@@ -3,14 +3,8 @@
 # SPDX-License-Identifier: MIT
 
 from machine import *
-from .rgb import *
+from .rgb import RGB
 from .button import Button
-
-try:
-    from .imu import *
-except ImportError:
-    pass
-
 from .ir import IR
 from .rfid import RFID
 from .rotary import Rotary

m5stack/libs/hardware/ir.py

@@ -4,38 +4,38 @@
 
 from driver.ir.nec import NEC, NEC_8
 import M5
-from machine import Pin
+import machine
 
 
 class IR:
-    _pin_map = {
-        M5.BOARD.M5AtomS3: (None, 4),
-        M5.BOARD.M5AtomS3Lite: (None, 4),
-        M5.BOARD.M5AtomS3U: (None, 12),
-        M5.BOARD.M5Capsule: (None, 4),
-        M5.BOARD.M5Cardputer: (None, 44),
-        M5.BOARD.M5StickCPlus: (None, 9),
-        M5.BOARD.M5StickC: (None, 9),
-        M5.BOARD.M5StickCPlus2: (None, 19),
-        M5.BOARD.M5AtomU: (None, 12),
-        M5.BOARD.M5Atom: (None, 12),
-        M5.BOARD.M5AtomEcho: (None, 12),
-        M5.BOARD.M5NanoC6: (None, 3),
-    }
-
     def __init__(self) -> None:
-        self._port = self._pin_map.get(M5.getBoard())
-        self._transmitter = NEC(Pin(self._port[1], Pin.OUT, value=0))
+        _pin_map = {
+            M5.BOARD.M5AtomS3: (None, 4),
+            M5.BOARD.M5AtomS3Lite: (None, 4),
+            M5.BOARD.M5AtomS3U: (None, 12),
+            M5.BOARD.M5Capsule: (None, 4),
+            M5.BOARD.M5Cardputer: (None, 44),
+            M5.BOARD.M5StickCPlus: (None, 9),
+            M5.BOARD.M5StickC: (None, 9),
+            M5.BOARD.M5StickCPlus2: (None, 19),
+            M5.BOARD.M5AtomU: (None, 12),
+            M5.BOARD.M5Atom: (None, 12),
+            M5.BOARD.M5AtomEcho: (None, 12),
+            M5.BOARD.M5NanoC6: (None, 3),
+        }
+        (self._rx_pin, self._tx_pin) = _pin_map.get(M5.getBoard())
+        if self._tx_pin:
+            self._transmitter = NEC(machine.Pin(self._tx_pin, machine.Pin.OUT, value=0))
         self._receiver = None
 
     def tx(self, cmd, data):
         self._transmitter.transmit(cmd, data)
 
     def rx_cb(self, cb):
-        if self._port[0] is None:
-            return
+        if self._rx_pin is None:
+            raise NotImplementedError("IR receiver is not supported on this board")
 
-        if self._receiver is None:
-            self._receiver = NEC_8(Pin(self._port[0], Pin.IN), cb)
-        else:
+        if self._receiver:
             self._receiver.close()
+
+        self._receiver = NEC_8(machine.Pin(self._rx_pin, machine.Pin.IN), cb)

m5stack/libs/unit/ir.py

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 from driver.ir.nec import NEC, NEC_8
-from machine import Pin
+import machine
 
 
 class IRUnit:
@@ -11,15 +11,14 @@ class IRUnit:
     #         return NEC(Pin(port[1], Pin.IN))
 
     def __init__(self, port) -> None:
-        self._port = port
-        self._transmitter = NEC(Pin(self._port[1], Pin.OUT, value=0))
+        (self._rx_pin, self._tx_pin) = port
+        self._transmitter = NEC(machine.Pin(self._tx_pin, machine.Pin.OUT, value=0))
         self._receiver = None
 
     def tx(self, cmd, data):
         self._transmitter.transmit(cmd, data)
 
     def rx_cb(self, cb):
-        if self._receiver is None:
-            self._receiver = NEC_8(Pin(self._port[0], Pin.IN), cb)
-        else:
+        if self._receiver:
             self._receiver.close()
+        self._receiver = NEC_8(machine.Pin(self._rx_pin, machine.Pin.IN), cb)