diff --git a/Core/Src/yunhorn_sts_process.c b/Core/Src/yunhorn_sts_process.c index 454b65e..074728f 100644 --- a/Core/Src/yunhorn_sts_process.c +++ b/Core/Src/yunhorn_sts_process.c @@ -479,8 +479,8 @@ void STS_Combined_Status_Processing(void) switch (sts_work_mode) { case STS_NETWORK_MODE: - sts_status_color = sts_cloud_netcolor; - sts_lamp_bar_color = sts_cloud_netcolor; + sts_status_color = sts_cloud_netcolor+0x30; + sts_lamp_bar_color = sts_cloud_netcolor+0x30; break; case STS_WIRED_MODE: // NO LAMP BAR FOR THOSE WATER LEAKAGE SENSOR OR SOAP CAPACITY SENSORS sts_status_color = STS_DARK; diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index 2014ebe..f07d22c 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -2276,17 +2276,12 @@ void USER_APP_AUTO_RESPONDER_Parse(char *tlv_buf, uint8_t tlv_buf_size) sts_work_mode = (uint8_t)(tlv_buf[CFG_CMD4] - 0x30); if (sts_work_mode == STS_NETWORK_MODE) - { //network mode + { //network mode sts_cloud_netcolor = (uint8_t)(tlv_buf[CFG_CMD5]-0x30); - APP_LOG(TS_OFF, VLEVEL_L, "\r\n Cloud Color Set to %u \r\n", sts_cloud_netcolor); + APP_LOG(TS_OFF, VLEVEL_L, "\r\n Cloud Color Set to %u = %02X \r\n", sts_cloud_netcolor, (uint8_t)tlv_buf[CFG_CMD5]); } sts_service_mask = STS_SERVICE_MASK_L0; - if ((sts_cloud_netcolor >= 11)&&(sts_cloud_netcolor<=42)) // 'A'-'Z' - { - sts_lamp_bar_color = (sts_cloud_netcolor+0x30); - sts_status_color = sts_lamp_bar_color; - sts_cloud_netcolor += 0x30; - } + sts_cfg_nvm.work_mode = (uint8_t)sts_work_mode; sts_cfg_nvm.sts_service_mask = (uint8_t)sts_service_mask; OnStoreSTSCFGContextRequest();