micropython · dpgeorge · Oct 23, 2024 · Oct 25, 2024 · Oct 31, 2024 · Oct 30, 2024
diff --git a/tests/extmod/machine_i2s_rate.py b/tests/extmod/machine_i2s_rate.py
@@ -2,7 +2,7 @@
 
 try:
     from machine import Pin, I2S
-except ImportError:
+except (AttributeError, ImportError):
     print("SKIP")
     raise SystemExit
 

diff --git a/tests/extmod/machine_spi_rate.py b/tests/extmod/machine_spi_rate.py
@@ -14,8 +14,12 @@
 # Tune test parameters based on the target.
 if "alif" in sys.platform:
     MAX_DELTA_MS = 20
+elif "renesas-ra" in sys.platform:
+    MAX_DELTA_MS = 15
 elif "esp8266" in sys.platform:
     MAX_DELTA_MS = 50  # port requires much looser timing requirements
+elif "zephyr" in sys.platform:
+    MAX_DELTA_MS = 10
 
 
 def get_real_baudrate(spi):

diff --git a/tests/extmod/machine_uart_tx.py b/tests/extmod/machine_uart_tx.py
@@ -34,10 +34,16 @@
 elif "samd" in sys.platform:
     timing_margin_us = 300
     bit_margin = 1
+elif "zephyr" in sys.platform:
+    bit_margin = 1
+    if "frdm_k64f" in sys.implementation._machine:
+        timing_margin_us = 1200
+    elif "nucleo_wb55rg" in sys.implementation._machine:
+        timing_margin_us = 400
 
 # Test that write+flush takes the expected amount of time to execute.
 for bits_per_s in (2400, 9600, 115200):
-    text = "Hello World"
+    text = "Hello World" * 2
     uart = UART(*uart_loopback_args, baudrate=bits_per_s, **uart_loopback_kwargs)
     time.sleep_ms(initial_delay_ms)
 

diff --git a/tests/extmod_hardware/machine_can2.py b/tests/extmod_hardware/machine_can2.py
@@ -8,7 +8,7 @@
     from machine import CAN
 
     CAN(2, 125_000)
-except (ImportError, ValueError):
+except (AttributeError, ImportError, ValueError):
     print("SKIP")
     raise SystemExit
 

diff --git a/tests/extmod_hardware/machine_can_timings.py b/tests/extmod_hardware/machine_can_timings.py
@@ -4,7 +4,7 @@
 
 try:
     from machine import CAN
-except ImportError:
+except (AttributeError, ImportError):
     print("SKIP")
     raise SystemExit
 

diff --git a/tests/extmod_hardware/machine_counter.py b/tests/extmod_hardware/machine_counter.py
@@ -5,7 +5,7 @@
 
 try:
     from machine import Counter
-except ImportError:
+except (AttributeError, ImportError):
     print("SKIP")
     raise SystemExit
 
@@ -16,6 +16,10 @@
     id = 0
     out_pin = 4
     in_pin = 5
+    if "ESP32S2" in sys.implementation._machine:
+        # FeatherS2
+        out_pin = 5
+        in_pin = 6
 elif sys.platform == "mimxrt":
     if "Teensy" in sys.implementation._machine:
         id = 0

diff --git a/tests/extmod_hardware/machine_encoder.py b/tests/extmod_hardware/machine_encoder.py
@@ -6,7 +6,7 @@
 
 try:
     from machine import Encoder
-except ImportError:
+except (AttributeError, ImportError):
     print("SKIP")
     raise SystemExit
 

diff --git a/tests/extmod_hardware/machine_i2c_target.py b/tests/extmod_hardware/machine_i2c_target.py
@@ -7,7 +7,7 @@
 
 try:
     from machine import Pin, SoftI2C, I2CTarget
-except ImportError:
+except (AttributeError, ImportError):
     print("SKIP")
     raise SystemExit
 
@@ -30,10 +30,10 @@
     args_target = (1,)
 elif sys.platform == "pyboard":
     if sys.implementation._build == "NUCLEO_WB55":
-        args_controller = {"scl": "B8", "sda": "B9"}
-        args_target = (3,)
+        args_controller = {"scl": "D13", "sda": "D12"}  # Arduino header D13/D12
+        args_target = (1,)  # PB8/PB9, Arduino header D15/D14
     else:
