Added light-switch to CI and restyled changes

Author: abiradarti

.github/workflows/examples-cc13xx_26xx.yaml

@@ -70,6 +70,8 @@ jobs:
                       --target ti-cc13x4_26x4-pump-ftd \
                       --target ti-cc13x4_26x4-pump-controller-mtd \
                       --target ti-cc13x4_26x4-pump-controller-ftd \
+                      --target ti-cc13x4_26x4-light-switch-mtd \
+                      --target ti-cc13x4_26x4-light-switch-ftd \
                       build \
                       --copy-artifacts-to out/artifacts \
                   "
@@ -101,7 +103,19 @@ jobs:
               run: |
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
                     cc13x4_26x4 LP_EM_CC1354P10_6 lighting-app \
-                    out/artifacts/ti-cc13x4_26x4-lighting-mtd/chip-LP_EM_CC1354P10_6-lighting-example.out \
+                    out/artifacts/ti-cc13x4_26x4-lighting-ftd/chip-LP_EM_CC1354P10_6-lighting-example.out \
+                    /tmp/bloat_reports/
+            - name: Get Light Switch FTD size stats
+              run: |
+                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+                    cc13x4_26x4 LP_EM_CC1354P10_6 light-switch-app \
+                    out/artifacts/ti-cc13x4_26x4-light-switch-ftd/chip-LP_EM_CC1354P10_6-light-switch-example.out \
+                    /tmp/bloat_reports/
+            - name: Get Light Switch MTD size stats
+              run: |
+                  .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
+                    cc13x4_26x4 LP_EM_CC1354P10_6 light-switch-app \
+                    out/artifacts/ti-cc13x4_26x4-light-switch-mtd/chip-LP_EM_CC1354P10_6-light-switch-example.out \
                     /tmp/bloat_reports/
             - name: Uploading Size Reports
               uses: ./.github/actions/upload-size-reports

examples/light-switch-app/cc13x4_26x4/README.md

@@ -106,7 +106,7 @@ Ninja to build the executable.
 
     ```
     gn gen out/debug --args="ti_sysconfig_root=\"$HOME/ti/sysconfig_1.18.1\" target_defines=[\"CC13X4_26X4_ATTESTATION_CREDENTIALS=1\"] chip_generate_link_map_file=true"
-    
+
     ```
 
 ## Programming
@@ -282,8 +282,8 @@ Now you can press the Right BTN on the light-switch device and it will turn ON
 the RED LED on the lighting device. Press the Left BTN on the light-switch
 device to turn OFF the RED LED on the lighting device. If the devices aren't
 bound properly the light-switch will display on UART that the Switch On/Off
-operation has been completed but the lighting device's LEDs will not turn
-on/off accordingly.
+operation has been completed but the lighting device's LEDs will not turn on/off
+accordingly.
 
 ## TI Support
 

examples/light-switch-app/cc13x4_26x4/src/AppTask.cpp

@@ -141,7 +141,7 @@ TimerHandle_t sOTAInitTimer = 0;
 
 // The OTA Init Timer is only started upon the first Thread State Change
 // detected if the device is already on a Thread Network, or during the AppTask
-// Init sequence if the device is not yet on a Thread Network. Once the timer 
+// Init sequence if the device is not yet on a Thread Network. Once the timer
 // has been started once, it does not need to be started again so the flag will
 // be set to false.
 bool isAppStarting = true;
@@ -172,7 +172,6 @@ int AppTask::StartAppTask()
     return ret;
 }
 
-
 // Identify take action
 void identify_TakeAction(void)
 {
@@ -210,21 +209,24 @@ void DeviceEventCallback(const ChipDeviceEvent * event, intptr_t arg)
         PLAT_LOG("Thread State Change");
         bool isThreadAttached = ThreadStackMgrImpl().IsThreadAttached();
 
-        if(isThreadAttached){
+        if (isThreadAttached)
+        {
             PLAT_LOG("Device is on the Thread Network");
 #if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-            if(isAppStarting){
+            if (isAppStarting)
+            {
                 StartTimer(OTAREQUESTOR_INIT_TIMER_DELAY_MS);
                 isAppStarting = false;
-            }   
+            }
 #endif
         }
         break;
     }
 }
 
 #if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-void OTAInitTimerEventHandler(TimerHandle_t xTimer){
+void OTAInitTimerEventHandler(TimerHandle_t xTimer)
+{
     InitializeOTARequestor();
 }
 #endif
@@ -248,17 +250,17 @@ int AppTask::Init()
     }
 #if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
     // Create FreeRTOS sw timer for OTA timer.
