diff --git a/Core/Inc/main.h b/Core/Inc/main.h index 4abdacf..751a611 100644 --- a/Core/Inc/main.h +++ b/Core/Inc/main.h @@ -323,6 +323,28 @@ void Error_Handler(void); #endif +#if defined(O1L) +/* + * STM32WL55, STM32WLE5 Clock=48Mhz 48,000,000/800khz = 60 + */ +#define STS_LAMP_BAR_PWM_TIM_PERIOD (240 - 1) +#define STS_LAMP_BAR_HTIM htim1 +#define STS_LAMP_BAR_LED_NUM (60) //60 for 46CM length LED strip + +#define WSDATA_PORT_PIN_PA8 +//#define WSDATA_PORT_PIN_PA9 + +#ifdef WSDATA_PORT_PIN_PA8 +#define STS_LAMP_BAR_TIM_CHANNEL TIM_CHANNEL_1 +#define STS_LAMP_BAR_WSDATA_PIN GPIO_PIN_8 +#define STS_LAMP_BAR_WSDATA_PORT GPIOA +#elif defined(WSDATA_PORT_PIN_PA9) +#define STS_LAMP_BAR_TIM_CHANNEL TIM_CHANNEL_2 +#define STS_LAMP_BAR_WSDATA_PIN GPIO_PIN_9 +#define STS_LAMP_BAR_WSDATA_PORT GPIOA +#endif +#endif + /* USER CODE END Private defines */ #ifdef __cplusplus diff --git a/Core/Inc/stm32wlxx_hal_conf.h b/Core/Inc/stm32wlxx_hal_conf.h index bae70e9..660926c 100644 --- a/Core/Inc/stm32wlxx_hal_conf.h +++ b/Core/Inc/stm32wlxx_hal_conf.h @@ -54,7 +54,7 @@ /*#define HAL_SMBUS_MODULE_ENABLED */ /*#define HAL_SPI_MODULE_ENABLED */ #define HAL_SUBGHZ_MODULE_ENABLED -/*#define HAL_TIM_MODULE_ENABLED */ +#define HAL_TIM_MODULE_ENABLED #define HAL_UART_MODULE_ENABLED /*#define HAL_USART_MODULE_ENABLED */ /*#define HAL_WWDG_MODULE_ENABLED */ diff --git a/Core/Inc/utilities_def.h b/Core/Inc/utilities_def.h index 22653b4..35411f6 100644 --- a/Core/Inc/utilities_def.h +++ b/Core/Inc/utilities_def.h @@ -87,6 +87,8 @@ typedef enum #endif #if defined(STS_O6) CFG_SEQ_Task_YunhornSTSEventP2, /* MOTION */ +#endif +#if (defined(STS_T6)||defined(STS_O6)||defined(STS_O7)) CFG_SEQ_Task_YunhornSTSEventP3, /* LAMP BAR LED */ #endif #if defined(STS_R1)||defined(STS_R1D)||defined(STS_R5)||defined(STS_R2) diff --git a/Core/Src/dma.c b/Core/Src/dma.c index 0aad753..de0dc82 100644 --- a/Core/Src/dma.c +++ b/Core/Src/dma.c @@ -45,6 +45,11 @@ void MX_DMA_Init(void) /* DMA interrupt init */ + /* TIM1_CH1 */ + /* DMA1_Channel1_IRQn interrupt configuration */ + HAL_NVIC_SetPriority(DMA1_Channel1_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(DMA1_Channel1_IRQn); + // I2C2 #if 0 #if defined(VL53LX)||defined(VL53L0) diff --git a/Core/Src/main.c b/Core/Src/main.c index 390eb02..ed857e0 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -27,6 +27,7 @@ #include "dma.h" #include "usart.h" #include "sys_app.h" +#include "tim.h" #ifdef STS_P2 #include "app_tof.h" #include "app_tof_peoplecount.h" @@ -112,6 +113,9 @@ int main(void) { MX_I2C2_Init(); MX_DMA_Init(); +#if defined(STS_T6) + MX_TIM1_Init(); +#endif MX_LoRaWAN_Init(); } //PME_ON; diff --git a/Core/Src/stm32wlxx_it.c b/Core/Src/stm32wlxx_it.c index a07d0f9..110506c 100644 --- a/Core/Src/stm32wlxx_it.c +++ b/Core/Src/stm32wlxx_it.c @@ -66,6 +66,9 @@ extern DMA_HandleTypeDef hdma_i2c2_tx; extern DMA_HandleTypeDef hdma_usart2_tx; extern DMA_HandleTypeDef hdma_usart2_rx; +extern DMA_HandleTypeDef hdma_tim1_ch2; +extern DMA_HandleTypeDef hdma_tim1_ch1; + /* USER CODE END EV */ /******************************************************************************/ @@ -281,6 +284,24 @@ void EXTI4_IRQHandler(void) /* USER CODE END EXTI1_IRQn 1 */ } + +/** + * @brief This function handles DMA1 Channel 1 Interrupt. + */ +void DMA1_Channel1_IRQHandler(void) +{ + /* USER CODE BEGIN DMA1_Channel1_IRQn 0 */ + + /* USER CODE END DMA1_Channel1_IRQn 0 */ + HAL_DMA_IRQHandler(&hdma_tim1_ch1); + + //HAL_DMA_IRQHandler(&hdma_tim1_ch2); + + /* USER CODE BEGIN DMA1_Channel1_IRQn 1 */ + + /* USER CODE END DMA1_Channel1_IRQn 1 */ +} + /* SPI1 */ /** * @brief This function handles DMA1 Channel 2 Interrupt. diff --git a/Core/Src/sys_app.c b/Core/Src/sys_app.c index 4a1eeab..64cf9ae 100644 --- a/Core/Src/sys_app.c +++ b/Core/Src/sys_app.c @@ -34,6 +34,7 @@ /* USER CODE BEGIN Includes */ #if defined(STS_P2)||defined(STS_T6) #include "app_tof_peoplecount.h" +#include "sts_lamp_bar.h" #endif //#ifdef L8 #include "app_tof.h" @@ -133,6 +134,8 @@ void SystemApp_Init(void) #endif #if defined(STS_T6) STS_TOF_VL53LX_PresenceDetection_Process_Init(); + //STS_Lamp_Bar_Self_Test_Simple(); + STS_Lamp_Bar_Self_Test(); #endif /*Init low power manager*/ diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index 90ec24d..ca02418 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -40,12 +40,17 @@ #include "app_tof_peoplecount.h" #include "yunhorn_sts_prd_conf.h" #include "yunhorn_sts_sensors.h" +#if defined(STS_O6)||defined(STS_T6)||defined(O1L) +#include "sts_lamp_bar.h" +#endif /* USER CODE END Includes */ /* External variables ---------------------------------------------------------*/ /* USER CODE BEGIN EV */ uint8_t outbuf[128]={0x0}; extern volatile uint8_t sts_ac_code[20], sts_service_mask; +extern volatile uint8_t sts_work_mode, sts_cloud_netcolor, sts_lamp_bar_color, sts_status_color, luminance_level; +volatile static bool r_b=true; extern volatile sts_cfg_nvm_t sts_cfg_nvm; extern volatile uint32_t rfac_timer; extern volatile uint32_t STS_TOFScanPeriod_msec, STS_TxPeriod_sec, STS_HeartBeatTimerPeriod_sec; @@ -365,7 +370,12 @@ static UTIL_TIMER_Object_t YunhornSTSHeartBeatTimer; /** * @brief Timer to handle the application Lamp Bar LED Timer refresh */ -static UTIL_TIMER_Object_t YunhornSTSLampBarColorTimer; +static UTIL_TIMER_Object_t STSLampBarColorTimer; + +/** + * @brief Timer to handle the application Duration check Timer + */ +static UTIL_TIMER_Object_t STSDurationCheckTimer; /** * @brief Tx Timer period @@ -462,6 +472,8 @@ void LoRaWAN_Init(void) UTIL_TIMER_Create(&TxLedTimer, LED_PERIOD_TIME, UTIL_TIMER_ONESHOT, OnTxTimerLedEvent, NULL); UTIL_TIMER_Create(&RxLedTimer, LED_PERIOD_TIME, UTIL_TIMER_ONESHOT, OnRxTimerLedEvent, NULL); UTIL_TIMER_Create(&JoinLedTimer, LED_PERIOD_TIME, UTIL_TIMER_PERIODIC, OnJoinTimerLedEvent, NULL); + UTIL_TIMER_Create(&STSLampBarColorTimer, LED_PERIOD_TIME, UTIL_TIMER_ONESHOT, OnYunhornSTSLampBarColorTimerEvent, NULL); + UTIL_TIMER_Create(&STSDurationCheckTimer, 20*LED_PERIOD_TIME, UTIL_TIMER_PERIODIC, OnYunhornSTSDurationCheckTimerEvent, NULL); if (FLASH_IF_Init(NULL) != FLASH_IF_OK) { @@ -522,6 +534,9 @@ void LoRaWAN_Init(void) #endif +#if defined(STS_T6)||defined(STS_O6) + UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_YunhornSTSEventP3), UTIL_SEQ_RFU, STS_YunhornSTSEventP3_Process); +#endif #if defined(STS_P2)||defined(STS_T6)||defined(L8) @@ -540,6 +555,9 @@ void LoRaWAN_Init(void) #if defined(STS_T6)||defined(L8) UTIL_TIMER_Create(&YunhornSTSWakeUpScanTimer, STS_TOFScanPeriod_msec, UTIL_TIMER_PERIODIC, (void*)OnYunhornSTSWakeUpScanTimerEvent, NULL); UTIL_TIMER_Start(&YunhornSTSWakeUpScanTimer); + + UTIL_TIMER_Start(&STSLampBarColorTimer); + #elif defined(STS_P2) UTIL_TIMER_Create(&YunhornSTSWakeUpScanTimer, STS_TOFScanPeriod_msec, UTIL_TIMER_PERIODIC, (void*)STS_TOF_VL53LX_PeopleCounting_Process_Start, NULL); UTIL_TIMER_Start(&YunhornSTSWakeUpScanTimer); @@ -1459,10 +1477,24 @@ static void OnRestoreContextRequest(void *nvm, uint32_t nvm_size) */ static void OnYunhornSTSLampBarColorTimerEvent(void *context) { -#ifdef STS_O6 - UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_YunhornSTSEventP3), CFG_SEQ_Prio_0); + uint8_t high4=(sts_lamp_bar_color>>4)&0x0f, low4=sts_lamp_bar_color&0x0f; +#if defined(STS_O6)||defined(STS_T6) //||defined(O1L) + //UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_YunhornSTSEventP3), CFG_SEQ_Prio_0); - UTIL_TIMER_Start(&YunhornSTSLampBarColorTimer); + UTIL_TIMER_Stop(&STSLampBarColorTimer); + + if (high4==0) + { + STS_Lamp_Bar_Set_STS_RGB_Color(sts_lamp_bar_color, luminance_level); + + } else + { + STS_Lamp_Bar_Set_STS_RGB_Color(r_b?high4:low4, luminance_level); + r_b = !r_b; + } + + + UTIL_TIMER_Start(&STSLampBarColorTimer); #endif } @@ -1481,15 +1513,13 @@ static void OnYunhornSTSDurationCheckTimerEvent(void *context) * @brief Yunhorn STS Occupancy RSS WakeUP timer callback function * @param context ptr of STS RSS WakeUp context */ - +#ifdef STS_O6 static void OnYunhornSTSOORSSWakeUpTimerEvent(void *context) { -#ifdef STS_O6 -#endif } - +#endif /** * @brief Yunhorn STS Heart beat timer callback function * @param context ptr of context diff --git a/STM32CubeIDE/.project b/STM32CubeIDE/.project index d7be60c..7c66716 100644 --- a/STM32CubeIDE/.project +++ b/STM32CubeIDE/.project @@ -447,6 +447,11 @@ 1 PARENT-1-PROJECT_LOC/Core/Src/stm32wlxx_nucleo_bus.c + + Application/User/Core/sts_lamp_bar.c + 1 + copy_PARENT/Core/Src/sts_lamp_bar.c + Application/User/Core/subghz.c 1 @@ -467,6 +472,11 @@ 1 copy_PARENT/Core/Src/sys_sensors.c + + Application/User/Core/tim.c + 1 + copy_PARENT/Core/Src/tim.c + Application/User/Core/timer_if.c 1 diff --git a/STM32CubeIDE/Release/Application/User/Core/subdir.mk b/STM32CubeIDE/Release/Application/User/Core/subdir.mk index 00ec633..05ebf4f 100644 --- a/STM32CubeIDE/Release/Application/User/Core/subdir.mk +++ b/STM32CubeIDE/Release/Application/User/Core/subdir.mk @@ -17,12 +17,14 @@ D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/WLE5CC_NODE_S D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/WLE5CC_NODE_STS/Core/Src/stm32wlxx_hal_msp.c \ D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/WLE5CC_NODE_STS/Core/Src/stm32wlxx_it.c \ D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/WLE5CC_NODE_STS/Core/Src/stm32wlxx_nucleo_bus.c \ +D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/WLE5CC_NODE_STS/Core/Src/sts_lamp_bar.c \ D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/WLE5CC_NODE_STS/Core/Src/subghz.c \ D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/WLE5CC_NODE_STS/Core/Src/sys_app.c \ D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/WLE5CC_NODE_STS/Core/Src/sys_debug.c \ D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/WLE5CC_NODE_STS/Core/Src/sys_sensors.c \ ../Application/User/Core/syscalls.c \ ../Application/User/Core/sysmem.c \ +D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/WLE5CC_NODE_STS/Core/Src/tim.c \ D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/WLE5CC_NODE_STS/Core/Src/timer_if.c \ D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/WLE5CC_NODE_STS/Core/Src/usart.c \ D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/WLE5CC_NODE_STS/Core/Src/usart_if.c @@ -40,12 +42,14 @@ OBJS += \ ./Application/User/Core/stm32wlxx_hal_msp.o \ ./Application/User/Core/stm32wlxx_it.o \ ./Application/User/Core/stm32wlxx_nucleo_bus.o \ +./Application/User/Core/sts_lamp_bar.o \ ./Application/User/Core/subghz.o \ ./Application/User/Core/sys_app.o \ ./Application/User/Core/sys_debug.o \ ./Application/User/Core/sys_sensors.o \ ./Application/User/Core/syscalls.o \ ./Application/User/Core/sysmem.o \ +./Application/User/Core/tim.o \ ./Application/User/Core/timer_if.o \ ./Application/User/Core/usart.o \ ./Application/User/Core/usart_if.o @@ -63,12 +67,14 @@ C_DEPS += \ ./Application/User/Core/stm32wlxx_hal_msp.d \ ./Application/User/Core/stm32wlxx_it.d \ ./Application/User/Core/stm32wlxx_nucleo_bus.d \ +./Application/User/Core/sts_lamp_bar.d \ ./Application/User/Core/subghz.d \ ./Application/User/Core/sys_app.d \ ./Application/User/Core/sys_debug.d \ ./Application/User/Core/sys_sensors.d \ ./Application/User/Core/syscalls.d \ ./Application/User/Core/sysmem.d \ +./Application/User/Core/tim.d \ ./Application/User/Core/timer_if.d \ ./Application/User/Core/usart.d \ ./Application/User/Core/usart_if.d @@ -99,6 +105,8 @@ Application/User/Core/stm32wlxx_it.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL5 arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DSTS_T6 -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WLE5xx -c -I../../Core/Inc -I../../STS/Core/Inc -I../../STS/TOF/App -I../../STS/TOF/Target -I../../STS/TOF/vl53l1x_uld -I../../STS/TOF/vl53l0x -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Middlewares/ST/STM32_Cryptographic/include -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -I../../../../../../../Drivers/BSP/Components/vl53l8cx/porting -I../../../../../../../Drivers/BSP/Components/Common -I../../../../../../../Drivers/BSP/53L8A1 -I../../../../../../../Drivers/BSP/Components/vl53l8cx/modules -I../../../../../../../Drivers/BSP/Components/vl53l8cx -Os -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" Application/User/Core/stm32wlxx_nucleo_bus.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/WLE5CC_NODE_STS/Core/Src/stm32wlxx_nucleo_bus.c Application/User/Core/subdir.mk arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DSTS_T6 -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WLE5xx -c -I../../Core/Inc -I../../STS/Core/Inc -I../../STS/TOF/App -I../../STS/TOF/Target -I../../STS/TOF/vl53l1x_uld -I../../STS/TOF/vl53l0x -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Middlewares/ST/STM32_Cryptographic/include -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -I../../../../../../../Drivers/BSP/Components/vl53l8cx/porting -I../../../../../../../Drivers/BSP/Components/Common -I../../../../../../../Drivers/BSP/53L8A1 -I../../../../../../../Drivers/BSP/Components/vl53l8cx/modules -I../../../../../../../Drivers/BSP/Components/vl53l8cx -Os -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" +Application/User/Core/sts_lamp_bar.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/WLE5CC_NODE_STS/Core/Src/sts_lamp_bar.c Application/User/Core/subdir.mk + arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DSTS_T6 -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WLE5xx -c -I../../Core/Inc -I../../STS/Core/Inc -I../../STS/TOF/App -I../../STS/TOF/Target -I../../STS/TOF/vl53l1x_uld -I../../STS/TOF/vl53l0x -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Middlewares/ST/STM32_Cryptographic/include -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -I../../../../../../../Drivers/BSP/Components/vl53l8cx/porting -I../../../../../../../Drivers/BSP/Components/Common -I../../../../../../../Drivers/BSP/53L8A1 -I../../../../../../../Drivers/BSP/Components/vl53l8cx/modules -I../../../../../../../Drivers/BSP/Components/vl53l8cx -Os -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" Application/User/Core/subghz.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/WLE5CC_NODE_STS/Core/Src/subghz.c Application/User/Core/subdir.mk arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DSTS_T6 -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WLE5xx -c -I../../Core/Inc -I../../STS/Core/Inc -I../../STS/TOF/App -I../../STS/TOF/Target -I../../STS/TOF/vl53l1x_uld -I../../STS/TOF/vl53l0x -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Middlewares/ST/STM32_Cryptographic/include -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -I../../../../../../../Drivers/BSP/Components/vl53l8cx/porting -I../../../../../../../Drivers/BSP/Components/Common -I../../../../../../../Drivers/BSP/53L8A1 -I../../../../../../../Drivers/BSP/Components/vl53l8cx/modules -I../../../../../../../Drivers/BSP/Components/vl53l8cx -Os -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" Application/User/Core/sys_app.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/WLE5CC_NODE_STS/Core/Src/sys_app.c Application/User/Core/subdir.mk @@ -109,6 +117,8 @@ Application/User/Core/sys_sensors.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55 arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DSTS_T6 -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WLE5xx -c -I../../Core/Inc -I../../STS/Core/Inc -I../../STS/TOF/App -I../../STS/TOF/Target -I../../STS/TOF/vl53l1x_uld -I../../STS/TOF/vl53l0x -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Middlewares/ST/STM32_Cryptographic/include -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -I../../../../../../../Drivers/BSP/Components/vl53l8cx/porting -I../../../../../../../Drivers/BSP/Components/Common -I../../../../../../../Drivers/BSP/53L8A1 -I../../../../../../../Drivers/BSP/Components/vl53l8cx/modules -I../../../../../../../Drivers/BSP/Components/vl53l8cx -Os -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" Application/User/Core/%.o Application/User/Core/%.su Application/User/Core/%.cyclo: ../Application/User/Core/%.c Application/User/Core/subdir.mk arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DSTS_T6 -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WLE5xx -c -I../../Core/Inc -I../../STS/Core/Inc -I../../STS/TOF/App -I../../STS/TOF/Target -I../../STS/TOF/vl53l1x_uld -I../../STS/TOF/vl53l0x -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Middlewares/ST/STM32_Cryptographic/include -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -I../../../../../../../Drivers/BSP/Components/vl53l8cx/porting -I../../../../../../../Drivers/BSP/Components/Common -I../../../../../../../Drivers/BSP/53L8A1 -I../../../../../../../Drivers/BSP/Components/vl53l8cx/modules -I../../../../../../../Drivers/BSP/Components/vl53l8cx -Os -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" +Application/User/Core/tim.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/WLE5CC_NODE_STS/Core/Src/tim.c Application/User/Core/subdir.mk + arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DSTS_T6 -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WLE5xx -c -I../../Core/Inc -I../../STS/Core/Inc -I../../STS/TOF/App -I../../STS/TOF/Target -I../../STS/TOF/vl53l1x_uld -I../../STS/TOF/vl53l0x -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Middlewares/ST/STM32_Cryptographic/include -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -I../../../../../../../Drivers/BSP/Components/vl53l8cx/porting -I../../../../../../../Drivers/BSP/Components/Common -I../../../../../../../Drivers/BSP/53L8A1 -I../../../../../../../Drivers/BSP/Components/vl53l8cx/modules -I../../../../../../../Drivers/BSP/Components/vl53l8cx -Os -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" Application/User/Core/timer_if.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/WLE5CC_NODE_STS/Core/Src/timer_if.c Application/User/Core/subdir.mk arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DSTS_T6 -DCORE_CM4 -DUSE_HAL_DRIVER -DSTM32WLE5xx -c -I../../Core/Inc -I../../STS/Core/Inc -I../../STS/TOF/App -I../../STS/TOF/Target -I../../STS/TOF/vl53l1x_uld -I../../STS/TOF/vl53l0x -I../../LoRaWAN/App -I../../LoRaWAN/Target -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc -I../../../../../../../Drivers/STM32WLxx_HAL_Driver/Inc/Legacy -I../../../../../../../Utilities/trace/adv_trace -I../../../../../../../Utilities/misc -I../../../../../../../Utilities/sequencer -I../../../../../../../Utilities/timer -I../../../../../../../Utilities/lpm/tiny_lpm -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler/Packages -I../../../../../../../Drivers/CMSIS/Device/ST/STM32WLxx/Include -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Crypto -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac/Region -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Mac -I../../../../../../../Middlewares/Third_Party/LoRaWAN/LmHandler -I../../../../../../../Middlewares/Third_Party/LoRaWAN/Utilities -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy -I../../../../../../../Middlewares/Third_Party/SubGHz_Phy/stm32_radio_driver -I../../../../../../../Middlewares/ST/STM32_Cryptographic/include -I../../../../../../../Drivers/CMSIS/Include -I../../../../../../../Drivers/BSP/STM32WLxx_Nucleo -I../../../../../../../Drivers/BSP/Components/vl53l8cx/porting -I../../../../../../../Drivers/BSP/Components/Common -I../../../../../../../Drivers/BSP/53L8A1 -I../../../../../../../Drivers/BSP/Components/vl53l8cx/modules -I../../../../../../../Drivers/BSP/Components/vl53l8cx -Os -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" Application/User/Core/usart.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/WLE5CC_NODE_STS/Core/Src/usart.c Application/User/Core/subdir.mk @@ -119,7 +129,7 @@ Application/User/Core/usart_if.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/ clean: clean-Application-2f-User-2f-Core clean-Application-2f-User-2f-Core: - -$(RM) ./Application/User/Core/adc.cyclo ./Application/User/Core/adc.d ./Application/User/Core/adc.o ./Application/User/Core/adc.su ./Application/User/Core/adc_if.cyclo ./Application/User/Core/adc_if.d ./Application/User/Core/adc_if.o ./Application/User/Core/adc_if.su ./Application/User/Core/dma.cyclo ./Application/User/Core/dma.d ./Application/User/Core/dma.o ./Application/User/Core/dma.su ./Application/User/Core/flash_if.cyclo ./Application/User/Core/flash_if.d ./Application/User/Core/flash_if.o ./Application/User/Core/flash_if.su ./Application/User/Core/gpio.cyclo ./Application/User/Core/gpio.d ./Application/User/Core/gpio.o ./Application/User/Core/gpio.su ./Application/User/Core/i2c.cyclo ./Application/User/Core/i2c.d ./Application/User/Core/i2c.o ./Application/User/Core/i2c.su ./Application/User/Core/main.cyclo ./Application/User/Core/main.d ./Application/User/Core/main.o ./Application/User/Core/main.su ./Application/User/Core/rtc.cyclo ./Application/User/Core/rtc.d ./Application/User/Core/rtc.o ./Application/User/Core/rtc.su ./Application/User/Core/stm32_lpm_if.cyclo ./Application/User/Core/stm32_lpm_if.d ./Application/User/Core/stm32_lpm_if.o ./Application/User/Core/stm32_lpm_if.su ./Application/User/Core/stm32wlxx_hal_msp.cyclo ./Application/User/Core/stm32wlxx_hal_msp.d ./Application/User/Core/stm32wlxx_hal_msp.o ./Application/User/Core/stm32wlxx_hal_msp.su ./Application/User/Core/stm32wlxx_it.cyclo ./Application/User/Core/stm32wlxx_it.d ./Application/User/Core/stm32wlxx_it.o ./Application/User/Core/stm32wlxx_it.su ./Application/User/Core/stm32wlxx_nucleo_bus.cyclo ./Application/User/Core/stm32wlxx_nucleo_bus.d ./Application/User/Core/stm32wlxx_nucleo_bus.o ./Application/User/Core/stm32wlxx_nucleo_bus.su ./Application/User/Core/subghz.cyclo ./Application/User/Core/subghz.d ./Application/User/Core/subghz.o ./Application/User/Core/subghz.su ./Application/User/Core/sys_app.cyclo ./Application/User/Core/sys_app.d ./Application/User/Core/sys_app.o ./Application/User/Core/sys_app.su ./Application/User/Core/sys_debug.cyclo ./Application/User/Core/sys_debug.d ./Application/User/Core/sys_debug.o ./Application/User/Core/sys_debug.su ./Application/User/Core/sys_sensors.cyclo ./Application/User/Core/sys_sensors.d ./Application/User/Core/sys_sensors.o ./Application/User/Core/sys_sensors.su ./Application/User/Core/syscalls.cyclo ./Application/User/Core/syscalls.d ./Application/User/Core/syscalls.o ./Application/User/Core/syscalls.su ./Application/User/Core/sysmem.cyclo ./Application/User/Core/sysmem.d ./Application/User/Core/sysmem.o ./Application/User/Core/sysmem.su ./Application/User/Core/timer_if.cyclo ./Application/User/Core/timer_if.d ./Application/User/Core/timer_if.o ./Application/User/Core/timer_if.su ./Application/User/Core/usart.cyclo ./Application/User/Core/usart.d ./Application/User/Core/usart.o ./Application/User/Core/usart.su ./Application/User/Core/usart_if.cyclo ./Application/User/Core/usart_if.d ./Application/User/Core/usart_if.o ./Application/User/Core/usart_if.su + -$(RM) ./Application/User/Core/adc.cyclo ./Application/User/Core/adc.d ./Application/User/Core/adc.o ./Application/User/Core/adc.su ./Application/User/Core/adc_if.cyclo ./Application/User/Core/adc_if.d ./Application/User/Core/adc_if.o ./Application/User/Core/adc_if.su ./Application/User/Core/dma.cyclo ./Application/User/Core/dma.d ./Application/User/Core/dma.o ./Application/User/Core/dma.su ./Application/User/Core/flash_if.cyclo ./Application/User/Core/flash_if.d ./Application/User/Core/flash_if.o ./Application/User/Core/flash_if.su ./Application/User/Core/gpio.cyclo ./Application/User/Core/gpio.d ./Application/User/Core/gpio.o ./Application/User/Core/gpio.su ./Application/User/Core/i2c.cyclo ./Application/User/Core/i2c.d ./Application/User/Core/i2c.o ./Application/User/Core/i2c.su ./Application/User/Core/main.cyclo ./Application/User/Core/main.d ./Application/User/Core/main.o ./Application/User/Core/main.su ./Application/User/Core/rtc.cyclo ./Application/User/Core/rtc.d ./Application/User/Core/rtc.o ./Application/User/Core/rtc.su ./Application/User/Core/stm32_lpm_if.cyclo ./Application/User/Core/stm32_lpm_if.d ./Application/User/Core/stm32_lpm_if.o ./Application/User/Core/stm32_lpm_if.su ./Application/User/Core/stm32wlxx_hal_msp.cyclo ./Application/User/Core/stm32wlxx_hal_msp.d ./Application/User/Core/stm32wlxx_hal_msp.o ./Application/User/Core/stm32wlxx_hal_msp.su ./Application/User/Core/stm32wlxx_it.cyclo ./Application/User/Core/stm32wlxx_it.d ./Application/User/Core/stm32wlxx_it.o ./Application/User/Core/stm32wlxx_it.su ./Application/User/Core/stm32wlxx_nucleo_bus.cyclo ./Application/User/Core/stm32wlxx_nucleo_bus.d ./Application/User/Core/stm32wlxx_nucleo_bus.o ./Application/User/Core/stm32wlxx_nucleo_bus.su ./Application/User/Core/sts_lamp_bar.cyclo ./Application/User/Core/sts_lamp_bar.d ./Application/User/Core/sts_lamp_bar.o ./Application/User/Core/sts_lamp_bar.su ./Application/User/Core/subghz.cyclo ./Application/User/Core/subghz.d ./Application/User/Core/subghz.o ./Application/User/Core/subghz.su ./Application/User/Core/sys_app.cyclo ./Application/User/Core/sys_app.d ./Application/User/Core/sys_app.o ./Application/User/Core/sys_app.su ./Application/User/Core/sys_debug.cyclo ./Application/User/Core/sys_debug.d ./Application/User/Core/sys_debug.o ./Application/User/Core/sys_debug.su ./Application/User/Core/sys_sensors.cyclo ./Application/User/Core/sys_sensors.d ./Application/User/Core/sys_sensors.o ./Application/User/Core/sys_sensors.su ./Application/User/Core/syscalls.cyclo ./Application/User/Core/syscalls.d ./Application/User/Core/syscalls.o ./Application/User/Core/syscalls.su ./Application/User/Core/sysmem.cyclo ./Application/User/Core/sysmem.d ./Application/User/Core/sysmem.o ./Application/User/Core/sysmem.su ./Application/User/Core/tim.cyclo ./Application/User/Core/tim.d ./Application/User/Core/tim.o ./Application/User/Core/tim.su ./Application/User/Core/timer_if.cyclo ./Application/User/Core/timer_if.d ./Application/User/Core/timer_if.o ./Application/User/Core/timer_if.su ./Application/User/Core/usart.cyclo ./Application/User/Core/usart.d ./Application/User/Core/usart.o ./Application/User/Core/usart.su ./Application/User/Core/usart_if.cyclo ./Application/User/Core/usart_if.d ./Application/User/Core/usart_if.o ./Application/User/Core/usart_if.su .PHONY: clean-Application-2f-User-2f-Core diff --git a/STM32CubeIDE/Release/WLE5CC_NODE_STS.elf b/STM32CubeIDE/Release/WLE5CC_NODE_STS.elf index 5fe6104..d89f2a8 100644 Binary files a/STM32CubeIDE/Release/WLE5CC_NODE_STS.elf and b/STM32CubeIDE/Release/WLE5CC_NODE_STS.elf differ diff --git a/STM32CubeIDE/Release/WLE5CC_NODE_STS_T6_20241104.elf b/STM32CubeIDE/Release/WLE5CC_NODE_STS_T6_20241104.elf index 5fe6104..d89f2a8 100644 Binary files a/STM32CubeIDE/Release/WLE5CC_NODE_STS_T6_20241104.elf and b/STM32CubeIDE/Release/WLE5CC_NODE_STS_T6_20241104.elf differ diff --git a/STS/Core/Inc/yunhorn_sts_prd_conf.h b/STS/Core/Inc/yunhorn_sts_prd_conf.h index 4329917..9dfc9d2 100644 --- a/STS/Core/Inc/yunhorn_sts_prd_conf.h +++ b/STS/Core/Inc/yunhorn_sts_prd_conf.h @@ -56,6 +56,7 @@ #define YUNHORN_STS_O6T_ENABLED 1U #elif defined(STS_T6) /* STS_O6T for occupancy sensor via ToF */ #define YUNHORN_STS_T6_ENABLED 1U +#define O1L #elif defined(STS_R4) /* STS_O6T for occupancy sensor via ToF */ #define YUNHORN_STS_R4_ENABLED 1U #elif defined(L8) @@ -253,7 +254,7 @@ #define STS_Status_Door_Close (0) //Normal Close NC:Open #define STS_Status_Door_Open (1) //Normal Close NC:Close #define STS_Reed_Hall_State HAL_GPIO_ReadPin(BUT1_GPIO_Port, BUT1_Pin) - +/* enum sts_lamp_color { STS_DARK = 0, //灭：0 STS_GREEN, //绿：1 0 1 0 @@ -282,7 +283,7 @@ enum sts_lamp_color { STS_OTHER_MODE // ? OTHER MODE }; - +*/ #ifdef YUNHORN_STS_O6_ENABLED #define STS_O6_NVM_CFG_SIZE 30U diff --git a/STS/Core/Src/yunhorn_sts_process.c b/STS/Core/Src/yunhorn_sts_process.c index 0918097..0d6bcc7 100644 --- a/STS/Core/Src/yunhorn_sts_process.c +++ b/STS/Core/Src/yunhorn_sts_process.c @@ -47,6 +47,7 @@ #if defined(STS_P2)||defined(STS_T6) #include "app_tof.h" #include "app_tof_peoplecount.h" +#include "sts_lamp_bar.h" extern volatile sts_people_count_sensor_data_t *sts_people_count_sensor_data; extern volatile uint8_t sts_door_jam_profile; extern volatile uint8_t sts_tof_presence_state_changed; @@ -54,6 +55,10 @@ extern volatile sts_ppc_cfg_type_t ppc_cfg[]; #elif defined(L8) #include "app_tof.h" #endif +#if defined(STS_O6)||defined(STS_T6)||defined(STS_O7) +extern volatile uint8_t sts_status_color, sts_lamp_bar_color;//puColor +extern uint8_t luminance_level; +#endif volatile sts_cfg_nvm_t sts_cfg_nvm = { sts_mtmcode1, sts_mtmcode2, @@ -404,7 +409,7 @@ void STS_RSS_Smart_Presence_Detection(void) */ void STS_YunhornSTSEventP3_Process(void) { -#if (defined(YUNHORN_STS_O6_ENABLED) && defined(USE_ACCONEER_A111)) +#if (defined(STS_O6) ||defined(STS_O7)||defined(STS_T6)) if (STS_Reed_Hall_State == STS_Status_Door_Open) { sts_lamp_bar_color =STS_GREEN; diff --git a/STS/TOF/App/app_tof_peoplecount.c b/STS/TOF/App/app_tof_peoplecount.c index 8dc8915..e7b8503 100644 --- a/STS/TOF/App/app_tof_peoplecount.c +++ b/STS/TOF/App/app_tof_peoplecount.c @@ -11,6 +11,7 @@ #include "VL53L1X_API.h" #include "VL53l1X_calibration.h" #include "X-NUCLEO-53L1A1.h" +#include "sts_lamp_bar.h" #endif #include "app_tof.h" /* USER CODE END Includes */ @@ -22,8 +23,8 @@ volatile sts_people_count_sensor_data_t sts_people_count_sensor_data={0,0,0,2,'M extern volatile uint32_t STS_TOFScanPeriod_sec, STS_TxPeriod_sec, STS_HeartBeatTimerPeriod_sec; extern volatile sts_cfg_nvm_t sts_cfg_nvm; extern volatile uint8_t nvm_store_value[]; -volatile uint8_t sts_tof_presence_state=0, sts_tof_presence_state_changed=0; - +volatile uint8_t sts_tof_presence_state=0, sts_tof_presence_state_changed=0, sts_tof_presence_distance_dm=0; +extern volatile uint8_t sts_lamp_bar_color; /* TIMING_BUDGET, in ms possible values [15, 20, 50, 100, 200, 500] */ /* DISTANCE_THRESHOLD = MAX - ASSUME_CHILD_HEIGHT(800mm) */ @@ -73,7 +74,9 @@ static int PeopleCount = 0; static uint16_t Distances[2][DISTANCES_ARRAY_SIZE]; static uint8_t DistancesTableSize[2] = {0,0}; +#if defined(STS_P2) static int ProcessPeopleCountingData(int16_t Distance, uint8_t zone, uint8_t RangeStatus); +#endif /* Private function prototypes -----------------------------------------------*/ /* USER CODE BEGIN PFP */ /* Private function prototypes -----------------------------------------------*/ @@ -427,6 +430,7 @@ int ProcessPeopleCountingData(int16_t Distance, uint8_t zone, uint8_t RangeStatu void STS_tof_presence_detection_sensor_Read(sts_tof_presence_detection_sensor_data_t *sts_t6_sensor_data) { sts_t6_sensor_data->tof_range_presence_state = sts_tof_presence_state; + sts_t6_sensor_data->tof_presence_distance_dm = sts_tof_presence_distance_dm; } #if (defined(STS_P2)) @@ -653,6 +657,12 @@ void STS_TOF_VL53LX_PresenceDetection_Process_Start(void) //APP_LOG(TS_OFF, VLEVEL_M,"############### TOF VL53LX_ PRESENCE DETECTION SUB-PROCESS \r\n"); { status = sts_tof_vl53lx_presence_detection_start(); + if (sts_tof_presence_state ==1) + { + sts_lamp_bar_color = STS_RED; + } else if (sts_tof_presence_state ==0) { + sts_lamp_bar_color = STS_GREEN; + } sts_people_count_sensor_data.Count_Valid = (status ==0)? 1:0; //APP_LOG(TS_OFF, VLEVEL_M,"############### SUB-PROCESS running .... \r\n"); } @@ -819,6 +829,7 @@ int sts_tof_vl53lx_presence_detection_start(void) sts_tof_presence_state = PresenceState; PrevPresenceState = PresenceState; sts_tof_presence_state_changed = 1; + sts_tof_presence_distance_dm = (uint8_t)(Distance/100); // change to dm=10cm=100mm APP_LOG(TS_OFF, VLEVEL_M,"\r\n Presence Detected =%d\r\n", sts_tof_presence_state); } diff --git a/STS/TOF/App/app_tof_peoplecount.h b/STS/TOF/App/app_tof_peoplecount.h index 090e5e2..194e933 100644 --- a/STS/TOF/App/app_tof_peoplecount.h +++ b/STS/TOF/App/app_tof_peoplecount.h @@ -159,6 +159,7 @@ uint8_t tof_range_presence_state; // 1: presence, 0: no presence uint8_t gesture_multi_state; // 0: push, 1: swing left, 2: swing right uint8_t tof_motion_presence_state; + uint8_t tof_presence_distance_dm; // dm= 100mm = 10 cm uint8_t measure_window_threshold_low_dm; // dm= 100mm = 10 cm, low = 0 dm uint8_t measure_window_threshold_high_dm; // dm= 100mm = 10 cm, high=40dm uint8_t measure_critiera; // below, 0, in window 1, above 2 diff --git a/hk_as923_decoder.js b/hk_as923_decoder.js index 14448d9..3467a07 100644 --- a/hk_as923_decoder.js +++ b/hk_as923_decoder.js @@ -4,7 +4,7 @@ // - variables contains the device variables e.g. {"calibration": "3.5"} (both the key / value are of type string) // The function must return an object, e.g. {"temperature": 22.5} // -// Yunhorn SmarToilets Sensor R20241030A01 +// Yunhorn SmarToilets Sensor R20241104A01 // function Decode(fPort, data, variables) { @@ -27,15 +27,53 @@ function Decode(fPort, data, variables) { // STS-O1/O2/O3/O5 REEDSWITCH, OCCUPANCY LED REPORT case 4: + data.led_state = bytes[0] == 0x0 ? "Off" : "On"; + data.mtm_code_1 = bytes[1]; + data.mtm_code_2 = bytes[2]; + data.hw_code = bytes[3]; + data.battery_level = bytes[4] + "%"; + data.size_value = bytes[5]; + data.door_state = (bytes[6] === 0) ? "Door_Closed" : "Door_Open"; + + return { "Yunhorn_SmarToilets_data": data }; break; // HEART-BEAT FOR STS-O1/O2/O3/O5 REEDSWITCH, OCCUPANCY LED REPORT case 5: + //data.led_state=(bytes[0] & 0x7f) === 0 ? "Off" : "On"; + data.BoardLED = ((bytes[0] & 0x7F) === 0x01) ? "ON" : "OFF"; + //data.battery_level = bytes[1] + " %"; + data.battery_level = bytes[1] * 100 + "mV"; + return { "Yunhorn_SmarToilets_data": data }; break; // STS-M1 water leakage sensor case 6: - break; + if (data.length === 2) { + data.led_state = bytes[0] == 0x0 ? "Off" : "On"; + data.battery_level = bytes[1] + "%"; + } else { + data.led_state = bytes[0] == 0x0 ? "Off" : "On"; + data.mtm_code_1 = bytes[1]; + data.mtm_code_2 = bytes[2]; + data.hw_code = bytes[3]; + //data.battery_level_mV= bytes[4]*100+" mV"; + data.battery_level = bytes[4] + " %"; + data.size_value = bytes[5]; + data.measure_tech = (bytes[6] === 0) ? "Weak Current" : "Other"; + data.liquid_level_event = (bytes[7] === 0x1) ? "Leakage Detected" : "No Leakage"; + } + return { "Yunhorn_SmarToilets_data": data }; + break; + // temp heart-beat for STS-M1 + case 66: + if (data.length === 2) { + data.led_state = bytes[0] == 0x0 ? "Off" : "On"; + data.battery_level_mV = bytes[1] * 100 + " mV"; + return { "Yunhorn_SmarToilets_data": data }; + } + + break; // R4 soap/sanitizer sensor case 7: data.led_state = bytes[0] == 0x0 ? "Off" : "On"; @@ -187,19 +225,19 @@ function Decode(fPort, data, variables) { break; // STS-M1A Water mark sensor thermal matrix, heart-beat - case 14: - break; + //case 14: + //break; // STS-T6 O6T ToF Presence Detection case 14: - data.LED_State = bytes[0] === 0 ? "Off" : "On"; + data.LED_State = (bytes[0] & 0x7f === 0) ? "Off" : "On"; data.MTM_Code_1 = bytes[1]; data.MTM_Code_2 = bytes[2]; data.HW_Code = bytes[3]; data.Battery_Level = bytes[4] + " %"; data.Payload_Size = bytes[5]; - data.Presence_State = bytes[6] == 1 ? "Occupied" : "Vacant"; + data.Presence_State = (bytes[6] == 1) ? "Occupied" : "Vacant"; return { "Yunhorn_SmarToilets_data": data }; break; @@ -526,6 +564,8 @@ function Decode(fPort, data, variables) { // STS-P2 IN-OUT PEOPLE COUNTING SENSOR case 106: { + var counting = {}; + var counting_today = {}; // STS-P2 bi-directional people counting data.LED_State = bytes[0] === 0 ? "Off" : "On"; data.MTM_Code_1 = bytes[1]; @@ -533,17 +573,26 @@ function Decode(fPort, data, variables) { data.HW_Code = bytes[3]; data.Battery_Level = bytes[4] + " %"; data.Payload_Size = bytes[5]; - data.Walk_In_People_Count = bytes[6] << 8 | bytes[7]; - data.Walk_Out_People_Count = bytes[8] << 8 | bytes[8]; - data.Walk_Around_People_Count = bytes[10] << 8 | bytes[11]; + //data.Walk_In_People_Count = bytes[6] << 8 | bytes[7]; + //data.Walk_Out_People_Count = bytes[8] << 8 | bytes[9]; + //data.Walk_Around_People_Count = bytes[10] << 8 | bytes[11]; + counting.Walk_In_People_Count = bytes[6] << 8 | bytes[7]; + counting.Walk_Out_People_Count = bytes[8] << 8 | bytes[9]; + counting.Walk_Around_People_Count = bytes[10] << 8 | bytes[11]; + data.Count_Period = bytes[12]; data.Count_Period_Unit = String.fromCharCode(bytes[13]); - data.Sum_Day_Walk_In_People_Count = bytes[14] << 8 | bytes[15]; - data.Sum_Day_Walk_Out_People_Count = bytes[16] << 8 | bytes[17]; - data.Sum_Day_Walk_Around_People_Count = bytes[18] << 8 | bytes[19]; + + //data.Sum_Day_Walk_In_People_Count = bytes[14] << 8 | bytes[15]; + //data.Sum_Day_Walk_Out_People_Count = bytes[16] << 8 | bytes[17]; + //data.Sum_Day_Walk_Around_People_Count = bytes[18] << 8 | bytes[19]; + counting_today.Sum_Day_Walk_In_People_Count = bytes[14] << 8 | bytes[15]; + counting_today.Sum_Day_Walk_Out_People_Count = bytes[16] << 8 | bytes[17]; + counting_today.Sum_Day_Walk_Around_People_Count = bytes[18] << 8 | bytes[19]; + data.Count_Valid = (bytes[20] == 0x0) ? "Error" : "OK"; - return { "Yunhorn_SmarToilets_data": data }; + return { "Yunhorn_SmarToilets_data": data, "Couting_Now": counting, "Counting_today": counting_today }; } break; @@ -622,7 +671,9 @@ function Decode(fPort, data, variables) { data.sts_hw_ver = bytes[4]; data.battery_level = bytes[5]; data.payload_length = bytes[6]; - data.Measure_Distance = String.fromCharCode(bytes[7]) + String.fromCharCode(bytes[8]) + String.fromCharCode(bytes[9]) + String.fromCharCode(bytes[10]); + //data.Measure_Distance = String.fromCharCode(bytes[7]) + String.fromCharCode(bytes[8]) + String.fromCharCode(bytes[9]) + String.fromCharCode(bytes[10]); + // update on 2024-11-02 + data.Measure_Distance = bytes[7] << 8 | bytes[8]; data.Distance_unit = "mm"; break; @@ -636,7 +687,29 @@ function Decode(fPort, data, variables) { data.LoRaWAN_Class = String.fromCharCode(bytes[4]); break; + // M 'M' for STS-P2 LOG DATA + case 0x4D: + data.sum_day_in = bytes[1] | bytes[2] << 8; + data.sum_day_out = bytes[3] | bytes[4] << 8; + data.sum_day_around = bytes[5] | bytes[6] << 8; + data.sum_week_in = bytes[7] | bytes[8] << 8; + data.sum_week_out = bytes[9] | bytes[10] << 8; + data.sum_week_around = bytes[11] | bytes[12] << 8; + + data.sum_month_in = bytes[13] | bytes[14] << 8; + data.sum_month_out = bytes[15] | bytes[16] << 8; + data.sum_month_around = bytes[17] | bytes[18] << 8; + + data.sum_year_in = bytes[19] | bytes[20] << 8; + data.sum_year_out = bytes[21] | bytes[22] << 8; + data.sum_year_around = bytes[23] | bytes[24] << 8; + + data.sum_lifeCycle_in = bytes[25] | bytes[26] << 8; + data.sum_lifeCycle_out = bytes[27] | bytes[28] << 8; + data.sum_lifeCycle_around = bytes[29] | bytes[30] << 8; + + break; // CONTROL COMMAND 'P' case 0x50: // P-CMD work mode change