diff --git a/Core/Inc/main.h b/Core/Inc/main.h index eae7964..554dfb9 100644 --- a/Core/Inc/main.h +++ b/Core/Inc/main.h @@ -115,9 +115,9 @@ void MX_TIM2_Init(void); #define SSD1306_I2C_HANDLE hi2c1 #define MEMS_POWER_Pin GPIO_PIN_4 #define MEMS_POWER_GPIO_Port GPIOB - +//MOVED TO PRD CONF .H //#define USE_STM32WLE5 1U -#define USE_STM32WL55 1U +//#define USE_STM32WL55 1U /* USER CODE END Private defines */ #ifdef __cplusplus diff --git a/Core/Inc/yunhorn_sts_prd_conf.h b/Core/Inc/yunhorn_sts_prd_conf.h index b2d75e5..ec9a8a1 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/Core/Src/stm32wlxx_hal_msp.c b/Core/Src/stm32wlxx_hal_msp.c index 04bd1a5..c975c99 100644 --- a/Core/Src/stm32wlxx_hal_msp.c +++ b/Core/Src/stm32wlxx_hal_msp.c @@ -115,27 +115,20 @@ void HAL_I2C_MspInit(I2C_HandleTypeDef* hi2c) /**I2C1 GPIO Configuration - PA10 ------> I2C1_SDA //STM32WLE5 - PB8 ------> I2C1_SCL + PB6 ------> I2C1_SCL //STM32WLE5 + PB7 ------> I2C1_SDA */ #ifdef USE_STM32WLE5 - __HAL_RCC_GPIOB_CLK_ENABLE(); - GPIO_InitStruct.Pin = GPIO_PIN_8; + GPIO_InitStruct.Pin = GPIO_PIN_6|GPIO_PIN_7; GPIO_InitStruct.Mode = GPIO_MODE_AF_OD; GPIO_InitStruct.Pull = GPIO_PULLUP; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; GPIO_InitStruct.Alternate = GPIO_AF4_I2C1; HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); - GPIO_InitStruct.Pin = GPIO_PIN_10; - GPIO_InitStruct.Mode = GPIO_MODE_AF_OD; - GPIO_InitStruct.Pull = GPIO_PULLUP; - GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; - GPIO_InitStruct.Alternate = GPIO_AF4_I2C1; - HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); #endif /* Peripheral clock enable */ __HAL_RCC_I2C1_CLK_ENABLE(); @@ -232,14 +225,14 @@ void HAL_I2C_MspDeInit(I2C_HandleTypeDef* hi2c) #endif /**I2C1 GPIO Configuration //STM32WLE5 - PA10 ------> I2C1_SDA - PB8 ------> I2C1_SCL + PB7 ------> I2C1_SDA + PB6 ------> I2C1_SCL */ #ifdef USE_STM32WLE5 - HAL_GPIO_DeInit(GPIOA, GPIO_PIN_10); + HAL_GPIO_DeInit(GPIOB, GPIO_PIN_6); - HAL_GPIO_DeInit(GPIOB, GPIO_PIN_8); + HAL_GPIO_DeInit(GPIOB, GPIO_PIN_7); #endif diff --git a/Core/Src/yunhorn_sts_motion_sensor.c b/Core/Src/yunhorn_sts_motion_sensor.c index ef7ecc3..afc06f8 100644 --- a/Core/Src/yunhorn_sts_motion_sensor.c +++ b/Core/Src/yunhorn_sts_motion_sensor.c @@ -344,7 +344,7 @@ void STS_MOTION_SENSOR_Function_Test_Process(void) //HAL_I2C_Init(&MOTION_SENSOR_I2C_HANDLE); if (HAL_I2C_GetState(&MOTION_SENSOR_I2C_HANDLE) != HAL_I2C_STATE_READY) { - APP_LOG(TS_ON, VLEVEL_L, "\r\n .... MOTION SENSOR I2C Not Ready .... \r\n"); + APP_LOG(TS_ON, VLEVEL_M, "\r\n .... MOTION SENSOR I2C Not Ready .... \r\n"); } 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 312ed47..232ca25 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 39c900a..5cae1fe 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 @@ -22,26 +22,26 @@ Dialog DLL: TCM.DLL V1.48.0.0

Project:

D:\ONEDRIVE\GIT\STS_IOT\STS_MM\MDK-ARM\STS_MM.uvprojx -Project File Date: 09/20/2022 +Project File Date: 09/26/2022

Output:

