dominic/Arduino-Makefile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge 15668eb97a into a1fbda0c53

Browse source
This commit is contained in:
wecracy 2021-12-22 14:15:28 +09:00 • committed by GitHub
commit 5a99f5ede0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

2
Arduino.mk
View file

@ -1733,7 +1733,7 @@ do_upload:
do_sam_upload: $(TARGET_BIN) verify_size do_sam_upload: $(TARGET_BIN) verify_size
ifeq ($(findstring openocd, $(strip $(UPLOAD_TOOL))), openocd) ifeq ($(findstring openocd, $(strip $(UPLOAD_TOOL))), openocd)
$(OPENOCD) $(OPENOCD_OPTS) -c "telnet_port disabled; program {{$(TARGET_BIN)}} verify reset $(BOOTLOADER_SIZE); shutdown" $(OPENOCD) $(OPENOCD_OPTS) -c "telnet_port disabled; program $(TARGET_BIN) verify reset $(BOOTLOADER_SIZE); shutdown"
else ifeq ($(findstring bossac, $(strip $(UPLOAD_TOOL))), bossac) else ifeq ($(findstring bossac, $(strip $(UPLOAD_TOOL))), bossac)
$(BOSSA) $(BOSSA_OPTS) $(TARGET_BIN) $(BOSSA) $(BOSSA_OPTS) $(TARGET_BIN)
else ifeq ($(findstring gdb, $(strip $(UPLOAD_TOOL))), gdb) else ifeq ($(findstring gdb, $(strip $(UPLOAD_TOOL))), gdb)

3
OpenCR.mk
View file

@ -3,6 +3,7 @@
# Support for Robotis OpenCR boards # Support for Robotis OpenCR boards
# #
# Written by Dowhan Jeong, EunJin Jeong # Written by Dowhan Jeong, EunJin Jeong
# Changed by Woosuk Kang
# #
# Based on work that is copyright Jeremy Shaw, Sudar, Nicholas Zambetti, # Based on work that is copyright Jeremy Shaw, Sudar, Nicholas Zambetti,
# David A. Mellis & Hernando Barragan. # David A. Mellis & Hernando Barragan.
@ -205,7 +206,7 @@ ifeq ($(CURRENT_OS), WINDOWS)
else else
override AVRDUDE = $(ARDUINO_PACKAGE_DIR)/OpenCR/tools/opencr_tools/1.0.0/linux/opencr_ld override AVRDUDE = $(ARDUINO_PACKAGE_DIR)/OpenCR/tools/opencr_tools/1.0.0/linux/opencr_ld
endif endif
override AVRDUDE_COM_OPTS = $(DEVICE_PATH) override AVRDUDE_COM_OPTS = $(MONITOR_PORT)
override AVRDUDE_ISP_OPTS = 115200 $(TARGET_HEX) 1 override AVRDUDE_ISP_OPTS = 115200 $(TARGET_HEX) 1
override AVRDUDE_ISPLOAD_OPTS = override AVRDUDE_ISPLOAD_OPTS =