Transition to version 4.6

pvvx · Dec 13, 2023 · 63fd8a2 · 63fd8a2
1 parent 6a99983
commit 63fd8a2
Show file tree

Hide file tree

Showing 29 changed files with 11 additions and 6 deletions.
diff --git a/ATC_v45.bin b/ATC_v45.bin
diff --git a/ATC_v46.bin b/ATC_v46.bin
diff --git a/BTH_v45.bin b/BTH_v45.bin
diff --git a/BTH_v46.bin b/BTH_v46.bin
diff --git a/CGDK2_v45.bin b/CGDK2_v45.bin
diff --git a/CGDK2_v46.bin b/CGDK2_v46.bin
diff --git a/CGG1M_v45.bin b/CGG1M_v45.bin
diff --git a/CGG1M_v46.bin b/CGG1M_v46.bin
diff --git a/CGG1_v45.bin b/CGG1_v45.bin
diff --git a/CGG1_v46.bin b/CGG1_v46.bin
diff --git a/MHO_C122_v45.bin b/MHO_C122_v45.bin
diff --git a/MHO_C122_v46.bin b/MHO_C122_v46.bin
diff --git a/MHO_C401N_v45.bin b/MHO_C401N_v45.bin
diff --git a/MHO_C401N_v46.bin b/MHO_C401N_v46.bin
diff --git a/MHO_C401_v45.bin b/MHO_C401_v45.bin
diff --git a/MHO_C401_v46.bin b/MHO_C401_v46.bin
diff --git a/firmware.json b/firmware.json
@@ -1,6 +1,5 @@
-{"version": 69, "betaver": 70, "zbjson": "https://raw.githubusercontent.com/pvvx/ZigbeeTLc/master/firmware.json",
-"custom":["ATC_v45.bin", "MHO_C401_v45.bin", "CGG1_v45.bin", "ATC_v45.bin", "ATC_v45.bin", "ATC_v45.bin", "CGDK2_v45.bin", "CGG1M_v45.bin","MHO_C401N_v45.bin","BTH_v45.bin","ATC_v45.bin","MHO_C122_v45.bin","?","?","?","?","?","https://raw.githubusercontent.com/pvvx/BLE_THSensor/master/source/TS0201/TS0201_v45.bin"],
-"betafw":["ATC_v46.bin", "MHO_C401_v46.bin", "CGG1_v46.bin", "ATC_v46.bin", "ATC_v46.bin", "ATC_v46.bin", "CGDK2_v46.bin", "CGG1M_v46.bin","MHO_C401N_v46.bin","BTH_v46.bin","ATC_v46.bin","MHO_C122_v46.bin","?","?","?","?"],
+{"version": 70, "betaver": 71, "zbjson": "https://raw.githubusercontent.com/pvvx/ZigbeeTLc/master/firmware.json",
+"custom":["ATC_v46.bin", "MHO_C401_v46.bin", "CGG1_v46.bin", "ATC_v46.bin", "ATC_v46.bin", "ATC_v46.bin", "CGDK2_v46.bin", "CGG1M_v46.bin","MHO_C401N_v46.bin","BTH_v46.bin","ATC_v46.bin","MHO_C122_v46.bin","?","?","?","?","?","https://raw.githubusercontent.com/pvvx/BLE_THSensor/master/source/TS0201/TS0201_v45.bin"],
 "original":["Original_OTA_Xiaomi_LYWSD03MMC_v1.0.0_0130.bin","Original_OTA_Xiaomi_MHO_C401_v1.0.0_0010.bin","Original_OTA_CGG1_v1.0.1_0093.bin","Original_OTA_Xiaomi_LYWSD03MMC_v1.0.0_0130.bin","Original_OTA_Xiaomi_LYWSD03MMC_v1.0.0_0130.bin","Original_OTA_Xiaomi_LYWSD03MMC_v1.0.0_0130.bin", "Original_OTA_CGDK2_v1.1.1_0217.bin", "Original_OTA_CGG1M_v2.2.1.bin","Original_OTA_Xiaomi_MHO_C401_v1.0.0_0016.bin","Original_OTA_Xiaomi_MJWSD05MMC_v2.0.0_0026.bin","Original_OTA_Xiaomi_LYWSD03MMC_v1.0.0_0130.bin","Original_OTA_MHO_C122_tuya.bin","?","?","?","?"]}
 
 
diff --git a/src/app_att.c b/src/app_att.c
@@ -87,7 +87,7 @@ static const u8 my_ManCharVal[5] = {
 };
 static const u8 my_FirmStr[] = {"github.com/pvvx"};
 #if USE_FLASH_SERIAL_UID
-RAM uint8_t my_SerialStr[21]; // "556202-C86013-0123456"
+RAM uint8_t my_SerialStr[20]; // "556202-C86013-123456"
 #endif
 #if DEVICE_TYPE == DEVICE_MJWSD05MMC
 static const u8 my_ModelStr[] = {"MJWSD05MMC"};
@@ -489,7 +489,7 @@ void my_att_init(void) {
 	*p++ = '-';
 	// Read flash UID
 	flash_read_uid(buf);
-	memcpy(p, buf, 7);
+	memcpy(p, buf, 6);
 	//ser_uid_txt(p, &buf[4], 7);
 #endif
 #if BLE_SECURITY_ENABLE

diff --git a/src/ext_ota.c b/src/ext_ota.c
@@ -179,6 +179,11 @@ void ota_result_cb(int result) {
 	}
 }
 
+/*
+ * Input:
+ *  ota_addr (0x40000)
+ *  ota_size in kB
+ */
 uint8_t check_ext_ota(uint32_t ota_addr, uint32_t ota_size) {
 	if(ota_is_working == OTA_EXTENDED)
 		return EXT_OTA_BUSY;

diff --git a/src/sensors.c b/src/sensors.c
@@ -215,7 +215,8 @@ _attribute_ram_code_ __attribute__((optimize("-Os"))) int read_sensor_cb(void) {
 			}
 		}
 	} while (i--);
