From 807dfe6a8d73d8473d215b680c9598805fbca2dc Mon Sep 17 00:00:00 2001 From: kb1sph Date: Tue, 29 Oct 2024 10:37:38 -0400 Subject: [PATCH 1/4] Update WorkAround.java Fixed missing quotes for ARDUINO_HOST_OS, ARDUINO_FQBN and ARDIONO_VARIANT that prevent compiling. --- io.sloeber.core/src/io/sloeber/core/txt/WorkAround.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/io.sloeber.core/src/io/sloeber/core/txt/WorkAround.java b/io.sloeber.core/src/io/sloeber/core/txt/WorkAround.java index cbf01656..2ec60773 100644 --- a/io.sloeber.core/src/io/sloeber/core/txt/WorkAround.java +++ b/io.sloeber.core/src/io/sloeber/core/txt/WorkAround.java @@ -64,6 +64,12 @@ public class WorkAround { USB_replacers.put(" '-DARDUINO_BOARD=\"{build.board}\"' ", " \"-DARDUINO_BOARD=\\\"{build.board}\\\"\" "); USB_replacers.put(" -DARDUINO_BOARD=\"{build.board}\" ", " -DARDUINO_BOARD=\\\"{build.board}\\\" "); + USB_replacers.put(" -DARDUINO_VARIANT=\"{build.variant}\" ", " -DARDUINO_VARIANT=\\\"{build.variant}\\\" "); + + USB.replacers.put("-DARDUINO_HOST_OS="{runtime.os}"", "-DARDUINO_HOST_OS=\\\"{runtime.os}\\\""); + + USB.replacers.put(" -DARDUINO_FQBN="{build.fqbn}" ", " -DARDUINO_FQBN=\\\"{build.fqbn}\\\" "); + USB_replacers.put(" '-DUSB_SERIAL=\"{build.usb_serial}\"' ", " \"-DUSB_SERIAL=\\\"{build.usb_serial}\\\"\" "); USB_replacers.put(" '-DUSB_SERIAL={build.usb_serial}' ", " \"-DUSB_SERIAL={build.usb_serial}\" "); From 186767390dbb59426a7c6bf6549c5e52e679c979 Mon Sep 17 00:00:00 2001 From: kb1sph Date: Tue, 29 Oct 2024 10:49:42 -0400 Subject: [PATCH 2/4] Update WorkAround.java Added backslashes I missed on the previous fix. --- io.sloeber.core/src/io/sloeber/core/txt/WorkAround.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/io.sloeber.core/src/io/sloeber/core/txt/WorkAround.java b/io.sloeber.core/src/io/sloeber/core/txt/WorkAround.java index 2ec60773..7e880ccc 100644 --- a/io.sloeber.core/src/io/sloeber/core/txt/WorkAround.java +++ b/io.sloeber.core/src/io/sloeber/core/txt/WorkAround.java @@ -66,9 +66,9 @@ public class WorkAround { USB_replacers.put(" -DARDUINO_VARIANT=\"{build.variant}\" ", " -DARDUINO_VARIANT=\\\"{build.variant}\\\" "); - USB.replacers.put("-DARDUINO_HOST_OS="{runtime.os}"", "-DARDUINO_HOST_OS=\\\"{runtime.os}\\\""); + USB.replacers.put("-DARDUINO_HOST_OS=\"{runtime.os}\"", "-DARDUINO_HOST_OS=\\\"{runtime.os}\\\""); - USB.replacers.put(" -DARDUINO_FQBN="{build.fqbn}" ", " -DARDUINO_FQBN=\\\"{build.fqbn}\\\" "); + USB.replacers.put(" -DARDUINO_FQBN=\"{build.fqbn}\" ", " -DARDUINO_FQBN=\\\"{build.fqbn}\\\" "); USB_replacers.put(" '-DUSB_SERIAL=\"{build.usb_serial}\"' ", " \"-DUSB_SERIAL=\\\"{build.usb_serial}\\\"\" "); USB_replacers.put(" '-DUSB_SERIAL={build.usb_serial}' ", " \"-DUSB_SERIAL={build.usb_serial}\" "); From a55fb6353fb03e679e576bc0e1ecfcff7b991d90 Mon Sep 17 00:00:00 2001 From: kb1sph Date: Sat, 2 Nov 2024 11:23:50 -0400 Subject: [PATCH 3/4] Update WorkAround.java Fixed typo, changed . to _ --- io.sloeber.core/src/io/sloeber/core/txt/WorkAround.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/io.sloeber.core/src/io/sloeber/core/txt/WorkAround.java b/io.sloeber.core/src/io/sloeber/core/txt/WorkAround.java index 7e880ccc..1f7ec0e0 100644 --- a/io.sloeber.core/src/io/sloeber/core/txt/WorkAround.java +++ b/io.sloeber.core/src/io/sloeber/core/txt/WorkAround.java @@ -66,9 +66,9 @@ public class WorkAround { USB_replacers.put(" -DARDUINO_VARIANT=\"{build.variant}\" ", " -DARDUINO_VARIANT=\\\"{build.variant}\\\" "); - USB.replacers.put("-DARDUINO_HOST_OS=\"{runtime.os}\"", "-DARDUINO_HOST_OS=\\\"{runtime.os}\\\""); + USB_replacers.put("-DARDUINO_HOST_OS=\"{runtime.os}\"", "-DARDUINO_HOST_OS=\\\"{runtime.os}\\\""); - USB.replacers.put(" -DARDUINO_FQBN=\"{build.fqbn}\" ", " -DARDUINO_FQBN=\\\"{build.fqbn}\\\" "); + USB_replacers.put(" -DARDUINO_FQBN=\"{build.fqbn}\" ", " -DARDUINO_FQBN=\\\"{build.fqbn}\\\" "); USB_replacers.put(" '-DUSB_SERIAL=\"{build.usb_serial}\"' ", " \"-DUSB_SERIAL=\\\"{build.usb_serial}\\\"\" "); USB_replacers.put(" '-DUSB_SERIAL={build.usb_serial}' ", " \"-DUSB_SERIAL={build.usb_serial}\" "); From dc7d552a1fb02dc2c4ce711d7d76e3abaf1ee4b7 Mon Sep 17 00:00:00 2001 From: kb1sph Date: Sat, 2 Nov 2024 11:28:30 -0400 Subject: [PATCH 4/4] Update WorkAround.java Updated FIRST_SLOEBER_WORKAROUND_LINE to say test 26 --- io.sloeber.core/src/io/sloeber/core/txt/WorkAround.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io.sloeber.core/src/io/sloeber/core/txt/WorkAround.java b/io.sloeber.core/src/io/sloeber/core/txt/WorkAround.java index 1f7ec0e0..23b89dc8 100644 --- a/io.sloeber.core/src/io/sloeber/core/txt/WorkAround.java +++ b/io.sloeber.core/src/io/sloeber/core/txt/WorkAround.java @@ -44,7 +44,7 @@ public class WorkAround { // Each time this class is touched consider changing the String below to enforce // updates - private static final String FIRST_SLOEBER_WORKAROUND_LINE = "#Sloeber created TXT file V3.00.test 25 "; + private static final String FIRST_SLOEBER_WORKAROUND_LINE = "#Sloeber created TXT file V3.00.test 26 "; private static Map USB_replacers;