diff --git a/Core/Inc/sys_conf.h b/Core/Inc/sys_conf.h index f10502a..241072d 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_M +#define VERBOSE_LEVEL VLEVEL_OFF /** * @brief Enable trace logs */ -#define APP_LOG_ENABLED 1 +#define APP_LOG_ENABLED 0 /** * @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 1 +#define DEBUGGER_ENABLED 0 /** * @brief Disable Low Power mode diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index 66653c0..dc9228e 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -364,7 +364,7 @@ static void OnYunhornSTSDurationCheckTimerEvent(void *context); * @param context ptr of STS RSS WakeUp context */ -static void OnYunhornSTSOORSSWakeUpTimerEvent(void *context); +//static void OnYunhornSTSOORSSWakeUpTimerEvent(void *context); /** * @brief Yunhorn STS Heart beat timer callback function @@ -1751,13 +1751,14 @@ static void OnYunhornSTSLampBarColorTimerEvent(void *context) * @brief SYS occupancy, door lock, motion duration check timer callback function * @param context ptr of duration check context */ +#if 0 static void OnYunhornSTSDurationCheckTimerEvent(void *context) { #ifdef STS_O6 #endif } - +#endif /** * @brief Yunhorn STS Occupancy RSS WakeUP timer callback function * @param context ptr of STS RSS WakeUp context diff --git a/STM32CubeIDE/Release/WLE5CC_NODE_STS.elf b/STM32CubeIDE/Release/WLE5CC_NODE_STS.elf index 613cc85..8e1c559 100644 Binary files a/STM32CubeIDE/Release/WLE5CC_NODE_STS.elf and b/STM32CubeIDE/Release/WLE5CC_NODE_STS.elf differ diff --git a/STM32CubeIDE/Release/sts_o6t_debug_20250514.elf b/STM32CubeIDE/Release/sts_o6t_debug_20250514.elf new file mode 100644 index 0000000..613cc85 Binary files /dev/null and b/STM32CubeIDE/Release/sts_o6t_debug_20250514.elf differ diff --git a/STS/Core/Inc/yunhorn_sts_sensors.h b/STS/Core/Inc/yunhorn_sts_sensors.h index 11605e3..2b96dad 100644 --- a/STS/Core/Inc/yunhorn_sts_sensors.h +++ b/STS/Core/Inc/yunhorn_sts_sensors.h @@ -257,6 +257,8 @@ void OnRestoreSTSCFGContextProcess(void); void STS_SENSOR_Power_ON(uint8_t cnt); void STS_SENSOR_Power_OFF(uint8_t cnt); void STS_SENSOR_MEMS_Reset(uint8_t cnt); +void STS_Sensor_Init(void); +void STS_Sensor_Prepare(void); void STS_PRESENCE_SENSOR_NVM_CFG(void); void STS_PRESENCE_SENSOR_NVM_CFG_SIMPLE(void); diff --git a/STS/TOF/App/app_tof.c b/STS/TOF/App/app_tof.c index 601d9ba..fe2dc79 100644 --- a/STS/TOF/App/app_tof.c +++ b/STS/TOF/App/app_tof.c @@ -84,7 +84,7 @@ static void MX_53L8A1_ThresholdDetection_Process(void); static void print_result(RANGING_SENSOR_Result_t *Result); #endif -static int32_t status = 0; +//static int32_t status = 0; volatile uint8_t ToF_EventDetected = 0; uint16_t sensor_id=0; diff --git a/STS/TOF/App/app_tof_peoplecount.c b/STS/TOF/App/app_tof_peoplecount.c index 834ef31..aae097d 100644 --- a/STS/TOF/App/app_tof_peoplecount.c +++ b/STS/TOF/App/app_tof_peoplecount.c @@ -67,7 +67,7 @@ int status = 0; volatile int IntCount; #define isInterrupt 1 /* If isInterrupt = 1 then device working in interrupt mode, else device working in polling mode */ /* USER CODE END PV */ -static int PplCounter; +//static int PplCounter; static int center[2] = {FRONT_ZONE_CENTER,BACK_ZONE_CENTER}; static int Zone = 0; @@ -661,16 +661,17 @@ void STS_TOF_VL53LX_PeopleCounting_Process_Start(void) #if (defined(STS_T6)) void STS_TOF_VL53LX_PresenceDetection_Process_Start(void) { + int status=0; //APP_LOG(TS_OFF, VLEVEL_M,"############### TOF VL53LX_ PRESENCE DETECTION SUB-PROCESS \r\n"); { //volatile int sts_tof_init_status=0; if (sts_tof_init_status !=0) { - int ret=sts_tof_vl53lx_presence_detection_init(); + status=sts_tof_vl53lx_presence_detection_init(); } else { - int status = sts_tof_vl53lx_presence_detection_start(); + status = sts_tof_vl53lx_presence_detection_start(); if (status == -1) { sts_tof_vl53lx_presence_detection_init(); diff --git a/STS/TOF/vl53l1x_uld/X-NUCLEO-53L1A1.c b/STS/TOF/vl53l1x_uld/X-NUCLEO-53L1A1.c index d85842a..5e7cbd2 100644 --- a/STS/TOF/vl53l1x_uld/X-NUCLEO-53L1A1.c +++ b/STS/TOF/vl53l1x_uld/X-NUCLEO-53L1A1.c @@ -96,7 +96,7 @@ CurIOVal; /* Forward definition of private function */ -static int _ExpanderRd(int I2cExpAddr, int index, uint8_t *data, int n_data); +//static int _ExpanderRd(int I2cExpAddr, int index, uint8_t *data, int n_data); static int _ExpanderWR(int I2cExpAddr, int index, uint8_t *data, int n_data); //static int _ExpandersSetAllIO(void); @@ -342,7 +342,7 @@ done_err: * @param n_data number of byte to read * @return of if ok else i2c I/O operation status */ - +#if 0 static int _ExpanderRd(int I2cExpAddr, int index, uint8_t *data, int n_data) { int status; @@ -358,7 +358,7 @@ static int _ExpanderRd(int I2cExpAddr, int index, uint8_t *data, int n_data) { XNUCLEO53L1A1_PutI2cBus(); return status; } - +#endif /** * STMPE1600 i2c Expender register write * @param I2cExpAddr Expender address