Merge branch 'master' into alisitsyn-esp-based_on_334e95f

This commit is contained in:
hathach 2021-04-18 01:30:19 +07:00
commit 38cc459c93
5 changed files with 14 additions and 2 deletions

1
.gitignore vendored
View File

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

View File

@ -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

View File

@ -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 --------------

View File

@ -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

View File

@ -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