From fc04f502934557dbda71ef16d619b46f9b4ce672 Mon Sep 17 00:00:00 2001 From: YunHorn Technology Date: Mon, 3 Jun 2024 13:09:58 +0800 Subject: [PATCH] minor improve... good STS_O7_General_OK_2024_06_03b --- Core/Src/sts_lamp_bar.c | 2 +- LoRaWAN/App/lora_app.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Core/Src/sts_lamp_bar.c b/Core/Src/sts_lamp_bar.c index 3ec7d51..0677d88 100644 --- a/Core/Src/sts_lamp_bar.c +++ b/Core/Src/sts_lamp_bar.c @@ -130,7 +130,7 @@ void STS_Lamp_Bar_Scoller(uint8_t color, uint8_t lum_level) { //if (sts_service_mask < STS_SERVICE_MASK_L1) // STS_WS2812B_Refresh(); - HAL_Delay(10); //MAKE THIS LESS THAN 10 NOT TO BLOCK JOIN THE LORAWAN + HAL_Delay(20); //MAKE THIS LESS THAN 10 NOT TO BLOCK JOIN THE LORAWAN //if (i < STS_LAMP_BAR_LED_NUM) { STS_WS2812B_Set_RGB(color_rgb[color][0]*lum_level,color_rgb[color][1]*lum_level, color_rgb[color][2]*lum_level, i); //} diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index d254de0..41506a6 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -587,7 +587,7 @@ void LoRaWAN_Init(void) /* USER CODE BEGIN LoRaWAN_Init_2 */ UTIL_TIMER_Start(&JoinLedTimer); - //UTIL_TIMER_Start(&STSLampBarColorTimer); + /* USER CODE END LoRaWAN_Init_2 */ LmHandlerJoin(ActivationType, ForceRejoin); @@ -969,21 +969,21 @@ static void OnJoinTimerLedEvent(void *context) static void OnYunhornSTSLampBarColorTimerEvent(void *context) { - uint8_t lum=DEFAULT_LUMINANCE_LEVEL; + //uint8_t lum=DEFAULT_LUMINANCE_LEVEL; //HAL_GPIO_TogglePin(LED1_GPIO_Port, LED1_Pin); /* STS GREEN */ //if ((sts_work_mode != STS_WIRED_MODE)) { if (sts_lamp_bar_color == STS_RED_BLUE) { if (r_b) - STS_Lamp_Bar_Set_STS_RGB_Color(STS_RED, lum); + STS_Lamp_Bar_Set_STS_RGB_Color(STS_RED, DEFAULT_LUMINANCE_LEVEL); else - STS_Lamp_Bar_Set_STS_RGB_Color(STS_BLUE, lum); + STS_Lamp_Bar_Set_STS_RGB_Color(STS_BLUE, DEFAULT_LUMINANCE_LEVEL); r_b = !r_b; } else { if (last_sts_lamp_bar_color != sts_lamp_bar_color) { - STS_Lamp_Bar_Set_STS_RGB_Color(sts_lamp_bar_color, lum); + STS_Lamp_Bar_Set_STS_RGB_Color(sts_lamp_bar_color, DEFAULT_LUMINANCE_LEVEL); last_sts_lamp_bar_color = sts_lamp_bar_color; } } @@ -1064,7 +1064,6 @@ static void OnJoinRequest(LmHandlerJoinParams_t *joinParams) heart_beat_timer = 1; UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0); - //STS_Lamp_Bar_Set_Dark(); UTIL_TIMER_Start(&STSLampBarColorTimer); /* USER CODE END OnJoinRequest_1 */ }