Merge pull request #46 from slacky1965/development

fix a large number of timers
slacky1965 · Dec 26, 2024 · 93d503b · 93d503b
2 parents d78434b + c515279
commit 93d503b
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -177,5 +177,8 @@ P.S. В реальной работе не проверялось, требуе
 	- Добавлен термостат с сигнатурой `_TZE204_xyugziqv`
 	- Увеличен буфер uart до 512 байт. Последний термостат присылает за один раз очень много пакетов.
 	- Обновлены конверторы
+- 1.0.07
+	- Устранена проблема с количеством запущенных таймеров. В z2m все работало, а в ZHA перегружалось.
+
 
 		
diff --git a/bin/1141-d3a3-1111114b-tuya_thermostat_zrd.zigbee b/bin/1141-d3a3-1111114b-tuya_thermostat_zrd.zigbee
diff --git a/...-0391-10063001-tuya_thermostat_zrd.zigbee → ...-0391-10073001-tuya_thermostat_zrd.zigbee b/...-0391-10063001-tuya_thermostat_zrd.zigbee → ...-0391-10073001-tuya_thermostat_zrd.zigbee
diff --git a/bin/tuya_thermostat_zrd_V1.0.06.bin b/bin/tuya_thermostat_zrd_V1.0.06.bin
diff --git a/bin/tuya_thermostat_zrd_V1.0.07.bin b/bin/tuya_thermostat_zrd_V1.0.07.bin
diff --git a/src/include/stack_cfg.h b/src/include/stack_cfg.h
@@ -30,6 +30,11 @@
 #endif
 
 
+/**
+ *  @brief Definition for timer event
+ */
+#define TIMER_EVENT_NUM                         (48)
+
 
 /**
  *  @brief  Working channel

diff --git a/src/include/version_cfg.h b/src/include/version_cfg.h
@@ -42,7 +42,7 @@
 #endif
 
 #define APP_RELEASE                         0x10        //app release 1.0
-#define APP_BUILD                           0x06        //app build 01, full version - v1.0.01
+#define APP_BUILD                           0x07        //app build 01, full version - v1.0.01
 #define STACK_RELEASE						0x30        //stack release 3.0
 #define STACK_BUILD							0x01        //stack build 01
 #define HW_VERSION                          0x01

diff --git a/src/zcl_appCb.c b/src/zcl_appCb.c
@@ -507,6 +507,9 @@ static void app_zclIdentifyQueryRspCmdHandler(uint8_t endpoint, uint16_t srcAddr
  */
 status_t app_identifyCb(zclIncomingAddrInfo_t *pAddrInfo, uint8_t cmdId, void *cmdPayload)
 {
+
+//    printf("app_identifyCb()\r\n");
+
 	if(pAddrInfo->dstEp == APP_ENDPOINT1){
 		if(pAddrInfo->dirCluster == ZCL_FRAME_CLIENT_SERVER_DIR){
 			switch(cmdId){

diff --git a/tl_zigbee_sdk/proj/os/ev_timer.h b/tl_zigbee_sdk/proj/os/ev_timer.h
@@ -29,7 +29,9 @@
 /**
  *  @brief Definition for timer event
  */
-#define TIMER_EVENT_NUM				(24)
+#ifndef TIMER_EVENT_NUM
+#define TIMER_EVENT_NUM             (24)
+#endif
 #define TIMER_EVENT_ENOUGH_NUM		(TIMER_EVENT_NUM - 4)
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,11 @@ @@
     #endif
+    /**
+     *  @brief Definition for timer event
+     */
+    #define TIMER_EVENT_NUM                         (48)
     /**
      *  @brief  Working channel
@@ Expand Down @@