-	soft_reset_sensor();
+	check_sensor();
+	// Sleep command of the sensor = sensor_go_sleep();
 	sensor_go_sleep();
 	return 0;
 }

diff --git a/zigbee_ota/1141-0201-99993001-MHO_C401_v46.zigbee b/zigbee_ota/1141-0201-99993001-MHO_C401_v46.zigbee
diff --git a/zigbee_ota/1141-0202-99993001-CGG1M_v46.zigbee b/zigbee_ota/1141-0202-99993001-CGG1M_v46.zigbee
diff --git a/zigbee_ota/1141-0202-99993001-CGG1_v46.zigbee b/zigbee_ota/1141-0202-99993001-CGG1_v46.zigbee
diff --git a/zigbee_ota/1141-0203-99993001-ATC_v46.zigbee b/zigbee_ota/1141-0203-99993001-ATC_v46.zigbee
diff --git a/zigbee_ota/1141-0206-99993001-CGDK2_v46.zigbee b/zigbee_ota/1141-0206-99993001-CGDK2_v46.zigbee
diff --git a/zigbee_ota/1141-0208-99993001-MHO_C401N_v46.zigbee b/zigbee_ota/1141-0208-99993001-MHO_C401N_v46.zigbee
diff --git a/zigbee_ota/1141-0209-99993001-BTH_v46.zigbee b/zigbee_ota/1141-0209-99993001-BTH_v46.zigbee
diff --git a/zigbee_ota/1141-020a-99993001-ATC_v46.zigbee b/zigbee_ota/1141-020a-99993001-ATC_v46.zigbee
diff --git a/zigbee_ota/1141-020b-99993001-MHO_C122_v46.zigbee b/zigbee_ota/1141-020b-99993001-MHO_C122_v46.zigbee