From dea65a2d664ab303a071b92e90959ac4b63c414c Mon Sep 17 00:00:00 2001 From: supowang Date: Mon, 6 Jan 2020 11:40:56 +0800 Subject: [PATCH] fix Nucleo L073 project fix Nucleo L073 project --- .../GCC/hello_world/Makefile | 1 + .../IAR/hello_world/TencentOS_tiny.ewp | 3 + .../TencentOS_tiny_STM32L073RZTx.dbgconf | 43 ------- .../RTE/_TencentOS_tiny/RTE_Components.h | 20 ---- .../KEIL/hello_world/TencentOS_tiny.uvoptx | 106 ++++++++++-------- .../KEIL/hello_world/TencentOS_tiny.uvprojx | 9 +- .../TencentOS_tiny/TencentOS_tiny.sct | 16 --- .../KEIL/lorawan/TencentOS_tiny.uvoptx | 2 +- .../KEIL/lorawan/TencentOS_tiny.uvprojx | 4 +- 9 files changed, 73 insertions(+), 131 deletions(-) delete mode 100644 board/NUCLEO_STM32L073RZ/KEIL/hello_world/DebugConfig/TencentOS_tiny_STM32L073RZTx.dbgconf delete mode 100644 board/NUCLEO_STM32L073RZ/KEIL/hello_world/RTE/_TencentOS_tiny/RTE_Components.h delete mode 100644 board/NUCLEO_STM32L073RZ/KEIL/hello_world/TencentOS_tiny/TencentOS_tiny.sct diff --git a/board/NUCLEO_STM32L073RZ/GCC/hello_world/Makefile b/board/NUCLEO_STM32L073RZ/GCC/hello_world/Makefile index ad04e592..c2d1b32f 100644 --- a/board/NUCLEO_STM32L073RZ/GCC/hello_world/Makefile +++ b/board/NUCLEO_STM32L073RZ/GCC/hello_world/Makefile @@ -54,6 +54,7 @@ HAL_DRIVER_SRC = \ $(TOP_DIR)/examples/hello_world/hello_world.c \ $(TOP_DIR)/board/NUCLEO_STM32L073RZ/BSP/gpio.c \ $(TOP_DIR)/board/NUCLEO_STM32L073RZ/BSP/usart.c \ + $(TOP_DIR)/board/NUCLEO_STM32L073RZ/BSP/i2c.c \ $(TOP_DIR)/board/NUCLEO_STM32L073RZ/BSP/stm32l0xx_it.c \ $(TOP_DIR)/board/NUCLEO_STM32L073RZ/BSP/stm32l0xx_hal_msp.c \ $(TOP_DIR)/board/NUCLEO_STM32L073RZ/BSP/mcu_init.c \ diff --git a/board/NUCLEO_STM32L073RZ/IAR/hello_world/TencentOS_tiny.ewp b/board/NUCLEO_STM32L073RZ/IAR/hello_world/TencentOS_tiny.ewp index bf1b0e59..b793626e 100644 --- a/board/NUCLEO_STM32L073RZ/IAR/hello_world/TencentOS_tiny.ewp +++ b/board/NUCLEO_STM32L073RZ/IAR/hello_world/TencentOS_tiny.ewp @@ -1067,6 +1067,9 @@ $PROJ_DIR$\..\..\BSP\Src\gpio.c + + $PROJ_DIR$\..\..\BSP\Src\i2c.c + $PROJ_DIR$\..\..\BSP\Src\main.c diff --git a/board/NUCLEO_STM32L073RZ/KEIL/hello_world/DebugConfig/TencentOS_tiny_STM32L073RZTx.dbgconf b/board/NUCLEO_STM32L073RZ/KEIL/hello_world/DebugConfig/TencentOS_tiny_STM32L073RZTx.dbgconf deleted file mode 100644 index 5b27c4a9..00000000 --- a/board/NUCLEO_STM32L073RZ/KEIL/hello_world/DebugConfig/TencentOS_tiny_STM32L073RZTx.dbgconf +++ /dev/null @@ -1,43 +0,0 @@ -// File: STM32L0x1_0x2_0x3_DBGMCU.ini -// Version: 1.0.0 -// Note: refer to STM32L0x1 reference manual (RM0377) -// refer to STM32L0x1 datasheet -// refer to STM32L0x2 reference manual (RM0376) -// refer to STM32L0x2 datasheet -// refer to STM32L0x3 reference manual (RM0367) -// refer to STM32L0x3 datasheet - -// <<< Use Configuration Wizard in Context Menu >>> - -// Debug MCU configuration register (DBGMCU_CR) -// Reserved bits must be kept at reset value -// DBG_STANDBY Debug Standby Mode -// DBG_STOP Debug Stop Mode -// DBG_SLEEP Debug Sleep Mode -// -DbgMCU_CR = 0x00000007; - -// Debug MCU APB1 freeze register (DBGMCU_APB1_FZ) -// Reserved bits must be kept at reset value -// DBG_LPTIMER_STOP LPTIM1 counter stopped when core is halted -// DBG_I2C3_STOP I2C3 SMBUS timeout mode stopped when core is halted -// DBG_I2C2_STOP I2C2 SMBUS timeout mode stopped when core is halted -// DBG_I2C1_STOP I2C1 SMBUS timeout mode stopped when core is halted -// DBG_IWDG_STOP Debug independent watchdog stopped when core is halted -// DBG_WWDG_STOP Debug window watchdog stopped when core is halted -// DBG_RTC_STOP Debug RTC stopped when core is halted -// DBG_TIM7_STOP TIM7 counter stopped when core is halted -// DBG_TIM6_STOP TIM6 counter stopped when core is halted -// DBG_TIM3_STOP TIM3 counter stopped when core is halted -// DBG_TIM2_STOP TIM2 counter stopped when core is halted -// -DbgMCU_APB1_Fz = 0x00000000; - -// Debug MCU APB2 freeze register (DBGMCU_APB2_FZ) -// Reserved bits must be kept at reset value -// DBG_TIM22_STOP TIM22 counter stopped when core is halted -// DBG_TIM21_STOP TIM21 counter stopped when core is halted -// -DbgMCU_APB2_Fz = 0x00000000; - -// <<< end of configuration section >>> diff --git a/board/NUCLEO_STM32L073RZ/KEIL/hello_world/RTE/_TencentOS_tiny/RTE_Components.h b/board/NUCLEO_STM32L073RZ/KEIL/hello_world/RTE/_TencentOS_tiny/RTE_Components.h deleted file mode 100644 index 4b2a0396..00000000 --- a/board/NUCLEO_STM32L073RZ/KEIL/hello_world/RTE/_TencentOS_tiny/RTE_Components.h +++ /dev/null @@ -1,20 +0,0 @@ - -/* - * Auto generated Run-Time-Environment Component Configuration File - * *** Do not modify ! *** - * - * Project: 'TencentOS_tiny' - * Target: 'TencentOS_tiny' - */ - -#ifndef RTE_COMPONENTS_H -#define RTE_COMPONENTS_H - - -/* - * Define the Device Header File: - */ -#define CMSIS_device_header "stm32l0xx.h" - - -#endif /* RTE_COMPONENTS_H */ diff --git a/board/NUCLEO_STM32L073RZ/KEIL/hello_world/TencentOS_tiny.uvoptx b/board/NUCLEO_STM32L073RZ/KEIL/hello_world/TencentOS_tiny.uvoptx index 3c0932c9..bbd0b98e 100644 --- a/board/NUCLEO_STM32L073RZ/KEIL/hello_world/TencentOS_tiny.uvoptx +++ b/board/NUCLEO_STM32L073RZ/KEIL/hello_world/TencentOS_tiny.uvoptx @@ -279,6 +279,18 @@ 0 0 + + 2 + 8 + 1 + 0 + 0 + 0 + ..\..\BSP\Src\i2c.c + i2c.c + 0 + 0 + @@ -289,7 +301,7 @@ 0 3 - 8 + 9 1 0 0 @@ -301,7 +313,7 @@ 3 - 9 + 10 1 0 0 @@ -313,7 +325,7 @@ 3 - 10 + 11 1 0 0 @@ -325,7 +337,7 @@ 3 - 11 + 12 1 0 0 @@ -337,7 +349,7 @@ 3 - 12 + 13 1 0 0 @@ -349,7 +361,7 @@ 3 - 13 + 14 1 0 0 @@ -361,7 +373,7 @@ 3 - 14 + 15 1 0 0 @@ -373,7 +385,7 @@ 3 - 15 + 16 1 0 0 @@ -385,7 +397,7 @@ 3 - 16 + 17 1 0 0 @@ -397,7 +409,7 @@ 3 - 17 + 18 1 0 0 @@ -409,7 +421,7 @@ 3 - 18 + 19 1 0 0 @@ -421,7 +433,7 @@ 3 - 19 + 20 1 0 0 @@ -433,7 +445,7 @@ 3 - 20 + 21 1 0 0 @@ -445,7 +457,7 @@ 3 - 21 + 22 1 0 0 @@ -457,7 +469,7 @@ 3 - 22 + 23 1 0 0 @@ -469,7 +481,7 @@ 3 - 23 + 24 1 0 0 @@ -481,7 +493,7 @@ 3 - 24 + 25 1 0 0 @@ -501,7 +513,7 @@ 0 4 - 25 + 26 1 0 0 @@ -521,7 +533,7 @@ 0 5 - 26 + 27 1 0 0 @@ -533,7 +545,7 @@ 5 - 27 + 28 1 0 0 @@ -545,7 +557,7 @@ 5 - 28 + 29 2 0 0 @@ -565,7 +577,7 @@ 0 6 - 29 + 30 1 0 0 @@ -577,7 +589,7 @@ 6 - 30 + 31 1 0 0 @@ -589,7 +601,7 @@ 6 - 31 + 32 1 0 0 @@ -601,7 +613,7 @@ 6 - 32 + 33 1 0 0 @@ -613,7 +625,7 @@ 6 - 33 + 34 1 0 0 @@ -625,7 +637,7 @@ 6 - 34 + 35 1 0 0 @@ -637,7 +649,7 @@ 6 - 35 + 36 1 0 0 @@ -649,7 +661,7 @@ 6 - 36 + 37 1 0 0 @@ -661,7 +673,7 @@ 6 - 37 + 38 1 0 0 @@ -673,7 +685,7 @@ 6 - 38 + 39 1 0 0 @@ -685,7 +697,7 @@ 6 - 39 + 40 1 0 0 @@ -697,7 +709,7 @@ 6 - 40 + 41 1 0 0 @@ -709,7 +721,7 @@ 6 - 41 + 42 1 0 0 @@ -721,7 +733,7 @@ 6 - 42 + 43 1 0 0 @@ -733,7 +745,7 @@ 6 - 43 + 44 1 0 0 @@ -745,7 +757,7 @@ 6 - 44 + 45 1 0 0 @@ -757,7 +769,7 @@ 6 - 45 + 46 1 0 0 @@ -769,7 +781,7 @@ 6 - 46 + 47 1 0 0 @@ -781,7 +793,7 @@ 6 - 47 + 48 1 0 0 @@ -793,7 +805,7 @@ 6 - 48 + 49 1 0 0 @@ -805,7 +817,7 @@ 6 - 49 + 50 1 0 0 @@ -817,7 +829,7 @@ 6 - 50 + 51 1 0 0 @@ -829,7 +841,7 @@ 6 - 51 + 52 1 0 0 @@ -841,7 +853,7 @@ 6 - 52 + 53 1 0 0 @@ -861,7 +873,7 @@ 0 7 - 53 + 54 1 0 0 @@ -881,7 +893,7 @@ 0 8 - 54 + 55 1 0 0 diff --git a/board/NUCLEO_STM32L073RZ/KEIL/hello_world/TencentOS_tiny.uvprojx b/board/NUCLEO_STM32L073RZ/KEIL/hello_world/TencentOS_tiny.uvprojx index be6839c5..82d8fbf7 100644 --- a/board/NUCLEO_STM32L073RZ/KEIL/hello_world/TencentOS_tiny.uvprojx +++ b/board/NUCLEO_STM32L073RZ/KEIL/hello_world/TencentOS_tiny.uvprojx @@ -16,7 +16,7 @@ STM32L073RZTx STMicroelectronics - Keil.STM32L0xx_DFP.2.0.1 + Keil.STM32L0xx_DFP.2.0.0 http://www.keil.com/pack/ IRAM(0x20000000-0x20004FFF) IROM(0x8000000-0x802FFFF) CLOCK(8000000) CPUTYPE("Cortex-M0+") @@ -54,7 +54,7 @@ 0 1 1 - 1 + 0 1 0 @@ -422,6 +422,11 @@ 1 ..\..\BSP\Src\stm32l0xx_it.c + + i2c.c + 1 + ..\..\BSP\Src\i2c.c + diff --git a/board/NUCLEO_STM32L073RZ/KEIL/hello_world/TencentOS_tiny/TencentOS_tiny.sct b/board/NUCLEO_STM32L073RZ/KEIL/hello_world/TencentOS_tiny/TencentOS_tiny.sct deleted file mode 100644 index 2d15c6b4..00000000 --- a/board/NUCLEO_STM32L073RZ/KEIL/hello_world/TencentOS_tiny/TencentOS_tiny.sct +++ /dev/null @@ -1,16 +0,0 @@ -; ************************************************************* -; *** Scatter-Loading Description File generated by uVision *** -; ************************************************************* - -LR_IROM1 0x08000000 0x00030000 { ; load region size_region - ER_IROM1 0x08000000 0x00030000 { ; load address = execution address - *.o (RESET, +First) - *(InRoot$$Sections) - .ANY (+RO) - .ANY (+XO) - } - RW_IRAM1 0x20000000 0x00005000 { ; RW data - .ANY (+RW +ZI) - } -} - diff --git a/board/NUCLEO_STM32L073RZ/KEIL/lorawan/TencentOS_tiny.uvoptx b/board/NUCLEO_STM32L073RZ/KEIL/lorawan/TencentOS_tiny.uvoptx index 3184fdeb..d20f7ce7 100644 --- a/board/NUCLEO_STM32L073RZ/KEIL/lorawan/TencentOS_tiny.uvoptx +++ b/board/NUCLEO_STM32L073RZ/KEIL/lorawan/TencentOS_tiny.uvoptx @@ -203,7 +203,7 @@ Application/User - 1 + 0 0 0 0 diff --git a/board/NUCLEO_STM32L073RZ/KEIL/lorawan/TencentOS_tiny.uvprojx b/board/NUCLEO_STM32L073RZ/KEIL/lorawan/TencentOS_tiny.uvprojx index f5509016..548e9d16 100644 --- a/board/NUCLEO_STM32L073RZ/KEIL/lorawan/TencentOS_tiny.uvprojx +++ b/board/NUCLEO_STM32L073RZ/KEIL/lorawan/TencentOS_tiny.uvprojx @@ -16,7 +16,7 @@ STM32L073RZTx STMicroelectronics - Keil.STM32L0xx_DFP.2.0.1 + Keil.STM32L0xx_DFP.2.0.0 http://www.keil.com/pack/ IRAM(0x20000000-0x20004FFF) IROM(0x8000000-0x802FFFF) CLOCK(8000000) CPUTYPE("Cortex-M0+") @@ -54,7 +54,7 @@ 0 1 1 - 1 + 0 1 0