diff --git a/Core/Inc/sys_conf.h b/Core/Inc/sys_conf.h index 241072d..f10502a 100644 --- a/Core/Inc/sys_conf.h +++ b/Core/Inc/sys_conf.h @@ -47,12 +47,12 @@ extern "C" { /** * @brief Verbose level for all trace logs */ -#define VERBOSE_LEVEL VLEVEL_OFF +#define VERBOSE_LEVEL VLEVEL_M /** * @brief Enable trace logs */ -#define APP_LOG_ENABLED 0 +#define APP_LOG_ENABLED 1 /** * @brief Activate monitoring (probes) of some internal RF signals for debug purpose @@ -75,7 +75,7 @@ extern "C" { * @brief Enable/Disable MCU Debugger pins (dbg serial wires) * @note by HW serial wires are ON by default, need to put them OFF to save power */ -#define DEBUGGER_ENABLED 0 +#define DEBUGGER_ENABLED 1 /** * @brief Disable Low Power mode diff --git a/STM32CubeIDE/.settings/language.settings.xml b/STM32CubeIDE/.settings/language.settings.xml index f1b15d8..9e6a728 100644 --- a/STM32CubeIDE/.settings/language.settings.xml +++ b/STM32CubeIDE/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/STM32CubeIDE/Release/WLE5CC_NODE_STS.bin b/STM32CubeIDE/Release/WLE5CC_NODE_STS.bin index a356668..3873a7e 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 b09a7a4..856fffb 100644 Binary files a/STM32CubeIDE/Release/WLE5CC_NODE_STS.elf and b/STM32CubeIDE/Release/WLE5CC_NODE_STS.elf differ diff --git a/STS/Core/Src/yunhorn_sts_process.c b/STS/Core/Src/yunhorn_sts_process.c index c44a619..5c2830e 100644 --- a/STS/Core/Src/yunhorn_sts_process.c +++ b/STS/Core/Src/yunhorn_sts_process.c @@ -2342,6 +2342,7 @@ void YunhornSTSDurationCheckTimer(void) sts_o7_sensorData.event_sensor1_duration =0; sts_o7_sensorData.event_sensor3_motion_duration =0; sts_o7_sensorData.event_sensor2_duration = 0; + sts_o7_sensorData.event_sensor4_duration = 0; // fall sensor return zero over_threshold &= ~0x01; sts_o7_sensorData.over_stay_state = 0; @@ -2449,7 +2450,7 @@ void YunhornSTSDurationCheckTimer(void) fhmos_data.state_human_movement = STS_FHMOS_HUMAN_MOVEMENT_NORMAL; fhmos_data.color_human_movement =STS_OCCUPY_COLOR; - over_threshold |= 1<<5; + // over_threshold |= 1<<5; // APP_LOG(TS_OFF, VLEVEL_M, "\r\n 1<<5 Over Threshold =0x%02x \r\n", over_threshold); //last_sensor3_state = fhmos_data.state_human_movement; //sts_lamp_bar_color = STS_HUMAN_MOVEMENT_MOTIONLESS_NORMAL;