-    sOTAInitTimer = xTimerCreate("OTAInitTmr",                 // Just a text name, not used by the RTOS kernel
-                            OTAREQUESTOR_INIT_TIMER_DELAY_MS,  // timer period (mS)
-                            false,                             // no timer reload (==one-shot)
-                            (void *) this,                     // init timer id = light obj context
-                            OTAInitTimerEventHandler           // timer callback handler
+    sOTAInitTimer = xTimerCreate("OTAInitTmr",                     // Just a text name, not used by the RTOS kernel
+                                 OTAREQUESTOR_INIT_TIMER_DELAY_MS, // timer period (mS)
+                                 false,                            // no timer reload (==one-shot)
+                                 (void *) this,                    // init timer id = light obj context
+                                 OTAInitTimerEventHandler          // timer callback handler
     );
 
     if (sOTAInitTimer == NULL)
     {
         PLAT_LOG("sOTAInitTimer timer create failed");
-    } 
+    }
     else
     {
         PLAT_LOG("sOTAInitTimer timer created successfully ");
@@ -352,11 +354,12 @@ int AppTask::Init()
     ConfigurationMgr().LogDeviceConfig();
 
     bool isThreadEnabled = ThreadStackMgrImpl().IsThreadEnabled();
-    if(!isThreadEnabled && isAppStarting){
+    if (!isThreadEnabled && isAppStarting)
+    {
 #if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
-    PLAT_LOG("Thread is Disabled, enable OTA Requestor");
-    StartTimer(OTAREQUESTOR_INIT_TIMER_DELAY_MS);
-    isAppStarting = false;
+        PLAT_LOG("Thread is Disabled, enable OTA Requestor");
+        StartTimer(OTAREQUESTOR_INIT_TIMER_DELAY_MS);
+        isAppStarting = false;
 #endif
     }
 
@@ -385,20 +388,20 @@ void AppTask::AppTaskMain(void * pvParameter)
 #if CHIP_DEVICE_CONFIG_ENABLE_OTA_REQUESTOR
 void StartTimer(uint32_t aTimeoutMs)
 {
-        PLAT_LOG("Start OTA Init Timer")
-        if (xTimerIsTimerActive(sOTAInitTimer))
-        {
-            PLAT_LOG("app timer already started!");
-            CancelTimer();
-        }
+    PLAT_LOG("Start OTA Init Timer")
+    if (xTimerIsTimerActive(sOTAInitTimer))
+    {
+        PLAT_LOG("app timer already started!");
+        CancelTimer();
+    }
 
-        // timer is not active, change its period to required value (== restart).
-        // FreeRTOS- Block for a maximum of 100 ticks if the change period command
-        // cannot immediately be sent to the timer command queue.
-        if (xTimerChangePeriod(sOTAInitTimer, pdMS_TO_TICKS(aTimeoutMs), 100) != pdPASS)
-        {
-            PLAT_LOG("sOTAInitTimer timer start() failed");
-        }  
+    // timer is not active, change its period to required value (== restart).
+    // FreeRTOS- Block for a maximum of 100 ticks if the change period command
+    // cannot immediately be sent to the timer command queue.
+    if (xTimerChangePeriod(sOTAInitTimer, pdMS_TO_TICKS(aTimeoutMs), 100) != pdPASS)
+    {
+        PLAT_LOG("sOTAInitTimer timer start() failed");
+    }
 }
 
 void CancelTimer(void)
@@ -517,27 +520,27 @@ void AppTask::DispatchEvent(AppEvent * aEvent)
     case AppEvent::kEventType_IdentifyStart:
         switch (identify_trigger_effect)
         {
-            case IDENTIFY_TRIGGER_EFFECT_BLINK:
-                identify_TakeAction();
-                break;
-            case IDENTIFY_TRIGGER_EFFECT_BREATHE:
-                identify_TakeAction();
-                break;
-            case IDENTIFY_TRIGGER_EFFECT_OKAY:
-                identify_TakeAction();
-                break;
-            default:
-                break;
+        case IDENTIFY_TRIGGER_EFFECT_BLINK:
+            identify_TakeAction();
+            break;
+        case IDENTIFY_TRIGGER_EFFECT_BREATHE:
+            identify_TakeAction();
+            break;
+        case IDENTIFY_TRIGGER_EFFECT_OKAY:
+            identify_TakeAction();
+            break;
+        default:
+            break;
         }
         PLAT_LOG("Identify started");
         break;
-    
-        case AppEvent::kEventType_Identify:
-        // blink LED 
+
+    case AppEvent::kEventType_Identify:
+        // blink LED
         PLAT_LOG("Identify cmd received, will blink green led three times now");
 #if (LED_ENABLE == 1)
-            LED_startBlinking(sAppGreenHandle, 250, 3);
-#endif   
+        LED_startBlinking(sAppGreenHandle, 250, 3);
+#endif
         break;
 
     case AppEvent::kEventType_IdentifyStop:

examples/light-switch-app/cc13x4_26x4/src/LightSwitchManager.cpp

@@ -188,6 +188,6 @@ void LightSwitchManager::ActuatorMovementTimerEventHandler(AppEvent * aEvent)
 void LightSwitchManager::IdentifyEventHandler()
 {
     AppEvent event;
-    event.Type               = AppEvent::kEventType_Identify;
+    event.Type = AppEvent::kEventType_Identify;
     AppTask::GetAppTask().PostEvent(&event);
 }

scripts/build/build/targets.py

@@ -548,6 +548,7 @@ def BuildCC13x4Target():
         TargetPart('pump', app=TIApp.PUMP, openthread_ftd=False),
         TargetPart('pump-controller', app=TIApp.PUMP_CONTROLLER,
                    openthread_ftd=False),
+        TargetPart('light-switch', app=TIApp.LIGHT_SWITCH),
     ])
 
     target.AppendModifier(name="mtd", openthread_ftd=False)

