[Telink] Ordered by alphabet targets

project-chip · Dec 23, 2022 · 03ba586 · 03ba586
1 parent 95ed283
commit 03ba586
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
@@ -75,6 +75,15 @@ jobs:
                     out/telink-tlsr9518adk80d-all-clusters-minimal/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
 
+            - name: Build example Telink Contact Sensor App
+              run: |
+                  ./scripts/run_in_build_env.sh \
+                    "./scripts/build/build_examples.py --target 'telink-tlsr9518adk80d-contact-sensor' build"
+                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+                    telink tlsr9518adk80d contact-sensor-app \
+                    out/telink-tlsr9518adk80d-contact-sensor/zephyr/zephyr.elf \
+                    /tmp/bloat_reports/
+
             - name: Build example Telink Lighting App
               run: |
                   ./scripts/run_in_build_env.sh \
@@ -111,15 +120,6 @@ jobs:
                     out/telink-tlsr9518adk80d-thermostat/zephyr/zephyr.elf \
                     /tmp/bloat_reports/
 
-            - name: Build example Telink Contact Sensor App
-              run: |
-                  ./scripts/run_in_build_env.sh \
-                    "./scripts/build/build_examples.py --target 'telink-tlsr9518adk80d-contact-sensor' build"
-                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                    telink tlsr9518adk80d contact-sensor-app \
-                    out/telink-tlsr9518adk80d-contact-sensor/zephyr/zephyr.elf \
-                    /tmp/bloat_reports/
-
             - name: Uploading Size Reports
               uses: actions/upload-artifact@v3
               if: ${{ !env.ACT }}

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -638,11 +638,11 @@
                 "qpg-qpg6100-lock",
                 "telink-tlsr9518adk80d-all-clusters",
                 "telink-tlsr9518adk80d-all-clusters-minimal",
+                "telink-tlsr9518adk80d-contact-sensor",
                 "telink-tlsr9518adk80d-light",
                 "telink-tlsr9518adk80d-light-switch",
                 "telink-tlsr9518adk80d-ota-requestor",
                 "telink-tlsr9518adk80d-thermostat",
-                "telink-tlsr9518adk80d-contact-sensor",
                 "tizen-arm-light"
             ]
         },

diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py
@@ -527,11 +527,11 @@ def BuildTelinkTarget():
     target.AppendFixedTargets([
         TargetPart('all-clusters', app=TelinkApp.ALL_CLUSTERS),
         TargetPart('all-clusters-minimal', app=TelinkApp.ALL_CLUSTERS_MINIMAL),
+        TargetPart('contact-sensor', app=TelinkApp.CONTACT_SENSOR),
         TargetPart('light', app=TelinkApp.LIGHT),
         TargetPart('light-switch', app=TelinkApp.SWITCH),
         TargetPart('ota-requestor', app=TelinkApp.OTA_REQUESTOR),
         TargetPart('thermostat', app=TelinkApp.THERMOSTAT),
-        TargetPart('contact-sensor', app=TelinkApp.CONTACT_SENSOR),
     ])
 
     return target

diff --git a/scripts/build/builders/telink.py b/scripts/build/builders/telink.py
@@ -23,17 +23,19 @@
 class TelinkApp(Enum):
     ALL_CLUSTERS = auto()
     ALL_CLUSTERS_MINIMAL = auto()
+    CONTACT_SENSOR = auto()
     LIGHT = auto()
     SWITCH = auto()
     OTA_REQUESTOR = auto()
     THERMOSTAT = auto()
-    CONTACT_SENSOR = auto()
 
     def ExampleName(self):
         if self == TelinkApp.ALL_CLUSTERS:
             return 'all-clusters-app'
         elif self == TelinkApp.ALL_CLUSTERS_MINIMAL:
             return 'all-clusters-minimal-app'
+        elif self == TelinkApp.CONTACT_SENSOR:
+            return 'contact-sensor'
         elif self == TelinkApp.LIGHT:
             return 'lighting-app'
         elif self == TelinkApp.SWITCH:
@@ -42,8 +44,6 @@ def ExampleName(self):
             return 'ota-requestor-app'
         elif self == TelinkApp.THERMOSTAT:
             return 'thermostat'
-        elif self == TelinkApp.CONTACT_SENSOR:
-            return 'contact-sensor'
         else:
             raise Exception('Unknown app type: %r' % self)
 
@@ -52,6 +52,8 @@ def AppNamePrefix(self):
             return 'chip-telink-all-clusters-example'
         elif self == TelinkApp.ALL_CLUSTERS_MINIMAL:
             return 'chip-telink-all-clusters-minimal-example'
+        elif self == TelinkApp.CONTACT_SENSOR:
+            return 'chip-telink-contact-sensor-example'
         elif self == TelinkApp.LIGHT:
             return 'chip-telink-lighting-example'
         elif self == TelinkApp.SWITCH:
@@ -60,8 +62,6 @@ def AppNamePrefix(self):
             return 'chip-telink-ota-requestor-example'
         elif self == TelinkApp.THERMOSTAT:
             return 'chip-telink-thermostat-example'
-        elif self == TelinkApp.CONTACT_SENSOR:
-            return 'chip-telink-contact-sensor-example'
         else:
             raise Exception('Unknown app type: %r' % self)
 

diff --git a/scripts/build/testdata/all_targets_linux_x64.txt b/scripts/build/testdata/all_targets_linux_x64.txt
@@ -18,5 +18,5 @@ nrf-{nrf5340dk,nrf52840dk,nrf52840dongle}-{all-clusters,all-clusters-minimal,loc
 nrf-native-posix-64-tests
 qpg-qpg6105-{lock,light,shell,persistent-storage}
 tizen-arm-{all-clusters,all-clusters-minimal,chip-tool,light}[-no-ble][-no-wifi][-asan][-ubsan]
-telink-tlsr9518adk80d-{all-clusters,all-clusters-minimal,light,light-switch,ota-requestor,thermostat,contact-sensor}
+telink-tlsr9518adk80d-{all-clusters,all-clusters-minimal,contact-sensor,light,light-switch,ota-requestor,thermostat}
 openiotsdk-{shell,lock}