Move J-Link serial number to command line arguments

Add ZSWatch HW revision as variable
jakkra · Jul 24, 2024 · d2a1b1a · d2a1b1a
1 parent d540a61
commit d2a1b1a
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 14 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -9,6 +9,12 @@ jobs:
         - /dev/bus/usb/:/dev/bus/usb
       options: --privileged
 
+    strategy:
+      matrix:
+        hardware_revisions: [3, 4]
+        jlink_devices: [760208506]
+        runner: []
+
     steps:
       - uses: actions/checkout@v4
 
@@ -37,15 +43,15 @@ jobs:
           python -m pip install --upgrade pip
           pip install -r app/pytest/requirements.txt
 
-      - name: 'Download image'
+      - name: Download debug image
         uses: actions/download-artifact@v4
         with:
-          name: zswatch_nrf5340_cpuapp@3_debug
+          name: zswatch_nrf5340_cpuapp@${{ matrix.hardware_revisions }}_debug
 
       - name: Display structure of downloaded files
         run: ls
 
       - name: Test with pytest
         run: |
           pip install pytest
-          pytest app/pytest/
+          pytest JLINK_SERIAL=${{ matrix.jlink_devices }} ZSWATCH_REVISION=${{ matrix.hardware_revisions }} app/pytest/
diff --git a/app/pytest/requirements.txt b/app/pytest/requirements.txt
@@ -18,8 +18,5 @@ psutil
 # Artifacts package creation
 bz
 
-# used for CAN <=> host testing
-python-can>=4.3.0
-
 # RTT connection
-pylink-square
+pylink-square
diff --git a/app/pytest/utils.py b/app/pytest/utils.py
@@ -1,10 +1,9 @@
+import os
 import subprocess
 import logging
 import time
 import pylink
 
-SERIAL_NUMBER = "760208490"
-
 log = logging.getLogger()
 
 
@@ -14,6 +13,8 @@ def current_milli_time():
 
 
 def reset():
+    JLink_ID = os.environ["JLINK_SERIAL"]
+
     """Reset DUT"""
     log.info("Reset DUT")
     subprocess.run(
@@ -22,7 +23,7 @@ def reset():
             "--family",
             "nrf53",
             "--snr",
-            SERIAL_NUMBER,
+            JLink_ID,
             "--reset",
         ],
         shell=False,
@@ -33,6 +34,12 @@ def reset():
 
 
 def flash():
+    HW_Revision = os.environ["ZSWATCH_REVISION"]
+    JLink_ID = os.environ["JLINK_SERIAL"]
+
+    log.info("Using J-Link {}".format(JLink_ID))
+    log.info("Using ZSWatch revision {}".format(HW_Revision))
+
     """Flash firmware"""
     log.info("Flashing CP_APPLICATION.")
     subprocess.run(
@@ -41,9 +48,9 @@ def flash():
             "--family",
             "nrf53",
             "--snr",
-            SERIAL_NUMBER,
+            JLink_ID,
             "--program",
-            "./zswatch_nrf5340_cpuapp@3_debug.hex",
+            "./zswatch_nrf5340_cpuapp@{}_debug.hex".format(HW_Revision),
             "--chiperase",
             "--verify",
         ],
@@ -60,7 +67,7 @@ def flash():
             "--family",
             "nrf53",
             "--snr",
-            SERIAL_NUMBER,
+            JLink_ID,
             "--program",
             "./zswatch_nrf5340_CPUNET.hex",
             "--coprocessor",
@@ -77,11 +84,13 @@ def flash():
 
 
 def read_rtt(target_device="nRF5340_XXAA", timeout_ms=10000):
+    JLink_ID = os.environ["JLINK_SERIAL"]
+
     """Read Segger RTT output"""
     jlink = pylink.JLink()
     logging.getLogger("pylink.jlink").setLevel(logging.WARNING)
     log.info("Connecting to JLink...")
-    jlink.open(serial_no=SERIAL_NUMBER)
+    jlink.open(serial_no=JLink_ID)
     log.info("Connecting to %s..." % target_device)
     jlink.set_tif(pylink.enums.JLinkInterfaces.SWD)
     jlink.connect(target_device)