From b2402553d99e7e0bf18a2aa5c0973a087b3e64ba Mon Sep 17 00:00:00 2001 From: YunHorn Technology Date: Thu, 25 May 2023 18:32:16 +0800 Subject: [PATCH] no change --- Core/Inc/sts_lamp_bar.h | 2 - Core/Src/sts_lamp_bar.c | 10 ++--- .../Application/User/Core/sts_lamp_bar.cyclo | 42 +++++++++---------- 3 files changed, 26 insertions(+), 28 deletions(-) diff --git a/Core/Inc/sts_lamp_bar.h b/Core/Inc/sts_lamp_bar.h index 1257545..7911d83 100644 --- a/Core/Inc/sts_lamp_bar.h +++ b/Core/Inc/sts_lamp_bar.h @@ -33,8 +33,6 @@ extern "C" { #define STS_Status_Door_Close (0) //Normal Close NC:Open #define STS_Status_Door_Open (1) //Normal Close NC:Close -#define STS_Status_Door_Open (1<<0) //Normal Close NC:Close - enum sts_lamp_color { STS_DARK = 0, //灭：0 STS_GREEN, //绿：1 0 1 0 diff --git a/Core/Src/sts_lamp_bar.c b/Core/Src/sts_lamp_bar.c index aa57fb3..604f1ed 100644 --- a/Core/Src/sts_lamp_bar.c +++ b/Core/Src/sts_lamp_bar.c @@ -139,7 +139,7 @@ void STS_YunhornSTSEventP2_Process(void) void STS_Reed_Hall_Presence_Detection(void) { // HAL_Delay(50); // BOUNCING ELIMIATION - /* + if (STS_Reed_Hall_State == STS_Status_Door_Open) { sts_reed_hall_result = STS_Status_Door_Open; @@ -149,13 +149,13 @@ void STS_Reed_Hall_Presence_Detection(void) sts_reed_hall_result = STS_Status_Door_Close; } - */ - sts_reed_hall_result = ((STS_Reed_Hall_State)&STS_Status_Door_Open); + + //sts_reed_hall_result = ((STS_Reed_Hall_State)&STS_Status_Door_Open); // HAL_Delay(20); // BOUNCING ELIMIATION -// sts_reed_hall_changed_flag = 0; - sts_reed_hall_changed_flag = ; + sts_reed_hall_changed_flag = 0; + sts_reed_hall_ext_int = 0; } diff --git a/STM32CubeIDE/Release/Application/User/Core/sts_lamp_bar.cyclo b/STM32CubeIDE/Release/Application/User/Core/sts_lamp_bar.cyclo index f040e2b..a67b02d 100644 --- a/STM32CubeIDE/Release/Application/User/Core/sts_lamp_bar.cyclo +++ b/STM32CubeIDE/Release/Application/User/Core/sts_lamp_bar.cyclo @@ -1,24 +1,24 @@ sts_lamp_bar.c:139:6:STS_Reed_Hall_Presence_Detection 3 -sts_lamp_bar.c:195:6:STS_YunhornSTSEventP4_Process 1 -sts_lamp_bar.c:207:6:STS_YunhornSTSEventP5_Process 1 -sts_lamp_bar.c:217:6:STS_YunhornSTSEventP6_Process 1 -sts_lamp_bar.c:228:6:STS_YunhornSTSEventP7_Process 1 -sts_lamp_bar.c:239:6:STS_YunhornSTSEventP8_Process 1 -sts_lamp_bar.c:254:6:STS_WS2812B_Refresh 1 -sts_lamp_bar.c:300:6:STS_WS2812B_Set_RGB 4 -sts_lamp_bar.c:245:6:STS_Lamp_Bar_Set_Dark 2 -sts_lamp_bar.c:278:6:STS_Lamp_Bar_Scoller 3 -sts_lamp_bar.c:317:6:STS_Lamp_Bar_Set_RGB_Color 4 -sts_lamp_bar.c:340:6:STS_Lamp_Bar_Set_STS_RGB_Color 10 -sts_lamp_bar.c:261:6:STS_Lamp_Bar_Init 2 -sts_lamp_bar.c:336:6:STS_Lamp_Bar_Refresh 1 -sts_lamp_bar.c:157:6:STS_RSS_Smart_Presence_Detection 1 -sts_lamp_bar.c:174:6:STS_YunhornSTSEventP3_Process 2 -sts_lamp_bar.c:380:6:STS_Reed_Hall_Working 1 -sts_lamp_bar.c:384:6:STS_Combined_Status_Processing 54 +sts_lamp_bar.c:201:6:STS_YunhornSTSEventP4_Process 1 +sts_lamp_bar.c:213:6:STS_YunhornSTSEventP5_Process 1 +sts_lamp_bar.c:223:6:STS_YunhornSTSEventP6_Process 1 +sts_lamp_bar.c:234:6:STS_YunhornSTSEventP7_Process 1 +sts_lamp_bar.c:245:6:STS_YunhornSTSEventP8_Process 1 +sts_lamp_bar.c:260:6:STS_WS2812B_Refresh 1 +sts_lamp_bar.c:306:6:STS_WS2812B_Set_RGB 4 +sts_lamp_bar.c:251:6:STS_Lamp_Bar_Set_Dark 2 +sts_lamp_bar.c:284:6:STS_Lamp_Bar_Scoller 3 +sts_lamp_bar.c:323:6:STS_Lamp_Bar_Set_RGB_Color 4 +sts_lamp_bar.c:346:6:STS_Lamp_Bar_Set_STS_RGB_Color 10 +sts_lamp_bar.c:267:6:STS_Lamp_Bar_Init 2 +sts_lamp_bar.c:342:6:STS_Lamp_Bar_Refresh 1 +sts_lamp_bar.c:163:6:STS_RSS_Smart_Presence_Detection 1 +sts_lamp_bar.c:180:6:STS_YunhornSTSEventP3_Process 2 +sts_lamp_bar.c:386:6:STS_Reed_Hall_Working 1 +sts_lamp_bar.c:390:6:STS_Combined_Status_Processing 54 sts_lamp_bar.c:84:6:STS_YunhornSTSEventP1_Process 5 sts_lamp_bar.c:103:6:STS_YunhornSTSEventP2_Process 6 -sts_lamp_bar.c:543:6:HAL_TIM_PWM_PulseFinishedCallback 1 -sts_lamp_bar.c:550:6:STS_Lamp_Bar_Self_Test_Simple 3 -sts_lamp_bar.c:566:6:STS_Lamp_Bar_Self_Test 3 -sts_lamp_bar.c:592:6:sts_rgb_unit_test 2 +sts_lamp_bar.c:549:6:HAL_TIM_PWM_PulseFinishedCallback 1 +sts_lamp_bar.c:556:6:STS_Lamp_Bar_Self_Test_Simple 3 +sts_lamp_bar.c:572:6:STS_Lamp_Bar_Self_Test 3 +sts_lamp_bar.c:598:6:sts_rgb_unit_test 2