*** 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 dma.c... -compiling gpio.c... -compiling sys_app.c... -compiling sys_sensors.c... -compiling adc.c... -compiling stm32_lpm_if.c... -compiling subghz.c... compiling sys_debug.c... -compiling usart.c... -compiling stm32wlxx_it.c... -compiling rtc.c... -compiling usart_if.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 usart.c... +compiling subghz.c... +compiling sys_app.c... +compiling stm32wlxx_it.c... +compiling usart_if.c... compiling timer_if.c... compiling stm32wlxx_hal_msp.c... compiling ssd1306_fonts.c... @@ -49,89 +49,89 @@ compiling app_lorawan.c... compiling flash_if.c... compiling CayenneLpp.c... compiling lora_info.c... -compiling ssd1306.c... compiling radio_board_if.c... +compiling ssd1306.c... compiling ssd1306_tests.c... compiling stm32wlxx_ll_adc.c... -compiling stm32wlxx_nucleo.c... compiling stm32wlxx_nucleo_radio.c... +compiling stm32wlxx_nucleo.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_gpio.c... compiling stm32wlxx_hal_adc.c... -compiling stm32wlxx_hal_dma_ex.c... -compiling stm32wlxx_hal_rcc_ex.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_gpio.c... compiling stm32wlxx_hal_pwr.c... compiling stm32wlxx_hal_dma.c... -compiling stm32wlxx_hal_pwr_ex.c... compiling stm32wlxx_hal_cortex.c... -compiling stm32wlxx_hal.c... +compiling stm32wlxx_hal_pwr_ex.c... compiling stm32wlxx_hal_exti.c... +compiling stm32wlxx_hal.c... compiling stm32wlxx_hal_rtc.c... compiling stm32wlxx_hal_subghz.c... compiling stm32wlxx_hal_rtc_ex.c... compiling cmac.c... -compiling stm32wlxx_hal_i2c_ex.c... compiling system_stm32wlxx.c... -compiling lorawan_aes.c... compiling stm32wlxx_hal_uart_ex.c... +compiling stm32wlxx_hal_i2c_ex.c... +compiling lorawan_aes.c... compiling Region.c... -compiling soft-se.c... compiling stm32wlxx_hal_tim_ex.c... -compiling LmhpCompliance.c... +compiling soft-se.c... compiling RegionAU915.c... compiling RegionBaseUS.c... -compiling RegionAS923.c... compiling RegionCN470.c... +compiling LmhpCompliance.c... +compiling RegionAS923.c... compiling RegionCN470A20.c... compiling RegionCN470A26.c... -compiling RegionCN470B26.c... compiling RegionCN470B20.c... +compiling RegionCN470B26.c... compiling stm32wlxx_hal_uart.c... compiling RegionCN779.c... compiling RegionEU433.c... -compiling RegionEU868.c... compiling stm32wlxx_hal_tim.c... +compiling RegionEU868.c... compiling RegionIN865.c... compiling RegionKR920.c... compiling RegionCommon.c... +compiling stm32wlxx_hal_i2c.c... compiling RegionRU864.c... compiling RegionUS915.c... compiling LoRaMacAdr.c... -compiling stm32wlxx_hal_i2c.c... compiling LoRaMacClassB.c... +compiling LoRaMacConfirmQueue.c... +compiling LoRaMacCommands.c... compiling LoRaMacParser.c... compiling LoRaMacSerializer.c... -compiling LoRaMacCommands.c... -compiling LoRaMacConfirmQueue.c... -compiling NvmDataMgmt.c... compiling LoRaMacCrypto.c... +compiling NvmDataMgmt.c... compiling utilities.c... compiling stm32_mem.c... compiling stm32_systime.c... -compiling stm32_tiny_sscanf.c... compiling stm32_adv_trace.c... -compiling stm32_tiny_vsnprintf.c... -compiling radio_fw.c... compiling LmHandler.c... +compiling stm32_tiny_sscanf.c... +compiling radio_fw.c... +compiling stm32_tiny_vsnprintf.c... compiling stm32_seq.c... -compiling stm32_lpm.c... compiling stm32_timer.c... +compiling stm32_lpm.c... compiling BayesFunctions.c... compiling radio_driver.c... -compiling radio.c... compiling LoRaMac.c... +compiling radio.c... compiling ControllerFunctions.c... compiling ComplexMathFunctions.c... -compiling FastMathFunctions.c... compiling BasicMathFunctions.c... -compiling SVMFunctions.c... compiling DistanceFunctions.c... +compiling FastMathFunctions.c... +compiling SVMFunctions.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=72172 RO-data=124276 RW-data=292 ZI-data=60740 +Program Size: Code=72152 RO-data=124276 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\BasicMathFunctions\BasicMathFunctions.c - Include file: CMSIS\DSP\Include\arm_math.h - Source file: CMSIS\DSP\Source\TransformFunctions\TransformFunctions.c - Source file: CMSIS\DSP\Source\FilteringFunctions\FilteringFunctions.c Source file: CMSIS\DSP\Source\CommonTables\CommonTables.c - Source file: CMSIS\DSP\Source\SVMFunctions\SVMFunctions.c - Source file: CMSIS\DSP\Source\BayesFunctions\BayesFunctions.c - Source file: CMSIS\DSP\Source\StatisticsFunctions\StatisticsFunctions.c - Source file: CMSIS\DSP\Source\ControllerFunctions\ControllerFunctions.c + Include file: CMSIS\DSP\Include\arm_math.h Source file: CMSIS\DSP\Source\SupportFunctions\SupportFunctions.c - Source file: CMSIS\DSP\Source\DistanceFunctions\DistanceFunctions.c - Source file: CMSIS\DSP\Source\ComplexMathFunctions\ComplexMathFunctions.c - Source file: CMSIS\DSP\Source\MatrixFunctions\MatrixFunctions.c + Source file: CMSIS\DSP\Source\BasicMathFunctions\BasicMathFunctions.c Source file: CMSIS\DSP\Source\FastMathFunctions\FastMathFunctions.c -Build Time Elapsed: 00:00:06 + 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\MatrixFunctions\MatrixFunctions.c + Source file: CMSIS\DSP\Source\BayesFunctions\BayesFunctions.c +Build Time Elapsed: 00:00:07 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 a998bd5..cf34bbf 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: Fri Sep 23 16:39:42 2022 +

#<CALLGRAPH># ARM Linker, 6150002: Last Updated: Mon Sep 26 17:11:44 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, 184 bytes, Stack size 8 bytes, lora_app.o(.text.HAL_GPIO_EXTI_Callback)) +

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

[Stack]


[Calls] -

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

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

[Stack]


[Calls]