Merge branch 'hal' into hal-build

romasku · romasku · commit 3e257cb43af2 · 2025-11-03T22:18:03.000+02:00
diff --git a/helper_scripts/templates/switch_custom.js.jinja b/helper_scripts/templates/switch_custom.js.jinja
@@ -217,15 +217,34 @@ const definitions = [
         meta: { multiEndpoint: true },
         configure: async (device, coordinatorEndpoint, logger) => {
             {% for switchName in device.switchNames %}
-            await reporting.bind(device.getEndpoint({{loop.index}}), coordinatorEndpoint, ["genMultistateInput"]);
+            const endpoint{{loop.index}} = device.getEndpoint({{loop.index}});
+            await reporting.bind(endpoint{{loop.index}}, coordinatorEndpoint, ["genMultistateInput"]);
+            // switch action:
+            await endpoint{{loop.index}}.configureReporting("genMultistateInput", [
+                {
+                    attribute: {ID: 0x0055 /* presentValue */, type: 0x21}, // uint16
+                    minimumReportInterval: 0,
+                    maximumReportInterval: constants.repInterval.MAX,
+                    reportableChange: 1,
+                },
+            ]);
             {% endfor %}
             {% for relayName in device.relayNames %}
             const endpoint{{loop.index  + (device.switchNames | length)}} = device.getEndpoint({{loop.index  + (device.switchNames | length)}});
             await reporting.onOff(endpoint{{loop.index  + (device.switchNames | length)}}, {
                 min: 0,
-                max: constants.repInterval.MINUTE,
+                max: constants.repInterval.MAX,
                 change: 1,
             });
+            // indicator:
+            await endpoint{{loop.index  + (device.switchNames | length)}}.configureReporting("genOnOff", [
+                {
+                    attribute: {ID: 0xff02, type: 0x10}, // Boolean
+                    minimumReportInterval: 0,
+                    maximumReportInterval: constants.repInterval.MAX,
+                    reportableChange: 1,
+                },
+            ]);
             {% endfor %}
         },
         {% if z2m_v1 %}
diff --git a/src/device_config/config_nv.c b/src/device_config/config_nv.c
@@ -34,8 +34,6 @@ void device_config_write_to_nv() {
   }
 }
 
