rocky/Git_TEST_rocky
1
0
Fork 0
forked from Git_test/Git_TEST
Code Pull Requests Activity

Merge remote-tracking branch 'origin/BLU_LED'

Browse Source 
# 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:
BD7IWD-CMP\bd7iw
2025-09-15 14:36:18 +08:00
parent 33baee5223 c9bbdb607d
commit 79a095eb5e
35 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
不同颜色LED/OUTPUT/STM32_Project_DEMO.hex
View File

@@ -55,9 +55,15 @@
:1003500000080140000C0140FEE7704770470000B4
:10036000054A002903D09169014391617047916961
:10037000814391617047000000100240FFF7CAFFFF
<<<<<<< HEAD
:10038000084D40F6C41401212846FFF7BFFF204660
:10039000FFF74BFF01212846FFF7B6FF2046FFF786
:1003A00044FFF0E7000C0140704700F001B8000086
=======
:10038000084D4FF47A7440212846FFF7BFFF2046FE
:10039000FFF74BFF40212846FFF7B6FF2046FFF747
:1003A00044FFF0E700080140704700F001B800008A
>>>>>>> origin/BLU_LED
:1003B0000CB50022019200922748016841F4803177
:1003C00001604FF4A063016801F4003100910199CC
:1003D000491C0191009911B901999942F3D1016821