From 5183c5c15db6b8239d9cc7f5c4cd7b8854cb5591 Mon Sep 17 00:00:00 2001 From: supowang Date: Wed, 20 Sep 2023 15:25:54 +0800 Subject: [PATCH] fix compile error --- .../BSP/Src/mcu_init.c | 2 +- .../TencentOS_tiny_STM32H750/BSP/Src/usart.c | 18 +++++++++++++----- .../TencentOS_tiny_STM32H750.uvoptx | 12 ++++++------ .../TencentOS_tiny_STM32H750.uvprojx | 2 +- .../TencentOS_tiny_STM32H750.sct | 19 +++++++++++++++++++ .../demo/mqttclient_iot_explorer.c | 6 +++--- .../TOS_CONFIG/tos_config.h | 4 ++++ 7 files changed, 47 insertions(+), 16 deletions(-) create mode 100644 board/TencentOS_tiny_STM32H750/KEIL/mqtt_client_iot_exporer/TencentOS_tiny_STM32H750/TencentOS_tiny_STM32H750.sct diff --git a/board/TencentOS_tiny_STM32H750/BSP/Src/mcu_init.c b/board/TencentOS_tiny_STM32H750/BSP/Src/mcu_init.c index f298d7362..e32797a93 100644 --- a/board/TencentOS_tiny_STM32H750/BSP/Src/mcu_init.c +++ b/board/TencentOS_tiny_STM32H750/BSP/Src/mcu_init.c @@ -51,7 +51,7 @@ void board_init(void) MX_SPI5_Init(); //MX_UART4_Init(); MX_UART5_Init(); - MX_USART2_UART_Init(); + MX_USART6_UART_Init(); MX_I2S2_Init(); MX_HDMI_CEC_Init(); //MX_USART6_UART_Init(); diff --git a/board/TencentOS_tiny_STM32H750/BSP/Src/usart.c b/board/TencentOS_tiny_STM32H750/BSP/Src/usart.c index cc24d4216..bdb5dd0b0 100644 --- a/board/TencentOS_tiny_STM32H750/BSP/Src/usart.c +++ b/board/TencentOS_tiny_STM32H750/BSP/Src/usart.c @@ -346,18 +346,26 @@ void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle) /* USART6 clock enable */ __HAL_RCC_USART6_CLK_ENABLE(); + __HAL_RCC_GPIOC_CLK_ENABLE(); __HAL_RCC_GPIOG_CLK_ENABLE(); /**USART6 GPIO Configuration PG9 ------> USART6_RX - PG14 ------> USART6_TX + PC6 ------> USART6_TX */ - GPIO_InitStruct.Pin = GPIO_PIN_9|GPIO_PIN_14; + GPIO_InitStruct.Pin = GPIO_PIN_9; GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; GPIO_InitStruct.Alternate = GPIO_AF7_USART6; HAL_GPIO_Init(GPIOG, &GPIO_InitStruct); + GPIO_InitStruct.Pin = GPIO_PIN_6; + GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; + GPIO_InitStruct.Pull = GPIO_NOPULL; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + GPIO_InitStruct.Alternate = GPIO_AF7_USART6; + HAL_GPIO_Init(GPIOC, &GPIO_InitStruct); + /* USART6 interrupt Init */ HAL_NVIC_SetPriority(USART6_IRQn, 0, 0); HAL_NVIC_EnableIRQ(USART6_IRQn); @@ -442,10 +450,10 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* uartHandle) /**USART6 GPIO Configuration PG9 ------> USART6_RX - PG14 ------> USART6_TX + PC6 ------> USART6_TX */ - HAL_GPIO_DeInit(GPIOG, GPIO_PIN_9|GPIO_PIN_14); - + HAL_GPIO_DeInit(GPIOG, GPIO_PIN_9); + HAL_GPIO_DeInit(GPIOC, GPIO_PIN_6); /* USART6 interrupt Deinit */ HAL_NVIC_DisableIRQ(USART6_IRQn); /* USER CODE BEGIN USART6_MspDeInit 1 */ diff --git a/board/TencentOS_tiny_STM32H750/KEIL/mqtt_client_iot_exporer/TencentOS_tiny_STM32H750.uvoptx b/board/TencentOS_tiny_STM32H750/KEIL/mqtt_client_iot_exporer/TencentOS_tiny_STM32H750.uvoptx index f5b25841d..a6dc88d1f 100644 --- a/board/TencentOS_tiny_STM32H750/KEIL/mqtt_client_iot_exporer/TencentOS_tiny_STM32H750.uvoptx +++ b/board/TencentOS_tiny_STM32H750/KEIL/mqtt_client_iot_exporer/TencentOS_tiny_STM32H750.uvoptx @@ -223,7 +223,7 @@ Application/User/Core - 0 + 1 0 0 0 @@ -1431,7 +1431,7 @@ example - 0 + 1 0 0 0 @@ -1451,7 +1451,7 @@ at_framwork - 0 + 1 0 0 0 @@ -1483,7 +1483,7 @@ devices - 0 + 1 0 0 0 @@ -1515,7 +1515,7 @@ hal - 0 + 1 0 0 0 @@ -1939,7 +1939,7 @@ cjson - 0 + 1 0 0 0 diff --git a/board/TencentOS_tiny_STM32H750/KEIL/mqtt_client_iot_exporer/TencentOS_tiny_STM32H750.uvprojx b/board/TencentOS_tiny_STM32H750/KEIL/mqtt_client_iot_exporer/TencentOS_tiny_STM32H750.uvprojx index df9c97ee6..ad7bddbdb 100644 --- a/board/TencentOS_tiny_STM32H750/KEIL/mqtt_client_iot_exporer/TencentOS_tiny_STM32H750.uvprojx +++ b/board/TencentOS_tiny_STM32H750/KEIL/mqtt_client_iot_exporer/TencentOS_tiny_STM32H750.uvprojx @@ -16,7 +16,7 @@ STM32H750XBHx STMicroelectronics - Keil.STM32H7xx_DFP.3.0.0 + Keil.STM32H7xx_DFP.2.8.0 http://www.keil.com/pack/ IRAM(0x20000000-0x2001FFFF) IRAM2(0x24000000-0x2407FFFF) IROM(0x8000000-0x801FFFF) CLOCK(12000000) FPU3(DFPU) CPUTYPE("Cortex-M7") ELITTLE TZ diff --git a/board/TencentOS_tiny_STM32H750/KEIL/mqtt_client_iot_exporer/TencentOS_tiny_STM32H750/TencentOS_tiny_STM32H750.sct b/board/TencentOS_tiny_STM32H750/KEIL/mqtt_client_iot_exporer/TencentOS_tiny_STM32H750/TencentOS_tiny_STM32H750.sct new file mode 100644 index 000000000..322106dea --- /dev/null +++ b/board/TencentOS_tiny_STM32H750/KEIL/mqtt_client_iot_exporer/TencentOS_tiny_STM32H750/TencentOS_tiny_STM32H750.sct @@ -0,0 +1,19 @@ +; ************************************************************* +; *** Scatter-Loading Description File generated by uVision *** +; ************************************************************* + +LR_IROM1 0x08000000 0x00020000 { ; load region size_region + ER_IROM1 0x08000000 0x00020000 { ; load address = execution address + *.o (RESET, +First) + *(InRoot$$Sections) + .ANY (+RO) + .ANY (+XO) + } + RW_IRAM1 0x20000000 0x00020000 { ; RW data + .ANY (+RW +ZI) + } + RW_IRAM2 0x24000000 0x00080000 { + .ANY (+RW +ZI) + } +} + diff --git a/board/TencentOS_tiny_STM32H750/KEIL/mqtt_client_iot_exporer/demo/mqttclient_iot_explorer.c b/board/TencentOS_tiny_STM32H750/KEIL/mqtt_client_iot_exporer/demo/mqttclient_iot_explorer.c index cefef08a2..062496e95 100644 --- a/board/TencentOS_tiny_STM32H750/KEIL/mqtt_client_iot_exporer/demo/mqttclient_iot_explorer.c +++ b/board/TencentOS_tiny_STM32H750/KEIL/mqtt_client_iot_exporer/demo/mqttclient_iot_explorer.c @@ -5,13 +5,13 @@ #include "cJSON.h" #include "sal_module_wrapper.h" -#define USE_ESP8266 +#define USE_EC600S #if defined(USE_ESP8266) #include "esp8266.h" #elif defined(USE_EC600S) -#include "ec600.h" +#include "ec600s.h" #endif #ifdef USE_ESP8266 @@ -101,7 +101,7 @@ void mqttclient_task(void) #ifdef USE_EC600S - ec600s_sal_init(HAL_UART_PORT_0); + ec600s_sal_init(HAL_UART_PORT_6); #endif mqtt_log_init(); diff --git a/board/TencentOS_tiny_STM32H750/TOS_CONFIG/tos_config.h b/board/TencentOS_tiny_STM32H750/TOS_CONFIG/tos_config.h index 0ef315ae6..c3bd503ea 100644 --- a/board/TencentOS_tiny_STM32H750/TOS_CONFIG/tos_config.h +++ b/board/TencentOS_tiny_STM32H750/TOS_CONFIG/tos_config.h @@ -9,6 +9,10 @@ #define TOS_CFG_OBJECT_VERIFY_EN 1u + +#define TOS_CFG_OBJ_DYNAMIC_CREATE_EN 1u + + #define TOS_CFG_TASK_DYNAMIC_CREATE_EN 1u #define TOS_CFG_EVENT_EN 1u