From 7bb270129e837d1349a103c5ad1da1472625048c Mon Sep 17 00:00:00 2001
From: ws <wecracy@iris.snu.ac.kr>
Date: Tue, 27 Apr 2021 17:01:48 +0900
Subject: [PATCH 1/2] MONITOR_PORT is used instead to upload binary on the
OpenCR board.
- For using Arduino makefile with cygwin environmnet, OpenCR uses its own Windows binary to upload an image to the board. For this reason, Windows COM port is needed as an argument instead of using converted device path.
Signed-off-by: wecracy <wecracy@snu.ac.kr>
---
OpenCR.mk | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/OpenCR.mk b/OpenCR.mk
index da97dc8..37833d3 100644
--- a/OpenCR.mk
+++ b/OpenCR.mk
@@ -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.
@@ -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 =
From 15668eb97a7f3fe14cb3e9cef24e4fea7b7003c4 Mon Sep 17 00:00:00 2001
From: wecracy <wecracy@gmail.com>
Date: Wed, 22 Dec 2021 14:11:08 +0900
Subject: [PATCH 2/2] Arduino Zero Board Upload (Error Fix) using the
programming port for arduino zero board, file open fails when arduino.mk call
the openocd. this is due to double braces of the file path. we remove the
double braces whole though a single brace also works well.
---
Arduino.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Arduino.mk b/Arduino.mk
index 5a04506..fcafe46 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -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)