-void device_config_remove_from_nv() { hal_nvm_delete(NV_ITEM_DEVICE_CONFIG); }
-
 void device_config_read_from_nv() {
   hal_nvm_status_t st = 0;
 
diff --git a/src/device_config/config_parser.c b/src/device_config/config_parser.c
@@ -13,6 +13,7 @@
 #include "base_components/led.h"
 #include "base_components/network_indicator.h"
 #include "config_nv.h"
+#include "device_config/reset.h"
 #include "hal/system.h"
 #include "hal/zigbee.h"
 #include "hal/zigbee_ota.h"
@@ -52,12 +53,11 @@ uint8_t relay_clusters_cnt = 0;
 hal_zigbee_cluster clusters[32];
 hal_zigbee_endpoint endpoints[10];
 
-void reset_to_default_config();
 uint32_t parse_int(const char *s);
 char *seek_until(char *cursor, char needle);
 char *extract_next_entry(char **cursor);
 
-void onResetClicked(void *_) { hal_zigbee_leave_network(); }
+void on_reset_clicked(void *_) { reset_all(); }
 
 void parse_config() {
   device_config_read_from_nv();
@@ -68,7 +68,7 @@ void parse_config() {
   basic_cluster.manuName[0] = strlen(zb_manufacturer);
   if (basic_cluster.manuName[0] > 31) {
     printf("Manufacturer too big\r\n");
-    reset_to_default_config();
+    reset_all();
   }
   memcpy(basic_cluster.manuName + 1, zb_manufacturer,
          basic_cluster.manuName[0]);
@@ -77,7 +77,7 @@ void parse_config() {
   basic_cluster.modelId[0] = strlen(zb_model);
   if (basic_cluster.modelId[0] > 31) {
     printf("Model too big\r\n");
-    reset_to_default_config();
+    reset_all();
   }
   memcpy(basic_cluster.modelId + 1, zb_model, basic_cluster.modelId[0]);
 
@@ -93,7 +93,7 @@ void parse_config() {
       buttons[buttons_cnt].pin = pin;
       buttons[buttons_cnt].long_press_duration_ms = 2000;
       buttons[buttons_cnt].multi_press_duration_ms = 800;
-      buttons[buttons_cnt].on_long_press = onResetClicked;
+      buttons[buttons_cnt].on_long_press = on_reset_clicked;
       buttons_cnt++;
     } else if (entry[0] == 'L') {
       hal_gpio_pin_t pin = hal_gpio_parse_pin(entry + 1);
@@ -277,12 +277,6 @@ void init_reporting() {
 
 // Helper functions
 
-__attribute__((noreturn)) void reset_to_default_config() {
-  printf("RESET reset_to_default_config\r\n");
-  device_config_remove_from_nv();
-  hal_system_reset();
-}
-
 char *seek_until(char *cursor, char needle) {
   while (*cursor != needle && *cursor != '\0') {
     cursor++;
diff --git a/src/device_config/reset.c b/src/device_config/reset.c
@@ -0,0 +1,11 @@
+
+#include "reset.h"
+#include "hal/nvm.h"
+#include "hal/printf_selector.h"
+#include "hal/system.h"
+
+__attribute__((noreturn)) void reset_all() {
+  printf("RESET ALL!\r\n");
+  hal_nvm_clear_all();
+  hal_system_reset();
+}
diff --git a/src/device_config/reset.h b/src/device_config/reset.h
@@ -0,0 +1,7 @@
+#ifndef RESET_H
+#define RESET_H
+
+__attribute__((noreturn)) void reset_all();
+void leave_network();
+
+#endif // RESET_H
diff --git a/src/silabs/Makefile b/src/silabs/Makefile
@@ -9,6 +9,7 @@ GCC_BIN            ?= arm-none-eabi-gcc
 # Version and board configuration
 VERSION_STR ?= 0.0.0
 FILE_VERSION ?= 0
+DEBUG ?= 0
 
 
 DEVICE_TYPE ?= router
@@ -80,6 +81,13 @@ BOOTLOADER_PROJECT_FILE := bootloader.slcp
 OTA_FILE ?= $(ZIGBEE_BUILD_DIR)/build/release/$(ZIGBEE_PROJECT_NAME)_ota.bin
 BIN_FILE ?= $(ZIGBEE_BUILD_DIR)/build/release/$(ZIGBEE_PROJECT_NAME).s37
 
+# Component exclusion based on DEBUG flag
+ifeq ($(DEBUG), 0)
+	WITHOUT_COMPONENTS = --without=iostream_usart:inst,iostream_recommended_stream
+else
+	WITHOUT_COMPONENTS =
+endif
+
 # Generate project files
 gen:
 	rm -rf $(ZIGBEE_BUILD_DIR)
@@ -96,6 +104,7 @@ gen:
 		-d "$(ZIGBEE_BUILD_DIR)" \
 		-name $(ZIGBEE_PROJECT_NAME) \
 		--with EFR32MG21A020F768IM32 \
+		$(WITHOUT_COMPONENTS) \
 		--toolchain=gcc \
 		--output-type=makefile
 	
diff --git a/src/silabs/zigbee.slcp b/src/silabs/zigbee.slcp
@@ -36,6 +36,8 @@ source:
 - {path: ../device_config/config_parser.c}
 - {path: ../device_config/config_parser.h}
 - {path: ../device_config/nvm_items.h}
+- {path: ../device_config/reset.c}
+- {path: ../device_config/reset.h}
 - {path: ../zigbee/basic_cluster.c}
 - {path: ../zigbee/general_commands.c}
 - {path: ../zigbee/group_cluster.c}
diff --git a/src/silabs/zigbee_end_device.slcp b/src/silabs/zigbee_end_device.slcp
@@ -36,6 +36,8 @@ source:
 - {path: ../device_config/config_parser.c}
 - {path: ../device_config/config_parser.h}
 - {path: ../device_config/nvm_items.h}
+- {path: ../device_config/reset.c}
+- {path: ../device_config/reset.h}
 - {path: ../zigbee/basic_cluster.c}
 - {path: ../zigbee/general_commands.c}
 - {path: ../zigbee/group_cluster.c}
diff --git a/src/stub/Makefile b/src/stub/Makefile
@@ -49,6 +49,7 @@ SOURCES := \
 	$(SRC_DIR)/base_components/network_indicator.c \
 	$(SRC_DIR)/device_config/config_parser.c \
 	$(SRC_DIR)/device_config/config_nv.c \
+	$(SRC_DIR)/device_config/reset.c \
 	$(SRC_DIR)/zigbee/basic_cluster.c \
 	$(SRC_DIR)/zigbee/relay_cluster.c \
 	$(SRC_DIR)/zigbee/switch_cluster.c \
diff --git a/src/telink/Makefile b/src/telink/Makefile
@@ -145,6 +145,7 @@ COMMON_SOURCES := \
 	$(SRC_DIR)/base_components/network_indicator.c \
 	$(SRC_DIR)/base_components/relay.c \
 	$(SRC_DIR)/device_config/config_nv.c \
+	$(SRC_DIR)/device_config/reset.c \
 	$(SRC_DIR)/device_config/config_parser.c \
 	$(SRC_DIR)/zigbee/basic_cluster.c \
 	$(SRC_DIR)/zigbee/general_commands.c \
diff --git a/src/telink/main.c b/src/telink/main.c
@@ -64,10 +64,8 @@ int real_main(startup_state_e state) {
       if (timerEvt) {
         sleepDuration = timerEvt->timeout;
       }
-      printf("Enter low power (%d ms)\r\n", sleepDuration);
       drv_pm_sleep(PM_SLEEP_MODE_SUSPEND,
                    PM_WAKEUP_SRC_PAD | PM_WAKEUP_SRC_TIMER, sleepDuration);
-      printf("Exit low power\r\n");
     }
 #endif
   }
diff --git a/src/zigbee/switch_cluster.c b/src/zigbee/switch_cluster.c
@@ -5,7 +5,10 @@
 #include "consts.h"
 #include "device_config/nvm_items.h"
 #include "hal/nvm.h"
+
 #include "hal/printf_selector.h"
+#include "hal/system.h"
+#include "hal/tasks.h"
 #include "relay_cluster.h"
 #include "zigbee_commands.h"
 
@@ -371,10 +374,19 @@ void switch_cluster_on_button_long_press(zigbee_switch_cluster *cluster) {
                                       ZCL_ATTR_MULTISTATE_INPUT_PRESENT_VALUE);
 }
 
+hal_task_t restart_task;
+
+void reset_tasks_handler(void *arg) { hal_system_reset(); }
+
 void switch_cluster_on_button_multi_press(zigbee_switch_cluster *cluster,
                                           uint8_t press_count) {
   if (press_count > MULTI_PRESS_CNT_TO_RESET) {
     hal_zigbee_leave_network();
+    // Give it time to leave network before restart
+    restart_task.handler = reset_tasks_handler;
+    restart_task.arg = NULL;
+    hal_tasks_init(&restart_task);
+    hal_tasks_schedule(&restart_task, 2000);
   }
 }
 
diff --git a/tests/client.py b/tests/client.py
@@ -70,7 +70,7 @@ def start(self) -> "StubProc":
         return self
 
     def stop(self, kill_after: float = 0.02) -> None:
-        if not self.proc:
+        if not self.proc or not self.is_running():
             return
         try:
             self.exec("q", timeout=0.2)
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -356,6 +356,14 @@ def zcl_switch_get_multistate_value(self, endpoint: int) -> str:
             ZCL_ATTR_MULTISTATE_INPUT_PRESENT_VALUE,
         )
 
+    def zcl_switch_await_multistate_value_reported_change(self, endpoint: int) -> str:
+        self.wait_for_attr_change(
+            endpoint,
+            ZCL_CLUSTER_MULTISTATE_INPUT_BASIC,
+            ZCL_ATTR_MULTISTATE_INPUT_PRESENT_VALUE,
+        )
+        return self.zcl_switch_get_multistate_value(endpoint)
+
 
 def wait_for(
     condition_fn: Callable[[], bool], timeout: float = 2.0, interval: float = 0.1
diff --git a/tests/test_network_join.py b/tests/test_network_join.py
@@ -1,5 +1,5 @@
 from tests.client import StubProc
-from tests.conftest import Device
+from tests.conftest import Device, wait_for
 
 HAL_ZIGBEE_NETWORK_NOT_JOINED = 0
 HAL_ZIGBEE_NETWORK_JOINED = 1
@@ -77,9 +77,10 @@ def test_leaves_on_onboard_button_long_press() -> None:
         device = Device(proc)
         assert device.status()["joined"] == str(HAL_ZIGBEE_NETWORK_JOINED)
 
-        device.long_click_button("A0", 3000)
+        device.press_button("A0")
+        device.step_time(3000)
 
-        assert device.status()["joined"] == str(HAL_ZIGBEE_NETWORK_JOINING)
+        wait_for(lambda: not proc.is_running(), timeout=5.0)
 
 
 def test_announces_after_join() -> None:
diff --git a/tests/test_switch_cluster_momentary_mode.py b/tests/test_switch_cluster_momentary_mode.py
@@ -578,3 +578,25 @@ def test_momentary_mode_multistate_value_normaly_closed(
         )
         == "0"
     )
+
+
+def test_momentary_mode_multistate_action_reporting(
+        momentary_device: Device, relay_button_pair: RelayButtonPair
+):
+    momentary_device.press_button(relay_button_pair.button_pin)
+    assert (
+        momentary_device.zcl_switch_await_multistate_value_reported_change(relay_button_pair.switch_endpoint)
+        == "1"
+    )
+
+    momentary_device.step_time(2_000)
+    assert (
+        momentary_device.zcl_switch_await_multistate_value_reported_change(relay_button_pair.switch_endpoint)
+        == "2"
+    )
+
+    momentary_device.release_button(relay_button_pair.button_pin)
+    assert (
+        momentary_device.zcl_switch_await_multistate_value_reported_change(relay_button_pair.switch_endpoint)
+        == "0"
+    )

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,6 @@ void device_config_write_to_nv() {`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
`37`		`-void device_config_remove_from_nv() { hal_nvm_delete(NV_ITEM_DEVICE_CONFIG); }`
`38`		`-`
`39`	`37`	`void device_config_read_from_nv() {`
`40`	`38`	`hal_nvm_status_t st = 0;`
`41`	`39`