diff --git a/Core/Inc/yunhorn_sts_prd_conf.h b/Core/Inc/yunhorn_sts_prd_conf.h index ec9a8a1..b2d75e5 100644 --- a/Core/Inc/yunhorn_sts_prd_conf.h +++ b/Core/Inc/yunhorn_sts_prd_conf.h @@ -277,8 +277,8 @@ /* 2KB = 2048 = 0x800 End @ of user Flash area */ -#define USE_STM32WLE5 1U -//#define USE_STM32WL55 1U +//#define USE_STM32WLE5 1U +#define USE_STM32WL55 1U diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index 53c36bb..fa626b1 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -682,8 +682,8 @@ static void SendTxData(void) //AppData.Buffer[i++] = (uint8_t)(0xFF & m7_data.battery_Pct); //15 AppData.Buffer[i++] = (uint8_t)(99*batteryLevel/254); //15 /* 99% (very low) to 254 (fully charged) */ - APP_LOG(TS_OFF, VLEVEL_L, "###### Duration:%02d seconds | FREQ_X:%d Hz | FREQ_Y:%d Hz | FREQ_Z:%d Hz |\r\n###### | RMS_X:%d | RMS_Y:%d | RMS_Z:%d | BATTERY_B:%02d%% |\r\n", - AppData.Buffer[2], + APP_LOG(TS_OFF, VLEVEL_L, "###### LoRa_User_Port:%03d | Duration:%02d seconds | FREQ_X:%d Hz | FREQ_Y:%d Hz | FREQ_Z:%d Hz |\r\n###### | RMS_X:%d | RMS_Y:%d | RMS_Z:%d | BATTERY_B:%02d%% |\r\n", + AppData.Port, AppData.Buffer[2], (AppData.Buffer[3]*255+AppData.Buffer[4]), (AppData.Buffer[5]*255+AppData.Buffer[6]), (AppData.Buffer[7]*255+AppData.Buffer[8]), (AppData.Buffer[9]*255+AppData.Buffer[10]), (AppData.Buffer[11]*255+AppData.Buffer[12]),(AppData.Buffer[13]*255+AppData.Buffer[14]),AppData.Buffer[15]); } diff --git a/MDK-ARM/LoRaWAN_End_Node/STS_M7_919_R1.axf b/MDK-ARM/LoRaWAN_End_Node/STS_M7_919_R1.axf index 232ca25..8bba8a3 100644 Binary files a/MDK-ARM/LoRaWAN_End_Node/STS_M7_919_R1.axf and b/MDK-ARM/LoRaWAN_End_Node/STS_M7_919_R1.axf differ diff --git a/MDK-ARM/LoRaWAN_End_Node/STS_M7_919_R1.build_log.htm b/MDK-ARM/LoRaWAN_End_Node/STS_M7_919_R1.build_log.htm index 5cae1fe..2d70f37 100644 --- a/MDK-ARM/LoRaWAN_End_Node/STS_M7_919_R1.build_log.htm +++ b/MDK-ARM/LoRaWAN_End_Node/STS_M7_919_R1.build_log.htm @@ -28,22 +28,22 @@ Project File Date: 09/26/2022 *** Using Compiler 'V6.15', folder: 'D:\Keil_v5\ARM\ARMCLANG\Bin' Rebuild target 'STS_MM_WLE5' assembling startup_stm32wl55xx_cm4.s... -compiling main.c... -compiling sys_debug.c... compiling dma.c... -compiling stm32_lpm_if.c... compiling adc.c... -compiling sys_sensors.c... -compiling adc_if.c... -compiling rtc.c... compiling gpio.c... +compiling main.c... +compiling sys_sensors.c... compiling usart.c... -compiling subghz.c... -compiling sys_app.c... +compiling stm32_lpm_if.c... compiling stm32wlxx_it.c... +compiling subghz.c... +compiling rtc.c... +compiling sys_debug.c... +compiling adc_if.c... compiling usart_if.c... -compiling timer_if.c... +compiling sys_app.c... compiling stm32wlxx_hal_msp.c... +compiling timer_if.c... compiling ssd1306_fonts.c... compiling app_lorawan.c... compiling flash_if.c... @@ -53,32 +53,32 @@ compiling radio_board_if.c... compiling ssd1306.c... compiling ssd1306_tests.c... compiling stm32wlxx_ll_adc.c... -compiling stm32wlxx_nucleo_radio.c... compiling stm32wlxx_nucleo.c... +compiling stm32wlxx_nucleo_radio.c... compiling lora_app.c... compiling stm32wlxx_hal_adc_ex.c... compiling yunhorn_sts_motion_sensor.c... compiling yunhorn_sts_motion_sensor_adxl345.c... -compiling stm32wlxx_hal_flash.c... compiling stm32wlxx_hal_adc.c... -compiling stm32wlxx_hal_flash_ex.c... -compiling stm32wlxx_hal_rcc_ex.c... -compiling stm32wlxx_hal_dma_ex.c... -compiling stm32wlxx_hal_rcc.c... +compiling stm32wlxx_hal_flash.c... compiling stm32wlxx_hal_gpio.c... +compiling stm32wlxx_hal_dma_ex.c... +compiling stm32wlxx_hal_flash_ex.c... +compiling stm32wlxx_hal_rcc.c... +compiling stm32wlxx_hal_rcc_ex.c... compiling stm32wlxx_hal_pwr.c... compiling stm32wlxx_hal_dma.c... -compiling stm32wlxx_hal_cortex.c... compiling stm32wlxx_hal_pwr_ex.c... -compiling stm32wlxx_hal_exti.c... +compiling stm32wlxx_hal_cortex.c... compiling stm32wlxx_hal.c... -compiling stm32wlxx_hal_rtc.c... +compiling stm32wlxx_hal_exti.c... compiling stm32wlxx_hal_subghz.c... +compiling stm32wlxx_hal_rtc.c... compiling stm32wlxx_hal_rtc_ex.c... compiling cmac.c... -compiling system_stm32wlxx.c... compiling stm32wlxx_hal_uart_ex.c... compiling stm32wlxx_hal_i2c_ex.c... +compiling system_stm32wlxx.c... compiling lorawan_aes.c... compiling Region.c... compiling stm32wlxx_hal_tim_ex.c... @@ -89,25 +89,25 @@ compiling RegionCN470.c... compiling LmhpCompliance.c... compiling RegionAS923.c... compiling RegionCN470A20.c... -compiling RegionCN470A26.c... -compiling RegionCN470B20.c... compiling RegionCN470B26.c... +compiling RegionCN470B20.c... +compiling RegionCN470A26.c... compiling stm32wlxx_hal_uart.c... compiling RegionCN779.c... compiling RegionEU433.c... compiling stm32wlxx_hal_tim.c... compiling RegionEU868.c... -compiling RegionIN865.c... -compiling RegionKR920.c... compiling RegionCommon.c... compiling stm32wlxx_hal_i2c.c... +compiling RegionIN865.c... +compiling RegionKR920.c... compiling RegionRU864.c... compiling RegionUS915.c... compiling LoRaMacAdr.c... compiling LoRaMacClassB.c... -compiling LoRaMacConfirmQueue.c... -compiling LoRaMacCommands.c... compiling LoRaMacParser.c... +compiling LoRaMacCommands.c... +compiling LoRaMacConfirmQueue.c... compiling LoRaMacSerializer.c... compiling LoRaMacCrypto.c... compiling NvmDataMgmt.c... @@ -115,23 +115,23 @@ compiling utilities.c... compiling stm32_mem.c... compiling stm32_systime.c... compiling stm32_adv_trace.c... -compiling LmHandler.c... -compiling stm32_tiny_sscanf.c... compiling radio_fw.c... +compiling stm32_tiny_sscanf.c... +compiling LmHandler.c... compiling stm32_tiny_vsnprintf.c... -compiling stm32_seq.c... -compiling stm32_timer.c... compiling stm32_lpm.c... -compiling BayesFunctions.c... +compiling stm32_seq.c... compiling radio_driver.c... -compiling LoRaMac.c... +compiling stm32_timer.c... compiling radio.c... +compiling BayesFunctions.c... +compiling LoRaMac.c... compiling ControllerFunctions.c... compiling ComplexMathFunctions.c... compiling BasicMathFunctions.c... -compiling DistanceFunctions.c... compiling FastMathFunctions.c... compiling SVMFunctions.c... +compiling DistanceFunctions.c... compiling StatisticsFunctions.c... compiling SupportFunctions.c... compiling MatrixFunctions.c... @@ -139,7 +139,7 @@ compiling CommonTables.c... compiling TransformFunctions.c... compiling FilteringFunctions.c... linking... -Program Size: Code=72152 RO-data=124276 RW-data=292 ZI-data=60740 +Program Size: Code=72152 RO-data=124296 RW-data=292 ZI-data=60740 FromELF: creating hex file... "LoRaWAN_End_Node\STS_M7_919_R1.axf" - 0 Error(s), 0 Warning(s). @@ -169,21 +169,21 @@ Package Vendor: Keil * Component: ARM::CMSIS:CORE:5.4.0 * Component: ARM::CMSIS:DSP:Source:1.8.0 - Source file: CMSIS\DSP\Source\CommonTables\CommonTables.c + Source file: CMSIS\DSP\Source\BayesFunctions\BayesFunctions.c Include file: CMSIS\DSP\Include\arm_math.h - Source file: CMSIS\DSP\Source\SupportFunctions\SupportFunctions.c Source file: CMSIS\DSP\Source\BasicMathFunctions\BasicMathFunctions.c - Source file: CMSIS\DSP\Source\FastMathFunctions\FastMathFunctions.c Source file: CMSIS\DSP\Source\ComplexMathFunctions\ComplexMathFunctions.c - Source file: CMSIS\DSP\Source\StatisticsFunctions\StatisticsFunctions.c - Source file: CMSIS\DSP\Source\SVMFunctions\SVMFunctions.c - Source file: CMSIS\DSP\Source\TransformFunctions\TransformFunctions.c Source file: CMSIS\DSP\Source\ControllerFunctions\ControllerFunctions.c Source file: CMSIS\DSP\Source\DistanceFunctions\DistanceFunctions.c - Source file: CMSIS\DSP\Source\FilteringFunctions\FilteringFunctions.c + Source file: CMSIS\DSP\Source\CommonTables\CommonTables.c + Source file: CMSIS\DSP\Source\SupportFunctions\SupportFunctions.c Source file: CMSIS\DSP\Source\MatrixFunctions\MatrixFunctions.c - Source file: CMSIS\DSP\Source\BayesFunctions\BayesFunctions.c -Build Time Elapsed: 00:00:07 + Source file: CMSIS\DSP\Source\StatisticsFunctions\StatisticsFunctions.c + Source file: CMSIS\DSP\Source\FastMathFunctions\FastMathFunctions.c + Source file: CMSIS\DSP\Source\FilteringFunctions\FilteringFunctions.c + Source file: CMSIS\DSP\Source\SVMFunctions\SVMFunctions.c + Source file: CMSIS\DSP\Source\TransformFunctions\TransformFunctions.c +Build Time Elapsed: 00:00:06 diff --git a/MDK-ARM/LoRaWAN_End_Node/STS_M7_919_R1.htm b/MDK-ARM/LoRaWAN_End_Node/STS_M7_919_R1.htm index cf34bbf..7111c3e 100644 --- a/MDK-ARM/LoRaWAN_End_Node/STS_M7_919_R1.htm +++ b/MDK-ARM/LoRaWAN_End_Node/STS_M7_919_R1.htm @@ -3,7 +3,7 @@ Static Call Graph - [LoRaWAN_End_Node\STS_M7_919_R1.axf]

