forked from Git_test/Git_TEST
Merge remote-tracking branch 'origin/BLU_LED'
# Conflicts: # 不同颜色LED/APP/Run_Led.c # 不同颜色LED/OUTPUT/STM32_Project_DEMO.axf # 不同颜色LED/OUTPUT/STM32_Project_DEMO.hex # 不同颜色LED/OUTPUT/STM32_Project_DEMO.htm # 不同颜色LED/OUTPUT/STM32_Project_DEMO_Target 1.dep # 不同颜色LED/OUTPUT/run_led.crf # 不同颜色LED/OUTPUT/run_led.o # 不同颜色LED/Project/STM32_Project_DEMO.uvguix.bd7iw
This commit is contained in:
@@ -795,7 +795,11 @@ I (..\FWLIB\inc\stm32f10x_tim.h)(0x688E6595)
|
||||
I (..\FWLIB\inc\misc.h)(0x688E6595)
|
||||
F (..\FWLIB\src\stm32f10x_tim.c)(0x688E6595)(--gnu -c --cpu Cortex-M3 -g -O1 --apcs=interwork --split_sections -I ..\CMSIS_Support -I ..\FWLIB\inc -I ..\APP -I ..\DEVICE
|
||||
|
||||
-ID:\soft\Keil_v5\Packs\Keil\STM32F1xx_DFP\2.4.1\Device\Include
|
||||
|
||||
-D__UVISION_VERSION="543" -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER
|
||||
|
||||
-o ..\output\stm32f10x_tim.o --omf_browse ..\output\stm32f10x_tim.crf --depend ..\output\stm32f10x_tim.d)
|
||||
I (..\FWLIB\inc\stm32f10x_tim.h)(0x688E6595)
|
||||
I (..\CMSIS_Support\stm32f10x.h)(0x688E6595)
|
||||
I (..\CMSIS_Support\core_cm3.h)(0x688E6595)
|
||||
|
||||
Reference in New Issue
Block a user