sundp
/
WLE5CC_NODE_STS
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor improve TIME_C

This commit is contained in:
Yunhorn 2025-06-26 19:17:07 +08:00
parent d93be72fad
commit 965b04187c
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
STM32CubeIDE/.settings/language.settings.xml
View File

@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-1364498518074211444" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-898298991057946541" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>
@ -16,7 +16,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-1364498518074211444" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-898298991057946541" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>

4
STS/Core/Src/yunhorn_sts_process.c
View File

@ -2431,7 +2431,7 @@ void YunhornSTSDurationCheckTimer(void)
LED_RED_ON; LED_RED_ON;
sts_lamp_bar_color = STS_OCCUPANCY_OVERSTAY_COLOR; sts_lamp_bar_color = STS_OCCUPANCY_OVERSTAY_COLOR;
// APP_LOG(TS_OFF, VLEVEL_M, "\r\nSensor1 overstay set color to %d color:%s\r\n",sts_lamp_bar_color, (char*)code2color[sts_lamp_bar_color]); APP_LOG(TS_OFF, VLEVEL_M, "\r\nSensor1 overstay set color to 0x%02x color: %s\r\n",sts_lamp_bar_color, (char*)code2color[sts_lamp_bar_color]);
over_threshold |= 1<<0; over_threshold |= 1<<0;
// APP_LOG(TS_OFF, VLEVEL_M, "\r\n 1<<1 Over Threshold =0x%02x \r\n", over_threshold); // APP_LOG(TS_OFF, VLEVEL_M, "\r\n 1<<1 Over Threshold =0x%02x \r\n", over_threshold);
} }
@ -2450,7 +2450,7 @@ void YunhornSTSDurationCheckTimer(void)
fhmos_data.state_occupancy = STS_FHMOS_OCCUPANCY_NO_OCCUPY; fhmos_data.state_occupancy = STS_FHMOS_OCCUPANCY_NO_OCCUPY;
fhmos_data.state_human_movement = STS_FHMOS_HUMAN_MOVEMENT_NO_OCCUPY; fhmos_data.state_human_movement = STS_FHMOS_HUMAN_MOVEMENT_NO_OCCUPY;
sts_lamp_bar_color = STS_VACANT_COLOR; sts_lamp_bar_color = STS_VACANT_COLOR;
APP_LOG(TS_OFF, VLEVEL_M, "\r\nSensor1 Door Open, Overstay set color to 0x%02x color: %s\r\n",sts_lamp_bar_color, (char*)code2color[sts_lamp_bar_color]);
LED_RED_OFF; LED_RED_OFF;
LED_GREEN_ON; LED_GREEN_ON;

12
STS/TOF/App/app_tof.c
View File

@ -57,7 +57,7 @@ extern volatile uint8_t sts_fhmos_bitmap_pending;
#include "stm32wlxx_nucleo.h" #include "stm32wlxx_nucleo.h"
//static int to_confirm = 0; //static int to_confirm = 0;
static uint8_t yes_count=0, no_count=0; static uint8_t yes_count=0, no_count=0;
#define TIME_C 2 #define TIME_C 4
static uint32_t STS_Get_Center_Range_Distance(RANGING_SENSOR_Result_t *Result); static uint32_t STS_Get_Center_Range_Distance(RANGING_SENSOR_Result_t *Result);
uint16_t bg_distance[64]={0}; uint16_t bg_distance[64]={0};
uint8_t idx[64]={0}; uint8_t idx[64]={0};
@ -830,16 +830,21 @@ static void print_result(RANGING_SENSOR_Result_t *Result)
//to_confirm ++; //to_confirm ++;
if (yes_count < TIME_C) if (yes_count < TIME_C)
{ {
yes_count ++; yes_count ++;
APP_LOG(TS_OFF, VLEVEL_M, "\r\n Yes ++ =%d \r\n", yes_count);
} else { } else {
no_count =0; no_count =0;
} }
} else if ((head_distance_from_ceiling_mm < (factor2_head_level_from_floor_mm - 150))) // TODO XXX 50mm gap to avoid flapping back and forth } else //if ((head_distance_from_ceiling_mm < (factor2_head_level_from_floor_mm - 150))) // TODO XXX 50mm gap to avoid flapping back and forth
{ {
if (no_count < TIME_C) if (no_count < TIME_C)
{ {
no_count ++; no_count ++;
APP_LOG(TS_OFF, VLEVEL_M, "\r\n No ++ =%d \r\n", no_count);
} else { } else {
yes_count =0; yes_count =0;
} }
@ -849,7 +854,7 @@ static void print_result(RANGING_SENSOR_Result_t *Result)
{ {
sts_head_level_low = 1; sts_head_level_low = 1;
} else if (no_count > (TIME_C -1)) } else if (no_count > (TIME_C -3))
{ {
sts_head_level_low = 0; sts_head_level_low = 0;
@ -857,6 +862,7 @@ static void print_result(RANGING_SENSOR_Result_t *Result)
APP_LOG(TS_OFF, VLEVEL_M, "\r\n return zero statues, bitmap status=%d \r\n", sts_fhmos_bitmap_pending); APP_LOG(TS_OFF, VLEVEL_M, "\r\n return zero statues, bitmap status=%d \r\n", sts_fhmos_bitmap_pending);
} }
APP_LOG(TS_OFF, VLEVEL_M, "\r\n Yes =%d No =%d head low =%d \r\n", yes_count, no_count, sts_head_level_low);
//OnSensorL8AStateChanged(); //OnSensorL8AStateChanged();
} }