diff --git a/Core/Inc/sts_lamp_bar.h b/Core/Inc/sts_lamp_bar.h new file mode 100644 index 0000000..1942548 --- /dev/null +++ b/Core/Inc/sts_lamp_bar.h @@ -0,0 +1,125 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file : sts_lamp_bar.h + * @brief : Header for sts_lamp_bar.c file. + * This file contains the common defines of the application. + ****************************************************************************** + * @attention + * + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ + +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __STS_LAMP_BAR_H +#define __STS_LAMP_BAR_H + +#ifdef __cplusplus +extern "C" { +#endif + + +#include "main.h" + +#define DEFAULT_SATURATION 50 // 0 - 100 S：Saturation, 0~100 +#define DEFAULT_BRIGHTNESS 50 // 0 - 100 V：Value of lightness, 0~100 +#define DEFAULT_LUMINANCE_LEVEL (30) +#define STS_Status_Door_Close (0) //Normal Close NC:Open **2024-07-15 changed +#define STS_Status_Door_Open (1) //Normal Close NC:Close **2024-07-15 changed +#define STS_Status_SOS_Pushdown (0) //Normal Open NO:Open +#define STS_Status_SOS_Release (1) //Normal Open NO:Close +#define STS_Status_Alarm_Mute_Pushdown (0) //Normal Open NO:Open +#define STS_Status_Alarm_Mute_Release (1) //Normal Open NO:Close# +#define STS_Status_Alarm_Reset_Pushdown (0) //Normal Open NO:Open +#define STS_Status_Alarm_Reset_Release (1) //Normal Open NO:Close# + +enum sts_lamp_color { + STS_DARK = 0, //灭：0, Code 0x00 + STS_GREEN, //绿：1 0 1 0 code 0x01 0b0000 0001 + STS_RED, //红：2 1 0 0 code 0x02 0b0000 0010 + STS_BLUE, //蓝：3 0 0 1 code 0x03 0b0000 0011 + STS_YELLOW, //黄：4 1 1 0 code 0x04 0b0000 0100 + STS_PINK, //紫：5 1 0 1 code 0x05 0b0000 0101 + STS_CYAN, //青：6 0 1 1 code 0x06 0b0000 0110 + STS_WHITE, //白：7 1 1 1 code 0x07 0b0000 0111 + STS_COLOR_MAX, //8: MAX NUM OF COLORS 0x08 0b0000 1000 + + STS_GREEN_DARK=0x10, //0b0001 0000 GREEN DARK + STS_RED_DARK=0x20, //0b0010 0000, + STS_RED_GREEN=0x21, + STS_RED_BLUE=0x23, //0b0010 0011 RED BLUE FLASH + STS_BLUE_DARK=0x30, //0b0011 0000 BLUE DARK + STS_BLUE_GREEN=0x31, + + STS_GREENDARK=0x41, // GREEN FLASH 'A' + STS_REDDARK=0x42, // RED FLASH 'B' + STS_REDBLUE=0x43, // RED/BLUE FLASH 'C' + STS_BLUEDARK=0x44, // BLUE FLASH 'D' + STS_REDGREEN=0x45, // RED/GREEN FLASH 'E' + STS_BLUEGREEN=0x46 // BLUE/GREEN FLASH 'F' +}; + +enum sts_oo_work_mode { + STS_NETWORK_MODE = 0, // 0 NETWORK MODE + STS_WIRED_MODE, // 1 WIRED MODE === WATER LEAKAGE, SOAP CAPACITY SENSOR MODE + STS_REEDSWITCH_MODE, // 2 REED SWITCH ONLY + STS_RSS_MODE, // 3 RSS ONLY + STS_DUAL_MODE, // 4 RSS + REED SWITCH IN ONE UNIT + STS_UNI_MODE, // 5 DUAL_MODE + FALL DETECTION + STS_REMOTE_REED_RSS_MODE, // 6 REMOTE REED SWITCH + RSS MODE 2023-05-04 + STS_DUAL_RSS_MODE, // 7 RSS_1 + RSS_2 IN TWO UNITS + STS_TOF_RSS_MODE, // 8 TOF + RSS MODE + STS_TOF_DISTANCE_MODE, // 9 TOF DISTANCE + STS_TOF_PRESENCE_MODE, // A TOF PRESENCE OCCUPANCY + STS_TOF_IN_OUT_MODE, // B TOF IN OUT COUNT + STS_FALL_DETECTION_MODE, // C FALL DETECTION + + STS_OTHER_MODE // ? OTHER MODE +}; +#if defined(STS_O7)||defined(STS_O6) +#define STS_Reed_Hall_State HALL1_STATE +#define STS_Emergency_Button_State HALL2_STATE +#else +#define STS_Reed_Hall_State HAL_GPIO_ReadPin(BUT1_GPIO_Port, BUT1_Pin) +#endif +//void STS_Lamp_Bar_All(uint8_t lamp_color, uint8_t luminance_level); +void STS_Lamp_Bar_Set_Color(uint8_t red, uint8_t green, uint8_t blue ); +void STS_Lamp_Bar_Set_RGB(uint8_t red, uint8_t green, uint8_t blue); +void STS_Lamp_Bar_Set_RGB_Color(uint8_t red, uint8_t green, uint8_t blue); +void STS_Lamp_Bar_Init(void); +void STS_Lamp_Bar_Full_Color_Gradient(void); +void STS_WS2812B_Refresh(void); +void STS_WS2812B_Set_RGB(uint8_t R, uint8_t G, uint8_t B, uint8_t idx); +void STS_Reed_Hall_Working(void); +void STS_Lamp_Bar_Self_Test_Simple(void); +void STS_Lamp_Bar_Self_Test(void); +void STS_Lamp_Bar_Set_Dark(void); +void sts_rgb_unit_test(void); +void STS_Reed_Hall_Presence_Detection(void); + +void STS_RSS_Smart_Presence_Detection(void); +void STS_RSS_Smart_Presence(void); + +void STS_Combined_Status_Processing(void); + +// Before Join LoRa-WAN Network +void STS_Lamp_Bar_Scoller(uint8_t color, uint8_t luminance_level); +// Occupancy Status, Set Color to STS_RED +// Vacant Status, Set Color to STS_GREEN +void STS_Lamp_Bar_Set_STS_RGB_Color(uint8_t sts_lamp_color, uint8_t luminance_level); +void STS_Lamp_Bar_Refresh(void); + + + +#ifdef __cplusplus +} +#endif + +#endif /* _STS_LAMP_BAR_H */ + diff --git a/Core/Inc/tim.h b/Core/Inc/tim.h new file mode 100644 index 0000000..efd1057 --- /dev/null +++ b/Core/Inc/tim.h @@ -0,0 +1,51 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file tim.h + * @brief This file contains all the function prototypes for + * the tim.c file + ****************************************************************************** + * @attention + * + * Copyright (c) 2022 STMicroelectronics. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ +/* Define to prevent recursive inclusion -------------------------------------*/ +#ifndef __TIM_H__ +#define __TIM_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +/* Includes ------------------------------------------------------------------*/ +#include "main.h" + +/* USER CODE BEGIN Includes */ + +/* USER CODE END Includes */ + +/* USER CODE BEGIN Private defines */ +extern TIM_HandleTypeDef htim1; +/* USER CODE END Private defines */ + + +/* USER CODE BEGIN Prototypes */ +void MX_TIM1_Init(void); +void HAL_TIM_MspPostInit(TIM_HandleTypeDef *htim); + +/* USER CODE END Prototypes */ + +#ifdef __cplusplus +} +#endif + +#endif /* __TIM_H__ */ + diff --git a/Core/Src/sts_lamp_bar.c b/Core/Src/sts_lamp_bar.c new file mode 100644 index 0000000..01fb69b --- /dev/null +++ b/Core/Src/sts_lamp_bar.c @@ -0,0 +1,284 @@ +/* USER CODE BEGIN Header */ +/** + ****************************************************************************** + * @file yunhorn_sts_lamp_bar.c * + * @author Yunhorn (r) Technology Limited Application Team * + * @brief Yunhorn (r) SmarToilets (r) Product configuration file. * + ****************************************************************************** + * @attention + * + * Copyright (c) 2022 Yunhorn Technology Limited. + * Copyright (c) 2022 Shenzhen Yunhorn Technology Co., Ltd. + * All rights reserved. + * + * This software is licensed under terms that can be found in the LICENSE file + * in the root directory of this software component. + * If no LICENSE file comes with this software, it is provided AS-IS. + * + ****************************************************************************** + */ +/* USER CODE END Header */ +#include "main.h" +#include "dma.h" +#include "tim.h" +#include "string.h" +#include "sys_app.h" +#include "stm32_systime.h" +#include "sts_lamp_bar.h" + +#include "yunhorn_sts_sensors.h" + +#define ONE_PULSE (40) //36 +#define ZERO_PULSE (20) + +#define LED_DATA_LEN 24 +#define WS2812B_DATA_LEN (LED_DATA_LEN * (STS_LAMP_BAR_LED_NUM)) +#define RESET_PULSE (24) //(80) TO FIX DARK_COLOR AND SM2 + + +typedef struct ws2812b_e { + //uint16_t head[3]; + uint16_t GRB[WS2812B_DATA_LEN]; + uint16_t tail; +} WS2812B_FrameTypeDef; + +volatile WS2812B_FrameTypeDef rgb_buf = { +// .head[0] = 0, +// .head[1] = 0, +// .head[2] = 0, + .tail = 0 +}; + +uint8_t color_rgb[8][3] = { //STS_COLOR R G B MAPPING TABLE + {0,0,0},{0,1,0},{1,0,0},{0,0,1},{1,1,0},{1,0,1},{0,1,1},{1,1,1} +}; +extern volatile uint8_t sts_service_mask; +extern volatile uint8_t sts_work_mode; +volatile uint8_t sts_reed_hall_ext_int = 0; +volatile uint8_t sts_status_color = STS_GREEN; +volatile uint8_t sts_lamp_bar_color = STS_GREEN; //puColor +volatile uint8_t sts_lamp_bar_flashing_color = STS_RED_DARK; //0x23; RED_BLUE; +volatile uint8_t sts_cloud_netcolor = STS_GREEN; //netColor +extern volatile uint8_t sts_occupancy_status; + +extern volatile uint8_t sts_reed_hall_result, sts_emergency_button_pushed; // inital 0 = close +volatile uint8_t sts_hall1_read=STS_Status_Door_Open,sts_hall2_read=STS_Status_SOS_Release; // Above hall1_read == reed_hall_result, hall2_read == emergency_button +volatile uint8_t sts_hall3_read=STS_Status_Alarm_Mute_Release,sts_hall4_read=STS_Status_Alarm_Reset_Release; +extern volatile uint8_t sts_reed_hall_1_result, sts_reed_hall_2_result; +extern volatile uint8_t sts_tof_result_changed_flag; + + + +extern volatile uint8_t sts_rss_result_changed_flag, sts_hall1_changed_flag, sts_hall2_changed_flag, sts_reed_hall_changed_flag; +extern volatile uint8_t sts_rss_result; +extern volatile uint8_t sts_rss_2nd_result; //2nd RSS sensor status +extern volatile uint8_t sts_tof_result; + + +volatile uint8_t last_lamp_bar_color=STS_GREEN; +extern volatile uint8_t sts_presence_fall_detection; +extern volatile uint8_t sts_fall_rising_detected_result; +extern volatile float sts_presence_rss_distance; +extern volatile uint8_t sensor_data_ready; +extern SysTime_t mems_event_time; +extern volatile uint32_t event_start_time, event_stop_time; +extern volatile uint32_t event_door_lock_start_time, event_door_lock_stop_time; +volatile uint8_t luminance_level = DEFAULT_LUMINANCE_LEVEL; + + +void STS_Lamp_Bar_Set_Dark(void) +{ + for (uint8_t i=0; i< STS_LAMP_BAR_LED_NUM; i++) + { + STS_WS2812B_Set_RGB(0x00,0x00,0x00,i); + + } + STS_WS2812B_Refresh(); +} + +void STS_WS2812B_Refresh(void) +{ + + HAL_TIM_PWM_Start_DMA(&STS_LAMP_BAR_HTIM, STS_LAMP_BAR_TIM_CHANNEL, (uint32_t *)&rgb_buf, (WS2812B_DATA_LEN+RESET_PULSE)); + //HAL_TIM_PWM_Start_IT(&STS_LAMP_BAR_HTIM, STS_LAMP_BAR_TIM_CHANNEL); +} + +void STS_Lamp_Bar_Init(void) +{ + if (sts_service_mask == STS_SERVICE_MASK_L0) + { + STS_Lamp_Bar_Set_STS_RGB_Color(STS_GREEN, luminance_level); + + HAL_Delay(200); + STS_Lamp_Bar_Set_STS_RGB_Color(STS_RED, luminance_level); + + HAL_Delay(200); + STS_Lamp_Bar_Set_STS_RGB_Color(STS_BLUE, luminance_level); + + HAL_Delay(200); + } +} + +//marquee scoller +void STS_Lamp_Bar_Scoller(uint8_t color, uint8_t lum_level) +{ + STS_Lamp_Bar_Set_Dark(); + + for(uint8_t i = 0; iInstance==TIM1) + { + /* USER CODE BEGIN TIM1_MspInit 0 */ + + /* USER CODE END TIM1_MspInit 0 */ + /* TIM1 clock enable */ + __HAL_RCC_TIM1_CLK_ENABLE(); + + /* TIM1 DMA Init */ + /* TIM1_CH1 Init */ + hdma_tim1_ch1.Instance = DMA1_Channel1; + + hdma_tim1_ch1.Init.Request = DMA_REQUEST_TIM1_CH1; + hdma_tim1_ch1.Init.Direction = DMA_MEMORY_TO_PERIPH; + hdma_tim1_ch1.Init.PeriphInc = DMA_PINC_DISABLE; + hdma_tim1_ch1.Init.MemInc = DMA_MINC_ENABLE; + hdma_tim1_ch1.Init.PeriphDataAlignment = DMA_PDATAALIGN_HALFWORD; + hdma_tim1_ch1.Init.MemDataAlignment = DMA_MDATAALIGN_BYTE; //DMA_MDATAALIGN_HALFWORD; //DMA_MDATAALIGN_HALFWORD; + hdma_tim1_ch1.Init.Mode = DMA_CIRCULAR; + hdma_tim1_ch1.Init.Priority = DMA_PRIORITY_HIGH; //was HIGH + + if (HAL_DMA_Init(&hdma_tim1_ch1) != HAL_OK) + { + Error_Handler(); + } +#ifdef STM32WL55xx + if (HAL_DMA_ConfigChannelAttributes(&hdma_tim1_ch1, DMA_CHANNEL_NPRIV) != HAL_OK) + { + Error_Handler(); + } +#endif + __HAL_LINKDMA(tim_baseHandle,hdma[TIM_DMA_ID_CC1],hdma_tim1_ch1); + + /* USER CODE BEGIN TIM1_MspInit 1 */ + + /* USER CODE END TIM1_MspInit 1 */ + } + +} +void HAL_TIM_MspPostInit(TIM_HandleTypeDef* timHandle) +{ + + GPIO_InitTypeDef GPIO_InitStruct = {0}; + if(timHandle->Instance==TIM1) + { + /* USER CODE BEGIN TIM1_MspPostInit 0 */ + + /* USER CODE END TIM1_MspPostInit 0 */ + __HAL_RCC_GPIOA_CLK_ENABLE(); + /**TIM1 GPIO Configuration + PA8 ------> TIM1_CH1 + */ + GPIO_InitStruct.Pin = GPIO_PIN_8; + GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; + GPIO_InitStruct.Pull = GPIO_PULLUP; //GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH; + GPIO_InitStruct.Alternate = GPIO_AF1_TIM1; + HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); + + /* USER CODE BEGIN TIM1_MspPostInit 1 */ + + /* USER CODE END TIM1_MspPostInit 1 */ + } + +} + +void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* tim_baseHandle) +{ + + if(tim_baseHandle->Instance==TIM1) + { + /* USER CODE BEGIN TIM1_MspDeInit 0 */ + + /* USER CODE END TIM1_MspDeInit 0 */ + /* Peripheral clock disable */ + __HAL_RCC_TIM1_CLK_DISABLE(); + + /* TIM1 DMA DeInit */ + HAL_DMA_DeInit(tim_baseHandle->hdma[TIM_DMA_ID_CC1]); + /* USER CODE BEGIN TIM1_MspDeInit 1 */ + + /* USER CODE END TIM1_MspDeInit 1 */ + } + +} + +/* USER CODE BEGIN 1 */ + +/* USER CODE END 1 */ diff --git a/LMZ/VL53LMZ_ULD_API/changelog.txt b/LMZ/VL53LMZ_ULD_API/changelog.txt new file mode 100644 index 0000000..5c5c0bc --- /dev/null +++ b/LMZ/VL53LMZ_ULD_API/changelog.txt @@ -0,0 +1,39 @@ +******************************************************************************** +* +* STMicroelectronics - VL53L7CH/VL53L8CH Ultra Lite Driver +* +******************************************************************************** + +# Driver version history + +--------------------------------------------------------------------------------------------------------------- +Version : 2.0.10 +Date: 07/12/2023 +Comments : +- Fixed wrong conversion of Ambient and Histogram values in Example_12. Values were a factor of 2x too low. +- Fixed incorrect sizing of cnh_data_buffer_t. +- Fixed incorrect comparison for is_auto_stop_enabled. +- Added VL53LMZ_POWER_MODE_DEEP_SLEEP mode. +- Include MM FW v1.7 which contains: +.... Improved rad2perp for L8 +.... Improved wrap-around check algo +.... Option to skip intr on first two frames of detection thresholds +.... Calculation of a FW checksum +.... Fix for incorrect operation with very negative values of CNH start_bin +.... Added first_bin to sci_persistent_data[2][31:16] +--------------------------------------------------------------------------------------------------------------- + +--------------------------------------------------------------------------------------------------------------- +Version : 2.0.9 +Date : 25/07/2023 +Comments : +- Fixed issue in vl53lmz_enable/disable_internal_cp functions which prevented use with VL53L7CH. +- Added module_type to VL53LMZ_Configuration to provide a public location to read the module type. This +field is set during calls to vl53lmz_is_alive() and vl53lmz_init(). +--------------------------------------------------------------------------------------------------------------- + +--------------------------------------------------------------------------------------------------------------- +Version : 2.0.8 +Date : 16/06/2023 +Comments : Initial driver release. +--------------------------------------------------------------------------------------------------------------- diff --git a/STM32CubeIDE/.cproject b/STM32CubeIDE/.cproject index a2e5ab8..63a1da2 100644 --- a/STM32CubeIDE/.cproject +++ b/STM32CubeIDE/.cproject @@ -98,6 +98,9 @@ + + + @@ -209,6 +212,9 @@ + + + @@ -219,15 +225,6 @@ - - - - - - - - - @@ -237,4 +234,5 @@ + \ No newline at end of file diff --git a/STM32CubeIDE/.settings/language.settings.xml b/STM32CubeIDE/.settings/language.settings.xml index c3dfc14..4b0e6ff 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/Application/User/STS/TOF/App/subdir.mk b/STM32CubeIDE/Release/Application/User/STS/TOF/App/subdir.mk index 60bdbb9..563c2db 100644 --- a/STM32CubeIDE/Release/Application/User/STS/TOF/App/subdir.mk +++ b/STM32CubeIDE/Release/Application/User/STS/TOF/App/subdir.mk @@ -5,33 +5,23 @@ # Add inputs and outputs from these tool invocations to the build variables C_SRCS += \ -D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/WLE5CC_NODE_STS/STS/TOF/App/X-WL55_WLE5_53L0X.c \ -D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/WLE5CC_NODE_STS/STS/TOF/App/app_tof.c \ -D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/WLE5CC_NODE_STS/STS/TOF/App/app_tof_vl53l0x_range.c +D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/WLE5CC_NODE_STS/STS/TOF/App/app_tof.c OBJS += \ -./Application/User/STS/TOF/App/X-WL55_WLE5_53L0X.o \ -./Application/User/STS/TOF/App/app_tof.o \ -./Application/User/STS/TOF/App/app_tof_vl53l0x_range.o +./Application/User/STS/TOF/App/app_tof.o C_DEPS += \ -./Application/User/STS/TOF/App/X-WL55_WLE5_53L0X.d \ -./Application/User/STS/TOF/App/app_tof.d \ -./Application/User/STS/TOF/App/app_tof_vl53l0x_range.d +./Application/User/STS/TOF/App/app_tof.d # Each subdirectory must supply rules for building sources it contributes -Application/User/STS/TOF/App/X-WL55_WLE5_53L0X.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/WLE5CC_NODE_STS/STS/TOF/App/X-WL55_WLE5_53L0X.c Application/User/STS/TOF/App/subdir.mk - arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DL8 -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/STS/TOF/App/app_tof.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/WLE5CC_NODE_STS/STS/TOF/App/app_tof.c Application/User/STS/TOF/App/subdir.mk arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DL8 -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/STS/TOF/App/app_tof_vl53l0x_range.o: D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/WLE5CC_NODE_STS/STS/TOF/App/app_tof_vl53l0x_range.c Application/User/STS/TOF/App/subdir.mk - arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DL8 -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 "$@" clean: clean-Application-2f-User-2f-STS-2f-TOF-2f-App clean-Application-2f-User-2f-STS-2f-TOF-2f-App: - -$(RM) ./Application/User/STS/TOF/App/X-WL55_WLE5_53L0X.cyclo ./Application/User/STS/TOF/App/X-WL55_WLE5_53L0X.d ./Application/User/STS/TOF/App/X-WL55_WLE5_53L0X.o ./Application/User/STS/TOF/App/X-WL55_WLE5_53L0X.su ./Application/User/STS/TOF/App/app_tof.cyclo ./Application/User/STS/TOF/App/app_tof.d ./Application/User/STS/TOF/App/app_tof.o ./Application/User/STS/TOF/App/app_tof.su ./Application/User/STS/TOF/App/app_tof_vl53l0x_range.cyclo ./Application/User/STS/TOF/App/app_tof_vl53l0x_range.d ./Application/User/STS/TOF/App/app_tof_vl53l0x_range.o ./Application/User/STS/TOF/App/app_tof_vl53l0x_range.su + -$(RM) ./Application/User/STS/TOF/App/app_tof.cyclo ./Application/User/STS/TOF/App/app_tof.d ./Application/User/STS/TOF/App/app_tof.o ./Application/User/STS/TOF/App/app_tof.su .PHONY: clean-Application-2f-User-2f-STS-2f-TOF-2f-App diff --git a/STM32CubeIDE/Release/Application/User/STS/TOF/vl53l1x_uld/subdir.mk b/STM32CubeIDE/Release/Application/User/STS/TOF/vl53l1x_uld/subdir.mk new file mode 100644 index 0000000..acbe69a --- /dev/null +++ b/STM32CubeIDE/Release/Application/User/STS/TOF/vl53l1x_uld/subdir.mk @@ -0,0 +1,9 @@ +################################################################################ +# Automatically-generated file. Do not edit! +# Toolchain: GNU Tools for STM32 (12.3.rel1) +################################################################################ + +# Add inputs and outputs from these tool invocations to the build variables + +# Each subdirectory must supply rules for building sources it contributes + diff --git a/STM32CubeIDE/Release/WLE5CC_NODE_STS_R1D_JP_20241030.elf b/STM32CubeIDE/Release/WLE5CC_NODE_STS_R1D_JP_20241030.elf new file mode 100644 index 0000000..0491df2 Binary files /dev/null and b/STM32CubeIDE/Release/WLE5CC_NODE_STS_R1D_JP_20241030.elf differ diff --git a/STM32CubeIDE/Release/WLE5CC_NODE_STS_STS_M1_20241101.elf b/STM32CubeIDE/Release/WLE5CC_NODE_STS_STS_M1_20241101.elf new file mode 100644 index 0000000..d06dbc6 Binary files /dev/null and b/STM32CubeIDE/Release/WLE5CC_NODE_STS_STS_M1_20241101.elf differ diff --git a/STM32CubeIDE/Release/WLE5CC_NODE_STS_STS_M1_JP_20241031.elf b/STM32CubeIDE/Release/WLE5CC_NODE_STS_STS_M1_JP_20241031.elf new file mode 100644 index 0000000..4184ab3 Binary files /dev/null and b/STM32CubeIDE/Release/WLE5CC_NODE_STS_STS_M1_JP_20241031.elf differ diff --git a/STM32CubeIDE/Release/WLE5CC_NODE_STS_STS_O5_JP_20241031.elf b/STM32CubeIDE/Release/WLE5CC_NODE_STS_STS_O5_JP_20241031.elf new file mode 100644 index 0000000..565b218 Binary files /dev/null and b/STM32CubeIDE/Release/WLE5CC_NODE_STS_STS_O5_JP_20241031.elf differ diff --git a/STM32CubeIDE/Release/WLE5CC_NODE_STS_STS_P2B_20241104.elf b/STM32CubeIDE/Release/WLE5CC_NODE_STS_STS_P2B_20241104.elf new file mode 100644 index 0000000..812681e Binary files /dev/null and b/STM32CubeIDE/Release/WLE5CC_NODE_STS_STS_P2B_20241104.elf differ diff --git a/STM32CubeIDE/Release/WLE5CC_NODE_STS_STS_P2_20241101.elf b/STM32CubeIDE/Release/WLE5CC_NODE_STS_STS_P2_20241101.elf new file mode 100644 index 0000000..5d4015a Binary files /dev/null and b/STM32CubeIDE/Release/WLE5CC_NODE_STS_STS_P2_20241101.elf differ diff --git a/STM32CubeIDE/Release/WLE5CC_NODE_STS_STS_P2_20241104.elf b/STM32CubeIDE/Release/WLE5CC_NODE_STS_STS_P2_20241104.elf new file mode 100644 index 0000000..812681e Binary files /dev/null and b/STM32CubeIDE/Release/WLE5CC_NODE_STS_STS_P2_20241104.elf differ diff --git a/STM32CubeIDE/Release/WLE5CC_NODE_STS_STS_R4_JP_20241030.elf b/STM32CubeIDE/Release/WLE5CC_NODE_STS_STS_R4_JP_20241030.elf new file mode 100644 index 0000000..86a3d89 Binary files /dev/null and b/STM32CubeIDE/Release/WLE5CC_NODE_STS_STS_R4_JP_20241030.elf differ diff --git a/STM32CubeIDE/Release/WLE5CC_NODE_STS_STS_R5_20241030A.elf b/STM32CubeIDE/Release/WLE5CC_NODE_STS_STS_R5_20241030A.elf new file mode 100644 index 0000000..7f19afb Binary files /dev/null and b/STM32CubeIDE/Release/WLE5CC_NODE_STS_STS_R5_20241030A.elf differ diff --git a/STM32CubeIDE/Release/WLE5CC_NODE_STS_T6_20241104.elf b/STM32CubeIDE/Release/WLE5CC_NODE_STS_T6_20241104.elf new file mode 100644 index 0000000..d89f2a8 Binary files /dev/null and b/STM32CubeIDE/Release/WLE5CC_NODE_STS_T6_20241104.elf differ diff --git a/STM32CubeIDE/Release/makefile b/STM32CubeIDE/Release/makefile index 7427775..90d8aef 100644 --- a/STM32CubeIDE/Release/makefile +++ b/STM32CubeIDE/Release/makefile @@ -18,7 +18,6 @@ RM := rm -rf -include Drivers/BSP/Components/subdir.mk -include Drivers/BSP/53L8A1/subdir.mk -include Application/User/Startup/subdir.mk --include Application/User/STS/TOF/vl53l0x/subdir.mk -include Application/User/STS/TOF/Target/subdir.mk -include Application/User/STS/TOF/App/subdir.mk -include Application/User/STS/Core/Src/subdir.mk diff --git a/STM32CubeIDE/Release/sources.mk b/STM32CubeIDE/Release/sources.mk index f021f94..c6e8d88 100644 --- a/STM32CubeIDE/Release/sources.mk +++ b/STM32CubeIDE/Release/sources.mk @@ -28,7 +28,6 @@ Application/User/LoRaWAN/Target \ Application/User/STS/Core/Src \ Application/User/STS/TOF/App \ Application/User/STS/TOF/Target \ -Application/User/STS/TOF/vl53l0x \ Application/User/Startup \ Drivers/BSP/53L8A1 \ Drivers/BSP/Components \ diff --git a/STS/BIN/WLE5CC_NODE_STS.elf b/STS/BIN/WLE5CC_NODE_STS.elf new file mode 100644 index 0000000..4184ab3 Binary files /dev/null and b/STS/BIN/WLE5CC_NODE_STS.elf differ diff --git a/STS/BIN/WLE5CC_NODE_STS_L8_OK_20241015.elf b/STS/BIN/WLE5CC_NODE_STS_L8_OK_20241015.elf new file mode 100644 index 0000000..abc1f10 Binary files /dev/null and b/STS/BIN/WLE5CC_NODE_STS_L8_OK_20241015.elf differ diff --git a/STS/BIN/WLE5CC_NODE_STS_R1D_JP_20241030.elf b/STS/BIN/WLE5CC_NODE_STS_R1D_JP_20241030.elf new file mode 100644 index 0000000..0491df2 Binary files /dev/null and b/STS/BIN/WLE5CC_NODE_STS_R1D_JP_20241030.elf differ diff --git a/STS/BIN/WLE5CC_NODE_STS_STS_M1_JP_20241031.elf b/STS/BIN/WLE5CC_NODE_STS_STS_M1_JP_20241031.elf new file mode 100644 index 0000000..4184ab3 Binary files /dev/null and b/STS/BIN/WLE5CC_NODE_STS_STS_M1_JP_20241031.elf differ diff --git a/STS/BIN/WLE5CC_NODE_STS_STS_O5_JP_20241031.elf b/STS/BIN/WLE5CC_NODE_STS_STS_O5_JP_20241031.elf new file mode 100644 index 0000000..565b218 Binary files /dev/null and b/STS/BIN/WLE5CC_NODE_STS_STS_O5_JP_20241031.elf differ diff --git a/STS/BIN/WLE5CC_NODE_STS_STS_R4_JP_20241030.elf b/STS/BIN/WLE5CC_NODE_STS_STS_R4_JP_20241030.elf new file mode 100644 index 0000000..86a3d89 Binary files /dev/null and b/STS/BIN/WLE5CC_NODE_STS_STS_R4_JP_20241030.elf differ diff --git a/STS/BIN/WLE5CC_NODE_STS_STS_R5_20241030A.elf b/STS/BIN/WLE5CC_NODE_STS_STS_R5_20241030A.elf new file mode 100644 index 0000000..7f19afb Binary files /dev/null and b/STS/BIN/WLE5CC_NODE_STS_STS_R5_20241030A.elf differ diff --git a/jp_as923_decoder_backup.js b/jp_as923_decoder_backup.js new file mode 100644 index 0000000..ca626dd --- /dev/null +++ b/jp_as923_decoder_backup.js @@ -0,0 +1,356 @@ +// Decode decodes an array of bytes into an object. +// - fPort contains the LoRaWAN fPort number +// - bytes is an array of bytes, e.g. [225, 230, 255, 0] +// - 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} +function Decode(fPort, bytes, variables) { + // O5 Door contact sensor + if (fPort === 4) { + return [ + { + led_state: bytes[0]===0 ? "Off":"On", + mtm_code_1: bytes[1], + mtm_code_2: bytes[2], + hw_code: bytes[3], + battery_level: bytes[4]+"%", + size_value: bytes[5], + door_state: bytes[6] === 1 ? "Closed": "Open", + } + ]; + } + // heart-beat of O5 + else if (fPort === 5) { + return [ + { + led_state: (bytes[0] & 0x7f) === 0 ? "Off" : "On", + battery_level: bytes[1] + " %", + } + ]; + } + // R4 soap/sanitizer sensor + else if (fPort === 7) { + return [ + { + led_state: bytes[0]===0 ? "Off":"On", + mtm_code_1: bytes[1], + mtm_code_2: bytes[2], + hw_code: bytes[3], + battery_level: bytes[4]+"%", + size_value: bytes[5], + measure_tech:bytes[6] === 0? "Capacitive":"Other", + liquid_level_event: bytes[7] === 0? "Liquid Detected":"No Liquid", + } + ]; + } + // R4 soap/sanitizer heart-beat + else if (fPort === 8) { + return [ + { + led_state: (bytes[0] & 0x7f) === 0 ? "Off" : "On", + //battery_level: bytes[1] + " %", + battery_level_mV: bytes[1]*100 + " mV", + } + ]; + } + // R1D dual roll toilet paper sensor + else if (fPort === 57) { + return [ + { + led_state:bytes[0]===0 ? "Off":"On", + mtm_code_1:bytes[1], + mtm_code_2:bytes[2], + hw_code:bytes[3], + battery_level:bytes[4]+"%", + size_value:bytes[5], + distance_1_mm:bytes[6]*256+bytes[7], + distance_2_mm:bytes[8]*256+bytes[9], + distance_unit: "mm", + } + ]; + } + // R1D, Heart-beat + else if (fPort === 58) { + return [ + { + led_state: (bytes[0] & 0x7f) === 0 ? "Off" : "On", + //battery_level: bytes[1] + " %", + battery_level_mV: bytes[1]*100 + " mV", + } + ]; + } + // R5 waste bin sensor + else if (fPort === 11) { + return [ + { + led_state:bytes[0]===0 ? "Off":"On", + mtm_code_1:bytes[1], + mtm_code_2:bytes[2], + hw_code:bytes[3], + battery_level:bytes[4]+"%", + size_value:bytes[5], + distance_mm: bytes[6]*256 + bytes[7], + distance_unit: "mm", + } + ]; + } + // R5, Heart-beat + else if (fPort === 12) { + return [ + { + led_state: (bytes[0] & 0x7f) === 0 ? "Off" : "On", + //battery_level_percent: bytes[1] + " %", + battery_level_mV: bytes[1]*100 + "mV", + } + ]; + } + + // UPLINK, RFAC + else if (fPort === 1 ) + { + var data={}; + data.length = bytes.length; + if ((data.length ===10) && (bytes[0] == 0x59)&&(bytes[9]==0x38)) + { + data.Yunhorn_PRD ="True"; + data.PRD_String = String.fromCharCode(bytes); + } + else if ((data.length ===4) && (bytes[0] == 0x52)&&(bytes[1]==0x46)) //RFAC + { + data.Request_Performed = "OK"; + data.RFAC = "OK"; + data.AC0 = bytes[0]; + data.AC1 = bytes[1]; + } + else if ((data.length ===4) && (bytes[0]===0x50)&&(bytes[1]===0x31)&&(bytes[2]===0x31)) + { data.Work_Mode_Switch ="OK"; + switch (bytes[3]-0x30) + { + case 0x0: + data.workmode = "Network_mode"; + break; + case 0x01: + data.workmode = "Wired_Mode"; + break; + case 0x02: + data.workmode = "Hall_element_mode"; + break; + case 0x03: + data.workmode = "MotionDetect_mode"; + break; + case 0x04: + data.workmode = "Dual_mode"; + break; + case 0x05: + data.workmode = "Uni_Mode"; + break; + default: + data.workmode = "Unknown Mode"; + break; + } + } + + else if ((bytes[0]===0x59) && (bytes[1] === 0x44)) //Duration interval + { + data.Uplink_interval=(bytes[2]-0x30)*10+(bytes[3]-0x30); + data.Uplink_interval_unit=String.fromCharCode(bytes[4]); + //data.Heart_beat_Duration = (bytes[2]-0x30)*10 + (bytes[3]-0x30); + //data.Unit = String.fromCharCode(bytes[4]); + } + + else if ((bytes[0]===0x59) && (bytes[1] === 0x53)) //Sampling interval or Heart-beat interval + { + data.Heart_Beat_interval=(bytes[2]-0x30)*10+(bytes[3]-0x30); + data.Heart_Beat_interval_unit=String.fromCharCode(bytes[4]); + //data.Wakeup_sampling_interval = (bytes[2]-0x30)*10 + (bytes[3]-0x30); + //data.Unit = String.fromCharCode(bytes[4]); + } + + else if (bytes[0]===0x43) { // report current nvm config + data.mtm_code1=bytes[1]; + data.mtm_code2=bytes[2]; + data.sts_verion=bytes[3]; + data.sts_hw_ver=bytes[4]; + data.sts_uplink_interval = bytes[5]; + data.sts_uplink_interval_unit = String.fromCharCode(bytes[6]); + data.sts_sampling_interval = bytes[7]; + data.sts_sampling_interval_unit = String.fromCharCode(bytes[8]); + data.sts_work_mode=bytes[9]; + data.sts_service_mask=bytes[10]; + data.sts_reserve01=bytes[11]; + data.sts_payload_length=bytes[12]; + data.rss_start_distance=bytes[13]*0.1+" meter"; + data.rss_range_length = bytes[14]*0.1+" meter"; + data.rss_threshold = bytes[15]*0.1; + data.rss_receiving_gain=bytes[16]+" %"; + data.rss_profile=bytes[17]; + data.rss_rate_tracking=bytes[18]; + data.rss_rate_presence=bytes[19]; + data.rss_HWAAS = bytes[20]; + data.rss_nbr_removed_pc=bytes[21]; + data.rss_inter_frame_deviation_time_const=bytes[22]*0.1; + data.rss_inter_frame_fast_cutoff=bytes[23]; + data.rss_inter_frame_slow_cutoff=bytes[24]; + data.rss_intra_frame_time_const=bytes[25]; + data.rss_intra_frame_weight=bytes[26]*0.1; + data.rss_output_time_const=bytes[27]*0.1; + data.rss_downsampling_factor=bytes[28]; + data.rss_power_saving_mode_active=bytes[29]; + data.rss_reserve02=bytes[30]; + data.rss_reserve03=bytes[31]; + data.rss_reserve04=bytes[32]; + data.reserve2=bytes[33]; + data.reserve3=bytes[34]; + data.sensor_install_height=bytes[35]*10+" cm"; + + data.alarm_parameter05=bytes[36]; + data.alarm_mute_expire_timer=bytes[37]; + data.alarm_lamp_bar_flashing_color=bytes[38]; + data.occupancy_overtime_threshold=bytes[39]; + + data.motionless_duration_threshold=bytes[40]; + data.unconcious_threshold = bytes[41]; + + data.fall_detection_acc_threshold=bytes[42]; + data.fall_detection_depth_threshold=bytes[43]; + data.fall_down_confirm_threshold=bytes[44]; + } + else if (bytes[0]===0x53) + { // SELF TEST FUNCTION + data.mtm_code1=bytes[1]; + data.mtm_code2=bytes[2]; + data.sts_verion=bytes[3]; + data.sts_hw_ver=bytes[4]; + data.battery_level=bytes[5]; + if ((bytes[6]===0x03)) { // report sensor install height + data.sts_sensor_install_height= (bytes[7]<<8|bytes[8]); + data.sts_sensor_install_height_unit="mm"; + } + else if ((bytes[6]===0x58)) + { + data.sts_Test_Result="### Motion Sensor Not Detected ###"; + } else if ((bytes[6]===0x0E)) //result length, 10 rss bytes, 4 distance bytes + { + data.sts_Test_Result="Motion Sensor Test Result:"; + data.sts_test_result_length=bytes[6]; + data.sts_rss_sub_code1=bytes[7]; + data.sts_rss_sub_code2=bytes[8]; + data.sts_rss_sub_code3=bytes[9]; + data.sts_rss_sub_code4=bytes[10]; + data.sts_rss_sub_code5=bytes[11]; + data.sts_rss_sub_code6=bytes[12]; + data.sts_rss_sub_code7=bytes[13]; + data.sts_rss_sub_code8=bytes[14]; + data.sts_rss_sub_code9=bytes[15]; + data.sts_rss_sub_code10=bytes[16]; + data.sts_sensor_install_height = String.fromCharCode(bytes[17])+String.fromCharCode(bytes[18])+String.fromCharCode(bytes[19])+String.fromCharCode(bytes[20])+" mm"; + } + } + else if (bytes[0]===0x44) + { // MEASURE INSTALLATION HEIGHT + data.mtm_code1=bytes[1]; + data.mtm_code2=bytes[2]; + data.sts_verion=bytes[3]; + 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.Distance_unit="mm"; + } + else if (bytes[0] === 0x4c) { // LoRaWAN Class A/B/C + data.mtm_code1=bytes[1]; + data.mtm_code2=bytes[2]; + data.sts_verion=bytes[3]; + data.LoRaWAN_Class=String.fromCharCode(bytes[4]); + } + else if (bytes[0]===0x56) + { // FIRMWARE VERSION + + data.mtm_code1=bytes[1]; + data.mtm_code2=bytes[2]; + data.sts_verion=bytes[3]; + data.sts_hw_ver=bytes[4]; + data.sts_major=bytes[5]; + data.sts_minor=bytes[6]; + data.subminor=bytes[7]; + + if (data.length ===15) { + data.L_year=(bytes[8]<<8|bytes[9]); + data.L_mon=bytes[10]; + data.L_day=bytes[11]; + data.L_hour=bytes[12]; + data.L_min=bytes[13]; + data.L_sec=bytes[14]; + data.LocalTime_UTC="UTC: "+data.L_year+"/"+data.L_mon+"/"+data.L_day+" "+data.L_hour+":"+data.L_min+":"+data.L_sec; + data.LocalTime_EST8="GMT+8: "+data.L_year+"/"+data.L_mon+"/"+data.L_day+" "+(data.L_hour+8)+":"+data.L_min+":"+data.L_sec; + } + } + else if (bytes[0] === 0x54) + { //T: date & time + data.L_year=(bytes[1]<<8|bytes[2]); + data.L_mon=bytes[3]; + data.L_day=bytes[4]; + data.L_hour=bytes[5]; + data.L_min=bytes[6]; + data.L_sec=bytes[7]; + data.LocalTime_UTC="UTC: "+data.L_year+"/"+data.L_mon+"/"+data.L_day+" "+data.L_hour+":"+data.L_min+":"+data.L_sec; + + } + else if (bytes[0]===0x50) + { // P cmd report + if (data.length ==7) + { + switch (bytes[3]) { + case 0x46: // F --- fall down & unconscious detection threshold + data.FALL_acceleration = (bytes[4]==0x30?"Disabled":((bytes[4]-0x30)*10)+" mg/s2"); + data.FALL_depth_measure = (bytes[5]==0x30?"Disabled":((bytes[5]-0x30)*10)+" cm"); + data.FALL_confirm_threshold = (bytes[6]==0x30?"Disabled":((bytes[6]-0x30)*10)+" seconds"); + //data.FALL_reserved = (bytes[7]==0x0?"Disabled":((bytes[6]-0x30)*10)+" min"); + break; + } //switch + } + else if (data.length ==8) + { + switch (bytes[3]) { + case 0x4f: // O -- over stay, onconscious, long stay + data.OMU_Motionless_duration_in_min = (bytes[4]==0x30?"Disabled":((bytes[4]-0x30))+" Min"); + data.OMU_Long_Occupy_duration_in_Min= (bytes[5]==0x30?"Disabled":((bytes[5]-0x30)*10)+" Min"); + data.OMU_Unconcious_Threshold = (bytes[6]==0x30?"Disabled":((bytes[6]-0x30)*100)+"ml"); + data.OMU_Alarm_Mute_Reset_Timer = (bytes[7] ==0x30?"Disabled":((bytes[7]-0x30)*10)+" Seconds"); + break; + case 0x46: // F --- fall down & unconscious detection threshold + data.FALL_acceleration = (bytes[4]==0x30?"Disabled":((bytes[4]-0x30)*10)+" mg/s2"); + data.FALL_depth_measure = (bytes[5]==0x30?"Disabled":((bytes[5]-0x30)*10)+" cm"); + data.FALL_confirm_threshold = (bytes[6]==0x30?"Disabled":((bytes[6]-0x30)*10)+" seconds"); + data.FALL_reserved = (bytes[7]==0x30?"Disabled":((bytes[6]-0x30)*10)+" min"); + break; + } //switch + } else if (data.length == 11) { // P 1108201365 + data.RSS_SIMPLE_Start = ((bytes[3]-0x30)*100+(bytes[4]-0x30)*10)+" cm"; + data.RSS_SIMPLE_Length = ((bytes[5]-0x30)*100+(bytes[6]-0x030)*10)+" cm"; + data.RSS_SIMPLE_Threshold = ((bytes[7]-0x30)*1000+(bytes[8]-0x30)*100)+" ml"; + data.RSS_SIMPLE_Gain = ((bytes[9]-0x30)*10+(bytes[10]-0x30))+" %"; + } else if (data.length == 33) { // P 11 + data.RSS_FULL_Start = ((bytes[3]-0x30)*100+(bytes[4]-0x30)*10)+" cm"; + data.RSS_FULL_Length = ((bytes[5]-0x30)*100+(bytes[6]-0x30)*10)+" cm"; + data.RSS_FULL_Threshold= ((bytes[7]-0x30)*1000+(bytes[8]-0x30)*100)+" ml"; + data.RSS_FULL_Gain = ((bytes[9]-0x30)*10+(bytes[10]-0x30))+" %"; + data.RSS_FULL_Profile = (bytes[11]-0x30); + data.RSS_FULL_Rate_Tracking = ((bytes[12]-0x30)*10+(bytes[13]-0x30)); + data.RSS_FULL_Rate_Presence = ((bytes[14]-0x30)*10+(bytes[15]-0x30)); + data.RSS_FULL_HWAAS = ((bytes[16]-0x30)*10+(bytes[17]-0x30)); + data.RSS_FULL_Num_Removed_PC = (bytes[18]-0x30); + data.RSS_FULL_Inter_Deviation_Time_Const_in_Sec = ((bytes[19]-0x30)+(bytes[20]-0x30)*0.1); + data.RSS_FULL_Inter_Fast_Cut_Off = ((bytes[21]-0x30)*10+(bytes[22]-0x30)); + data.RSS_FULL_Inter_Slow_Cut_Off = ((bytes[23]-0x30)*0.1+(bytes[24]-0x30)*0.001); + data.RSS_FULL_Inter_Time_Const_in_Sec = ((bytes[25]-0x30)*10+(bytes[26]-0x30)); + data.RSS_FULL_Inter_Weight = ((bytes[27]-0x30)+(bytes[28]-0x30)*0.1); + data.RSS_FULL_Output_Time_Const_in_Sec = ((bytes[29]-0x30)+(bytes[30]-0x30)*0.1); + data.RSS_FULL_DownSampling_factor = (bytes[31]-0x30); + data.RSS_FULL_Power_Saving_mode = (bytes[32]-0x30); + + + } + } + return {"Yunhorn_SmarToilets_data": data }; + } +} \ No newline at end of file