Static Call Graph for image LoRaWAN_End_Node\STS_M7_919_R1.axf

-

#<CALLGRAPH># ARM Linker, 6150002: Last Updated: Mon Sep 26 17:11:44 2022 +

#<CALLGRAPH># ARM Linker, 6150002: Last Updated: Tue Sep 27 11:40:32 2022

Maximum Stack Usage = 1000 bytes + Unknown(Cycles, Untraceable Function Pointers)

Call chain for Maximum Stack Depth:

@@ -1363,7 +1363,7 @@ Global Symbols
[Called By] -

HAL_GPIO_EXTI_Callback (Thumb, 176 bytes, Stack size 8 bytes, lora_app.o(.text.HAL_GPIO_EXTI_Callback)) +

HAL_GPIO_EXTI_Callback (Thumb, 184 bytes, Stack size 8 bytes, lora_app.o(.text.HAL_GPIO_EXTI_Callback))

[Stack]


[Calls] -

HAL_I2C_MspInit (Thumb, 208 bytes, Stack size 96 bytes, stm32wlxx_hal_msp.o(.text.HAL_I2C_MspInit)) +

HAL_I2C_MspInit (Thumb, 204 bytes, Stack size 96 bytes, stm32wlxx_hal_msp.o(.text.HAL_I2C_MspInit))

[Stack]


[Calls]