diff --git a/Core/Inc/main.h b/Core/Inc/main.h index 6d766b6..29705f8 100644 --- a/Core/Inc/main.h +++ b/Core/Inc/main.h @@ -60,25 +60,33 @@ void Error_Handler(void); #define RTC_N_PREDIV_S 10 #define RTC_PREDIV_S ((1<= STS_BURN_IN_RFAC) && (rfac_timer < (STS_BURN_IN_RFAC +3))) { APP_LOG(TS_OFF, VLEVEL_H, "\r\n -------------------RFAC Process\r\n"); + //STS_SENSOR_Upload_Message(LORAWAN_USER_APP_CTRL_REPLY_PORT, 4, "RFAC"); STS_SENSOR_Upload_Message(YUNHORN_STS_O6_USER_APP_CTRL_REPLY_PORT, 4, "RFAC"); } if ((rfac_timer > (STS_BURN_IN_RFAC + 2))) @@ -182,7 +183,7 @@ void STS_FallDetection_LampBarProcess(void) APP_LOG(TS_OFF, VLEVEL_L, "\r\n <<<<<<<<<<<<<< Fall Rise state=%d, send buf size = %d \r\n", sts_fall_rising_detected_result, i ) - STS_SENSOR_Upload_Message((LORAWAN_USER_APP_PORT+2), i, (char*)buf); + STS_SENSOR_Upload_Message((LORAWAN_USER_APP_PORT+2), i, buf); sts_fall_rising_detected_result = STS_PRESENCE_NONE; diff --git a/STM32CubeIDE/.settings/language.settings.xml b/STM32CubeIDE/.settings/language.settings.xml index 2d055d2..d670042 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/Core/subdir.mk b/STM32CubeIDE/Release/Application/User/Core/subdir.mk index 88c2838..a03caaa 100644 --- a/STM32CubeIDE/Release/Application/User/Core/subdir.mk +++ b/STM32CubeIDE/Release/Application/User/Core/subdir.mk @@ -5,7 +5,7 @@ # Add inputs and outputs from these tool invocations to the build variables C_SRCS += \ -D://ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/YUNHORN_STS_E5CC_AS923_POC/Core/Src/acc_hal_integration_a111.c \ +D://ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/YUNHORN_STS_E5CC_AS923_POC/Core/Src/acc_hal_integration_stm32cube_sparkfun_a111.c \ D://ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/YUNHORN_STS_E5CC_AS923_POC/Core/Src/acc_integration_log.c \ D://ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/YUNHORN_STS_E5CC_AS923_POC/Core/Src/acc_integration_stm32.c \ D://ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/YUNHORN_STS_E5CC_AS923_POC/Core/Src/adc.c \ @@ -38,7 +38,7 @@ D://ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/YUNHORN_STS_ D://ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/YUNHORN_STS_E5CC_AS923_POC/Core/Src/yunhorn_sts_presence_sensor.c OBJS += \ -./Application/User/Core/acc_hal_integration_a111.o \ +./Application/User/Core/acc_hal_integration_stm32cube_sparkfun_a111.o \ ./Application/User/Core/acc_integration_log.o \ ./Application/User/Core/acc_integration_stm32.o \ ./Application/User/Core/adc.o \ @@ -71,7 +71,7 @@ OBJS += \ ./Application/User/Core/yunhorn_sts_presence_sensor.o C_DEPS += \ -./Application/User/Core/acc_hal_integration_a111.d \ +./Application/User/Core/acc_hal_integration_stm32cube_sparkfun_a111.d \ ./Application/User/Core/acc_integration_log.d \ ./Application/User/Core/acc_integration_stm32.d \ ./Application/User/Core/adc.d \ @@ -105,7 +105,7 @@ C_DEPS += \ # Each subdirectory must supply rules for building sources it contributes -Application/User/Core/acc_hal_integration_a111.o: D://ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/YUNHORN_STS_E5CC_AS923_POC/Core/Src/acc_hal_integration_a111.c Application/User/Core/subdir.mk +Application/User/Core/acc_hal_integration_stm32cube_sparkfun_a111.o: D://ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/YUNHORN_STS_E5CC_AS923_POC/Core/Src/acc_hal_integration_stm32cube_sparkfun_a111.c Application/User/Core/subdir.mk arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DCORE_CM4 -DSTM32WLE5xx -DUSE_HAL_DRIVER -DSTM32WL55xx -c -I../../Core/Inc -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../../rss/include -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/acc_integration_log.o: D://ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/YUNHORN_STS_E5CC_AS923_POC/Core/Src/acc_integration_log.c Application/User/Core/subdir.mk arm-none-eabi-gcc "$<" -mcpu=cortex-m4 -std=gnu11 -DCORE_CM4 -DSTM32WLE5xx -DUSE_HAL_DRIVER -DSTM32WL55xx -c -I../../Core/Inc -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../../rss/include -Os -ffunction-sections -fdata-sections -Wall -fstack-usage -fcyclomatic-complexity -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" @@ -169,7 +169,7 @@ Application/User/Core/yunhorn_sts_presence_sensor.o: D://ONEDRIVE/STM32WLV13/Pro clean: clean-Application-2f-User-2f-Core clean-Application-2f-User-2f-Core: - -$(RM) ./Application/User/Core/acc_hal_integration_a111.cyclo ./Application/User/Core/acc_hal_integration_a111.d ./Application/User/Core/acc_hal_integration_a111.o ./Application/User/Core/acc_hal_integration_a111.su ./Application/User/Core/acc_integration_log.cyclo ./Application/User/Core/acc_integration_log.d ./Application/User/Core/acc_integration_log.o ./Application/User/Core/acc_integration_log.su ./Application/User/Core/acc_integration_stm32.cyclo ./Application/User/Core/acc_integration_stm32.d ./Application/User/Core/acc_integration_stm32.o ./Application/User/Core/acc_integration_stm32.su ./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/cmox_low_level.cyclo ./Application/User/Core/cmox_low_level.d ./Application/User/Core/cmox_low_level.o ./Application/User/Core/cmox_low_level.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/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/spi.cyclo ./Application/User/Core/spi.d ./Application/User/Core/spi.o ./Application/User/Core/spi.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/sts_cmox_hmac_sha.cyclo ./Application/User/Core/sts_cmox_hmac_sha.d ./Application/User/Core/sts_cmox_hmac_sha.o ./Application/User/Core/sts_cmox_hmac_sha.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 ./Application/User/Core/yunhorn_sts_distance_rss.cyclo ./Application/User/Core/yunhorn_sts_distance_rss.d ./Application/User/Core/yunhorn_sts_distance_rss.o ./Application/User/Core/yunhorn_sts_distance_rss.su ./Application/User/Core/yunhorn_sts_presence_rss.cyclo ./Application/User/Core/yunhorn_sts_presence_rss.d ./Application/User/Core/yunhorn_sts_presence_rss.o ./Application/User/Core/yunhorn_sts_presence_rss.su ./Application/User/Core/yunhorn_sts_presence_rss_bring_up_test.cyclo ./Application/User/Core/yunhorn_sts_presence_rss_bring_up_test.d ./Application/User/Core/yunhorn_sts_presence_rss_bring_up_test.o ./Application/User/Core/yunhorn_sts_presence_rss_bring_up_test.su ./Application/User/Core/yunhorn_sts_presence_sensor.cyclo ./Application/User/Core/yunhorn_sts_presence_sensor.d ./Application/User/Core/yunhorn_sts_presence_sensor.o ./Application/User/Core/yunhorn_sts_presence_sensor.su + -$(RM) ./Application/User/Core/acc_hal_integration_stm32cube_sparkfun_a111.cyclo ./Application/User/Core/acc_hal_integration_stm32cube_sparkfun_a111.d ./Application/User/Core/acc_hal_integration_stm32cube_sparkfun_a111.o ./Application/User/Core/acc_hal_integration_stm32cube_sparkfun_a111.su ./Application/User/Core/acc_integration_log.cyclo ./Application/User/Core/acc_integration_log.d ./Application/User/Core/acc_integration_log.o ./Application/User/Core/acc_integration_log.su ./Application/User/Core/acc_integration_stm32.cyclo ./Application/User/Core/acc_integration_stm32.d ./Application/User/Core/acc_integration_stm32.o ./Application/User/Core/acc_integration_stm32.su ./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/cmox_low_level.cyclo ./Application/User/Core/cmox_low_level.d ./Application/User/Core/cmox_low_level.o ./Application/User/Core/cmox_low_level.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/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/spi.cyclo ./Application/User/Core/spi.d ./Application/User/Core/spi.o ./Application/User/Core/spi.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/sts_cmox_hmac_sha.cyclo ./Application/User/Core/sts_cmox_hmac_sha.d ./Application/User/Core/sts_cmox_hmac_sha.o ./Application/User/Core/sts_cmox_hmac_sha.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 ./Application/User/Core/yunhorn_sts_distance_rss.cyclo ./Application/User/Core/yunhorn_sts_distance_rss.d ./Application/User/Core/yunhorn_sts_distance_rss.o ./Application/User/Core/yunhorn_sts_distance_rss.su ./Application/User/Core/yunhorn_sts_presence_rss.cyclo ./Application/User/Core/yunhorn_sts_presence_rss.d ./Application/User/Core/yunhorn_sts_presence_rss.o ./Application/User/Core/yunhorn_sts_presence_rss.su ./Application/User/Core/yunhorn_sts_presence_rss_bring_up_test.cyclo ./Application/User/Core/yunhorn_sts_presence_rss_bring_up_test.d ./Application/User/Core/yunhorn_sts_presence_rss_bring_up_test.o ./Application/User/Core/yunhorn_sts_presence_rss_bring_up_test.su ./Application/User/Core/yunhorn_sts_presence_sensor.cyclo ./Application/User/Core/yunhorn_sts_presence_sensor.d ./Application/User/Core/yunhorn_sts_presence_sensor.o ./Application/User/Core/yunhorn_sts_presence_sensor.su .PHONY: clean-Application-2f-User-2f-Core