-        args_controller = {"scl": "X1", "sda": "X2"}
+        args_controller = {"scl": "X7", "sda": "X8"}
         args_target = ("X",)
 elif "zephyr-nucleo_wb55rg" in sys.implementation._machine:
     # PB8=I2C1_SCL, PB9=I2C1_SDA (on Arduino header D15/D14)
@@ -52,16 +52,38 @@
 elif sys.platform == "samd":
     args_controller = {"scl": "D5", "sda": "D1"}
     args_target = ()
-else:
-    print("Please add support for this test on this platform.")
-    raise SystemExit
 
 
 def config_pull_up():
     Pin(args_controller["scl"], Pin.OPEN_DRAIN, Pin.PULL_UP)
     Pin(args_controller["sda"], Pin.OPEN_DRAIN, Pin.PULL_UP)
 
 
+def config_pull_up_disable():
+    pass
+
+
+if hasattr(Pin, "board") and hasattr(Pin.board, "PULL_SCL"):
+
+    def config_pull_up():
+        Pin("PULL_SCL", Pin.OUT, value=1)
+        Pin("PULL_SDA", Pin.OUT, value=1)
+
+    def config_pull_up_disable():
+        Pin("PULL_SCL", Pin.ANALOG)
+        Pin("PULL_SDA", Pin.ANALOG)
+
+try:
+    from target_wiring import i2c_args_controller as args_controller
+    from target_wiring import i2c_args_target as args_target
+    from target_wiring import i2c_kwargs_target as kwargs_target
+except:
+    pass
+
+if "args_controller" not in globals():
+    print("Please add support for this test on this platform.")
+    raise SystemExit
+
 class TestMemory(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
@@ -72,6 +94,7 @@ def setUpClass(cls):
 
     @classmethod
     def tearDownClass(cls):
+        config_pull_up_disable()
         cls.i2c_target.deinit()
 
     def test_scan(self):
@@ -145,6 +168,7 @@ def setUpClass(cls):
 
     @classmethod
     def tearDownClass(cls):
+        config_pull_up_disable()
         cls.i2c_target.deinit()
 
     @unittest.skipIf(sys.platform == "esp32", "scan doesn't trigger IRQ_END_WRITE")
@@ -192,6 +216,7 @@ def setUpClass(cls):
 
     @classmethod
     def tearDownClass(cls):
+        config_pull_up_disable()
         cls.i2c_target.deinit()
 
     def test_read(self):
@@ -241,6 +266,7 @@ def setUpClass(cls):
 
     @classmethod
     def tearDownClass(cls):
+        config_pull_up_disable()
         cls.i2c_target.deinit()
 
     def test_scan(self):

diff --git a/tests/extmod_hardware/machine_pin.py b/tests/extmod_hardware/machine_pin.py
@@ -0,0 +1,47 @@
+# Test machine.Pin.
+#
+# IMPORTANT: This test requires hardware connections.
+
+try:
+    from machine import Pin
+except ImportError:
+    print("SKIP")
+    raise SystemExit
+
+import unittest
+
+try:
+    from target_wiring import pin_loopback_pins
+except:
+    from target_wiring import pwm_loopback_pins as pin_loopback_pins
+
+
+class TestBase:
+    @classmethod
+    def setUpClass(cls):
+        print("set up pins:", cls.pin_out, cls.pin_in)
+        cls.p0 = Pin(cls.pin_out)
+        cls.p1 = Pin(cls.pin_in)
+
+    def setUp(self):
+        self.p0.init(Pin.OUT)
+        self.p1.init(Pin.IN)
+
+    def test_connections(self):
+        print(self.pin_out, self.pin_in)
+        print(self.p0, self.p1)
+        self.p0(1)
+        self.assertEqual(1, self.p1())
+        self.p0(0)
+        self.assertEqual(0, self.p1())
+
+
+# Generate test classes, one for each set of pins to test.
+for pin_out, pin_in in pin_loopback_pins:
+    cls_name = "Test_{}_{}".format(pin_out, pin_in)
+    globals()[cls_name] = type(
+        cls_name, (TestBase, unittest.TestCase), {"pin_out": pin_out, "pin_in": pin_in}
+    )
+
+if __name__ == "__main__":
+    unittest.main()