diff --git a/Core/Inc/sts_lamp_bar.h b/Core/Inc/sts_lamp_bar.h index 3c30c31..ad50a76 100644 --- a/Core/Inc/sts_lamp_bar.h +++ b/Core/Inc/sts_lamp_bar.h @@ -83,8 +83,12 @@ enum sts_lamp_color { #define STS_OCCUPANCY_OVERSTAY_COLOR STS_RED #else -#define STS_VACANT_COLOR STS_GREEN -#define STS_OCCUPY_COLOR STS_RED +//#define STS_VACANT_COLOR STS_GREEN +//#define STS_OCCUPY_COLOR STS_RED +//#define STS_SOS_COLOR STS_RED_BLUE + +#define STS_VACANT_COLOR (sts_color_occupy_vacant &0x0F) +#define STS_OCCUPY_COLOR (sts_color_occupy_vacant>>4 &0x0F) #define STS_SOS_COLOR STS_RED_BLUE #define STS_FALL_NORMAL_COLOR STS_GREEN diff --git a/Core/Src/sts_lamp_bar.c b/Core/Src/sts_lamp_bar.c index 87f6222..381ae84 100644 --- a/Core/Src/sts_lamp_bar.c +++ b/Core/Src/sts_lamp_bar.c @@ -57,7 +57,8 @@ extern volatile uint8_t sts_work_mode; volatile uint8_t sts_reed_hall_ext_int = 0; volatile uint8_t sts_status_color = STS_BLUE; volatile uint8_t sts_lamp_bar_color = STS_BLUE; //puColor - +// volatile uint8_t sts_color_occupy_vacant = (STS_RED<<4|STS_GREEN); +extern volatile uint8_t sts_color_occupy_vacant; volatile uint8_t sts_lamp_bar_flashing_color = STS_RED_DARK; //0x23; RED_BLUE; extern volatile uint8_t sts_cloud_netcolor; //netColor extern volatile uint8_t sts_occupancy_status; diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index 17ae145..1ad3ccb 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -58,6 +58,7 @@ uint8_t outbuf[128]={0x0}; extern volatile uint8_t sts_ac_code[20]; extern volatile sts_cfg_nvm_t sts_cfg_nvm; extern volatile uint8_t sts_work_mode, sts_cloud_netcolor, sts_lamp_bar_color, sts_status_color, luminance_level; +extern volatile uint8_t sts_color_occupy_vacant; volatile static bool r_b=true; extern volatile uint8_t sts_pir_read; extern volatile uint32_t rfac_timer; diff --git a/STM32CubeIDE/Release/WLE5CC_NODE_STS.bin b/STM32CubeIDE/Release/WLE5CC_NODE_STS.bin index 99162e6..158f585 100644 Binary files a/STM32CubeIDE/Release/WLE5CC_NODE_STS.bin and b/STM32CubeIDE/Release/WLE5CC_NODE_STS.bin differ diff --git a/STM32CubeIDE/Release/WLE5CC_NODE_STS.elf b/STM32CubeIDE/Release/WLE5CC_NODE_STS.elf index 1267481..ba52264 100644 Binary files a/STM32CubeIDE/Release/WLE5CC_NODE_STS.elf and b/STM32CubeIDE/Release/WLE5CC_NODE_STS.elf differ