Skip to content

Support OpenCR Windows upload with cygwin and arduino zero board upload #660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Arduino.mk
Original file line number Diff line number Diff line change
Expand Up @@ -1733,7 +1733,7 @@ do_upload:

do_sam_upload: $(TARGET_BIN) verify_size
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)
$(BOSSA) $(BOSSA_OPTS) $(TARGET_BIN)
else ifeq ($(findstring gdb, $(strip $(UPLOAD_TOOL))), gdb)
Expand Down
3 changes: 2 additions & 1 deletion OpenCR.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# Support for Robotis OpenCR boards
#
# Written by Dowhan Jeong, EunJin Jeong
# Changed by Woosuk Kang
#
# Based on work that is copyright Jeremy Shaw, Sudar, Nicholas Zambetti,
# David A. Mellis & Hernando Barragan.
Expand Down Expand Up @@ -205,7 +206,7 @@ ifeq ($(CURRENT_OS), WINDOWS)
else
override AVRDUDE = $(ARDUINO_PACKAGE_DIR)/OpenCR/tools/opencr_tools/1.0.0/linux/opencr_ld
endif
override AVRDUDE_COM_OPTS = $(DEVICE_PATH)
override AVRDUDE_COM_OPTS = $(MONITOR_PORT)
override AVRDUDE_ISP_OPTS = 115200 $(TARGET_HEX) 1
override AVRDUDE_ISPLOAD_OPTS =

Expand Down