From 56838fd9945d43b449fa7f1b8739c35c0bf92981 Mon Sep 17 00:00:00 2001 From: YunHorn Technology Date: Fri, 1 Aug 2025 19:47:59 +0800 Subject: [PATCH] minor improve --- Core/Inc/yunhorn_sts_sensors.h | 2 +- Core/Src/sts_lamp_bar.c | 36 +++++++++++++++++++++++----------- LoRaWAN/App/lora_app.c | 13 ++++++++++-- STM32CubeIDE/.cproject | 1 - 4 files changed, 37 insertions(+), 15 deletions(-) diff --git a/Core/Inc/yunhorn_sts_sensors.h b/Core/Inc/yunhorn_sts_sensors.h index 4097bca..6ed8665 100644 --- a/Core/Inc/yunhorn_sts_sensors.h +++ b/Core/Inc/yunhorn_sts_sensors.h @@ -644,7 +644,7 @@ enum nvm_order { enum color_effects_list { COLOR_NORMAL =0, COLOR_BREATH, - COLOR_FADE_ALL, + COLOR_FADE_FULL, COLOR_FADE_HALF, COLOR_WAVE, COLOR_ROLLING diff --git a/Core/Src/sts_lamp_bar.c b/Core/Src/sts_lamp_bar.c index 50ab3f8..8ee59e6 100644 --- a/Core/Src/sts_lamp_bar.c +++ b/Core/Src/sts_lamp_bar.c @@ -261,25 +261,25 @@ void STS_Lamp_Bar_Set_STS_RGB_Color_FadeIn(uint8_t sts_lamp_color, uint8_t max_l // STS_Lamp_Bar_Set_RGB_Color(0x0, 0x0, 0x0); break; case STS_GREEN: - STS_Lamp_Bar_Set_RGB_Color_FadeIn(0x0, max_lum_level, 0x0, LED_COUNT/2, fade_length); + STS_Lamp_Bar_Set_RGB_Color_FadeIn(0x0, max_lum_level, 0x0, (LED_COUNT-fade_length), fade_length); break; case STS_RED: - STS_Lamp_Bar_Set_RGB_Color_FadeIn(max_lum_level, 0x0, 0x0, LED_COUNT/2, fade_length); + STS_Lamp_Bar_Set_RGB_Color_FadeIn(max_lum_level, 0x0, 0x0, (LED_COUNT-fade_length), fade_length); break; case STS_BLUE: - STS_Lamp_Bar_Set_RGB_Color_FadeIn(0x0, 0x0, max_lum_level, LED_COUNT/2, fade_length); + STS_Lamp_Bar_Set_RGB_Color_FadeIn(0x0, 0x0, max_lum_level, (LED_COUNT-fade_length), fade_length); break; case STS_YELLOW: - STS_Lamp_Bar_Set_RGB_Color_FadeIn(max_lum_level, max_lum_level, 0x0, LED_COUNT/2, fade_length); + STS_Lamp_Bar_Set_RGB_Color_FadeIn(max_lum_level, max_lum_level, 0x0, (LED_COUNT-fade_length), fade_length); break; case STS_PINK: - STS_Lamp_Bar_Set_RGB_Color_FadeIn(max_lum_level, 0x0, max_lum_level, LED_COUNT/2, fade_length); + STS_Lamp_Bar_Set_RGB_Color_FadeIn(max_lum_level, 0x0, max_lum_level, (LED_COUNT-fade_length), fade_length); break; case STS_CYAN: - STS_Lamp_Bar_Set_RGB_Color_FadeIn(0x0, max_lum_level, max_lum_level, LED_COUNT/2, fade_length); + STS_Lamp_Bar_Set_RGB_Color_FadeIn(0x0, max_lum_level, max_lum_level, (LED_COUNT-fade_length), fade_length); break; case STS_WHITE: - STS_Lamp_Bar_Set_RGB_Color_FadeIn(max_lum_level, max_lum_level, max_lum_level, LED_COUNT/2, fade_length); + STS_Lamp_Bar_Set_RGB_Color_FadeIn(max_lum_level, max_lum_level, max_lum_level, (LED_COUNT-fade_length), fade_length); break; } @@ -357,19 +357,33 @@ void STS_Lamp_Bar_Self_Test_Fade(void) { uint16_t color=0, lum_level=DEFAULT_LUMINANCE_LEVEL; - APP_LOG(TS_OFF, VLEVEL_M, "\r\n [#1] RGB Space Fade Out Testing Start\r\n"); + APP_LOG(TS_OFF, VLEVEL_M, "\r\n [#1] RGB Space Fade Out HALF Testing Start\r\n"); for (color=STS_GREEN; color < STS_COLOR_MAX; color++) { STS_Lamp_Bar_Set_STS_RGB_Color_FadeOut(color&0xff, lum_level&0xff, LED_COUNT/2); - HAL_Delay(300); + HAL_Delay(200); } - APP_LOG(TS_OFF, VLEVEL_M, "\r\n [#1] RGB Space Fade In Testing Start\r\n"); + APP_LOG(TS_OFF, VLEVEL_M, "\r\n [#1] RGB Space Fade In HALF Testing Start\r\n"); for (color=STS_GREEN; color < STS_COLOR_MAX; color++) { STS_Lamp_Bar_Set_STS_RGB_Color_FadeIn(color&0xff, lum_level&0xff, LED_COUNT/2); - HAL_Delay(300); + HAL_Delay(200); } + APP_LOG(TS_OFF, VLEVEL_M, "\r\n [#1] RGB Space Fade Out FULL Testing Start\r\n"); + for (color=STS_GREEN; color < STS_COLOR_MAX; color++) + { + STS_Lamp_Bar_Set_STS_RGB_Color_FadeOut(color&0xff, lum_level&0xff, LED_COUNT-2); + HAL_Delay(200); + } + + APP_LOG(TS_OFF, VLEVEL_M, "\r\n [#1] RGB Space Fade In FULL Testing Start\r\n"); + for (color=STS_GREEN; color < STS_COLOR_MAX; color++) + { + STS_Lamp_Bar_Set_STS_RGB_Color_FadeIn(color&0xff, lum_level&0xff, LED_COUNT-2); + HAL_Delay(200); + } + APP_LOG(TS_OFF, VLEVEL_M, "\r\n [#1] RGB Space Fade Out / Fade In Testing Finished\r\n"); } diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index dc1cce6..69fa7c2 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -134,7 +134,7 @@ volatile sts_cfg_nvm_t sts_cfg_nvm = { 0x43, // color severity l2 l3, yellow blue 0x20, //sensor install height in 10 cm, default 32*10=320cm, 3.2meter - COLOR_FADE_HALF, // color effects + COLOR_FADE_FULL, // color effects 0x06, //reserve6 alarm_mute_or_reset_expire_timer_in_10sec, 60 seconds 0x23, //reserve7 alarm Lamp Bar Flashing color define, 0x20, 2==STS_RED, 0 = STS_DARK, 0x23, 2=STS_RED, 3=STS_BLUE 0x03, //reserve8 occupancy over time threshold 3*10 = 30 minutes @@ -1282,7 +1282,16 @@ static void OnYunhornSTSLampBarColorTimerEvent(void *context) break; case COLOR_BREATH: break; - case COLOR_FADE_ALL: + case COLOR_FADE_FULL: + if ((sts_rss_result == STS_RESULT_MOTION)) //||(sts_reed_hall_result == STS_Status_Door_Close )) + { + //STS_Lamp_Bar_Set_STS_RGB_Color_FadeOut(STS_COLOR_DEFAULT_OCCUPY, luminance_level, LED_COUNT/2); + STS_Lamp_Bar_Set_STS_RGB_Color_FadeOut(sts_lamp_bar_color, luminance_level, LED_COUNT); + } else //if ((sts_rss_result == STS_RESULT_NO_MOTION)||(sts_reed_hall_result == STS_Status_Door_Open )){ + { + STS_Lamp_Bar_Set_STS_RGB_Color_FadeIn(sts_lamp_bar_color, luminance_level, LED_COUNT); + //STS_Lamp_Bar_Set_STS_RGB_Color_FadeIn(STS_COLOR_DEFAULT_VACANT, luminance_level, LED_COUNT/2); + } break; case COLOR_FADE_HALF: if ((sts_rss_result == STS_RESULT_MOTION)) //||(sts_reed_hall_result == STS_Status_Door_Close )) diff --git a/STM32CubeIDE/.cproject b/STM32CubeIDE/.cproject index aefdbde..7870d0d 100644 --- a/STM32CubeIDE/.cproject +++ b/STM32CubeIDE/.cproject @@ -154,7 +154,6 @@