diff --git a/Core/Inc/yunhorn_sts_prd_conf.h b/Core/Inc/yunhorn_sts_prd_conf.h index 75cd22e..815e625 100644 --- a/Core/Inc/yunhorn_sts_prd_conf.h +++ b/Core/Inc/yunhorn_sts_prd_conf.h @@ -247,7 +247,7 @@ #define MajorVer 25U #define MinorVer 6U -#define SubMinorVer 16U +#define SubMinorVer 17U #define FirmwareVersion 3U #define YUNHORN_STS_MAX_NVM_CFG_SIZE 64U diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index 86a47ad..7d33720 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -1053,7 +1053,9 @@ static void SendTxData(void) AppData.Buffer[i++] = (uint8_t)(sensorData.state_sensor2_on_off)&0xff; //04 Sensor head #2 status reed switch } else if (sts_work_mode == STS_RSS_MODE) { - AppData.Buffer[i++] = (uint8_t)(sensorData.state_sensor1_on_off)&0xff; //03 Sensor head #1 status reed switch + // 2025-06-17, eliminate reed switch state upload + //AppData.Buffer[i++] = (uint8_t)(sensorData.state_sensor1_on_off)&0xff; //03 Sensor head #1 status reed switch + AppData.Buffer[i++] = (uint8_t)(0x01)&0xff; //03 Sensor head #1 status reed switch keep to 0x01 door open AppData.Buffer[i++] = (uint8_t)(sensorData.state_sensor3_on_off)&0xff; //04 Sensor head #3 status RSS motion } else if (sts_work_mode == STS_DUAL_MODE) diff --git a/STM32CubeIDE/Release/STS_O7.bin b/STM32CubeIDE/Release/STS_O7.bin index 7fb17bf..920916d 100644 Binary files a/STM32CubeIDE/Release/STS_O7.bin and b/STM32CubeIDE/Release/STS_O7.bin differ diff --git a/STM32CubeIDE/Release/sts_o6_rtm_atal_20250616.bin b/STM32CubeIDE/Release/sts_o6_rtm_atal_20250616.bin new file mode 100644 index 0000000..7fb17bf Binary files /dev/null and b/STM32CubeIDE/Release/sts_o6_rtm_atal_20250616.bin differ diff --git a/STM32CubeIDE/Release/sts_o6_rtm_atal_20250617r1.bin b/STM32CubeIDE/Release/sts_o6_rtm_atal_20250617r1.bin new file mode 100644 index 0000000..920916d Binary files /dev/null and b/STM32CubeIDE/Release/sts_o6_rtm_atal_20250617r1.bin differ diff --git a/STM32CubeIDE/Release/sts_o6_rtm_pixel_network_20250616r1.bin b/STM32CubeIDE/Release/sts_o6_rtm_pixel_network_20250616r1.bin new file mode 100644 index 0000000..7fb17bf Binary files /dev/null and b/STM32CubeIDE/Release/sts_o6_rtm_pixel_network_20250616r1.bin differ diff --git a/STM32CubeIDE/Release/sts_o6_rtm_pixel_network_20250617r1.bin b/STM32CubeIDE/Release/sts_o6_rtm_pixel_network_20250617r1.bin new file mode 100644 index 0000000..920916d Binary files /dev/null and b/STM32CubeIDE/Release/sts_o6_rtm_pixel_network_20250617r1.bin differ