scripts/build/builders/ti.py

@@ -28,6 +28,7 @@ class TIApp(Enum):
     ALL_CLUSTERS_MINIMAL = auto()
     LIGHTING = auto()
     SHELL = auto()
+    LIGHT_SWITCH = auto()
 
     def ExampleName(self):
         if self == TIApp.LOCK:
@@ -44,6 +45,8 @@ def ExampleName(self):
             return 'lighting-app'
         elif self == TIApp.SHELL:
             return 'shell'
+        elif self == TIApp.LIGHT_SWITCH:
+            return 'light-switch-app'
         else:
             raise Exception('Unknown app type: %r' % self)
 
@@ -62,6 +65,8 @@ def AppNamePrefix(self, board):
             return f'chip-{board.BoardName()}-lighting-example'
         elif self == TIApp.SHELL:
             return f'chip-{board.BoardName()}-shell-example'
+        elif self == TIApp.LIGHT_SWITCH:
+            return f'chip-{board.BoardName()}-light-switch-example'
         else:
             raise Exception('Unknown app type: %r' % self)
 
@@ -123,7 +128,8 @@ def build_outputs(self):
             if self.app in [TIApp.LOCK,
                             TIApp.LIGHTING,
                             TIApp.PUMP,
-                            TIApp.PUMP_CONTROLLER]:
+                            TIApp.PUMP_CONTROLLER,
+                            TIApp.LIGHT_SWITCH]:
                 suffixes = [".out", "-mcuboot.hex"]
             else:
                 suffixes = [".out"]

scripts/build/testdata/all_targets_linux_x64.txt

@@ -3,7 +3,7 @@ asr-{asr582x,asr595x,asr550x}-{all-clusters,all-clusters-minimal,lighting,light-
 android-{arm,arm64,x86,x64,androidstudio-arm,androidstudio-arm64,androidstudio-x86,androidstudio-x64}-{chip-tool,chip-test,tv-server,tv-casting-app,java-matter-controller,kotlin-matter-controller,virtual-device-app}[-no-debug]
 bouffalolab-{bl602-iot-matter-v1,bl602-night-light,xt-zb6-devkit,bl706-night-light,bl706dk,bl704ldk}-light[-shell][-115200][-rpc][-cdc][-resetcnt][-rotating_device_id][-mfd][-mfdtest][-ethernet][-wifi][-thread][-fp][-memmonitor][-mot]
 cc32xx-{lock,air-purifier}
-ti-cc13x4_26x4-{all-clusters,lighting,lock,pump,pump-controller}[-mtd][-ftd]
+ti-cc13x4_26x4-{all-clusters,lighting,light-switch,lock,pump,pump-controller}[-mtd][-ftd]
 cyw30739-{cyw30739b2_p5_evk_01,cyw30739b2_p5_evk_02,cyw30739b2_p5_evk_03,cyw930739m2evb_01,cyw930739m2evb_02}-{light,light-switch,lock,thermostat}
 efr32-{brd2704b,brd4316a,brd4317a,brd4318a,brd4319a,brd4186a,brd4187a,brd2601b,brd4187c,brd4186c,brd2703a,brd4338a}-{window-covering,switch,unit-test,light,lock,thermostat,pump}[-rpc][-with-ota-requestor][-icd][-low-power][-shell][-no-logging][-openthread-mtd][-heap-monitoring][-no-openthread-cli][-show-qr-code][-wifi][-rs9116][-wf200][-siwx917][-ipv4][-additional-data-advertising][-use-ot-lib][-use-ot-coap-lib][-no-version][-skip-rps-generation]
 esp32-{m5stack,c3devkit,devkitc,qemu}-{all-clusters,all-clusters-minimal,energy-management,ota-provider,ota-requestor,shell,light,lock,bridge,temperature-measurement,ota-requestor,tests}[-rpc][-ipv6only][-tracing]