Sfoglia il codice sorgente

Merge branch 'master' into alisitsyn-esp-based_on_334e95f

hathach 4 anni fa
parent
commit
38cc459c93

+ 1 - 0
.gitignore

@@ -13,6 +13,7 @@ latex
 .env
 .settings/
 .idea/
+.gdb_history
 /examples/*/*/build*
 test_old/
 tests_obsolete/

+ 1 - 0
examples/make.mk

@@ -60,6 +60,7 @@ CROSS_COMPILE ?= arm-none-eabi-
 
 CC = $(CROSS_COMPILE)gcc
 CXX = $(CROSS_COMPILE)g++
+GDB = $(CROSS_COMPILE)gdb
 OBJCOPY = $(CROSS_COMPILE)objcopy
 SIZE = $(CROSS_COMPILE)size
 MKDIR = mkdir

+ 10 - 0
examples/rules.mk

@@ -172,6 +172,16 @@ flash-pyocd: $(BUILD)/$(PROJECT).hex
 	pyocd flash -t $(PYOCD_TARGET) $<
 	pyocd reset -t $(PYOCD_TARGET)
 
+# flash with Black Magic Probe
+
+# This symlink is created by https://github.com/blacksphere/blackmagic/blob/master/driver/99-blackmagic.rules
+BMP ?= /dev/ttyBmpGdb
+
+flash-bmp: $(BUILD)/$(PROJECT).elf
+	$(GDB) --batch -ex 'target extended-remote $(BMP)' -ex 'monitor swdp_scan' -ex 'attach 1' -ex load  $<
+
+debug-bmp: $(BUILD)/$(PROJECT).elf
+	$(GDB) -ex 'target extended-remote $(BMP)' -ex 'monitor swdp_scan' -ex 'attach 1' $<
 
 #-------------- Artifacts --------------
 

+ 1 - 1
hw/bsp/stm32f4/boards/stm32f401blackpill/board.h

@@ -34,7 +34,7 @@
 // LED
 #define LED_PORT              GPIOC
 #define LED_PIN               GPIO_PIN_13
-#define LED_STATE_ON          1
+#define LED_STATE_ON          0
 
 // Button
 #define BUTTON_PORT           GPIOA

+ 1 - 1
hw/bsp/stm32f4/boards/stm32f411blackpill/board.h

@@ -34,7 +34,7 @@
 // LED
 #define LED_PORT              GPIOC
 #define LED_PIN               GPIO_PIN_13
-#define LED_STATE_ON          1
+#define LED_STATE_ON          0
 
 // Button
 #define BUTTON_PORT           GPIOA