@@ -38,7 +38,7 @@ public class WorkAround extends Const {
38
38
// Each time this class is touched consider changing the String below to enforce
39
39
// updates
40
40
// for debugging I added the system time so the files get refresed at each run
41
- private static final String FIRST_SLOEBER_WORKAROUND_LINE = "#Sloeber created workaound file V1.01.test 13 " ;
41
+ private static final String FIRST_SLOEBER_WORKAROUND_LINE = "#Sloeber created workaound file V1.01.test 15 " ;
42
42
// + String.valueOf(System.currentTimeMillis());
43
43
44
44
/**
@@ -126,7 +126,7 @@ static File MakeBoardsSloeberTxt(File requestedFileToWorkAround) {
126
126
String correctPROD = " \" -DUSB_PRODUCT=\\ \" {build.usb_product}\\ \" \" " ;
127
127
String correctBOARD = " \" -DARDUINO_BOARD=\\ \" {build.board}\\ \" \" " ;
128
128
129
- if (SystemUtils .IS_OS_WINDOWS ) {
129
+ // if (SystemUtils.IS_OS_WINDOWS) {
130
130
// replace FI circuitplay32u4cat.build.usb_manufacturer="Adafruit"
131
131
// with circuitplay32u4cat.build.usb_manufacturer=Adafruit
132
132
boardsTXT = boardsTXT .replaceAll ("(\\ S+\\ .build\\ .usb\\ S+)=\\ \" (.+)\\ \" " , "$1=$2" );
@@ -136,11 +136,11 @@ static File MakeBoardsSloeberTxt(File requestedFileToWorkAround) {
136
136
boardsTXT = boardsTXT .replaceAll (" ['\\ \" ]?(-DMBEDTLS_\\ S+)=\\ \\ ?\" (mbedtls\\ S+?)\\ \\ ?\\ \" [\" ']? " ,
137
137
" \\ \" $1=\\ \\ \\ \" $2\\ \\ \\ \" \\ \" " );
138
138
139
- } else {
140
- correctMAN = " '-DUSB_MANUFACTURER=\" {build.usb_manufacturer}\" ' " ;
141
- correctPROD = " '-DUSB_PRODUCT=\" {build.usb_product}\" '" ;
142
- correctBOARD = " '-DARDUINO_BOARD=\" {build.board}\" ' " ;
143
- }
139
+ // } else {
140
+ // correctMAN = " '-DUSB_MANUFACTURER=\"{build.usb_manufacturer}\"' ";
141
+ // correctPROD = " '-DUSB_PRODUCT=\"{build.usb_product}\" '";
142
+ // correctBOARD = " '-DARDUINO_BOARD=\"{build.board}\"' ";
143
+ // }
144
144
// some providers put -DUSB_PRODUCT={build.usb_product} in boards.txt
145
145
boardsTXT = boardsTXT .replace (" \" -DUSB_MANUFACTURER={build.usb_manufacturer}\" " , correctMAN );
146
146
boardsTXT = boardsTXT .replace (" \" -DUSB_PRODUCT={build.usb_product}\" " , correctPROD );
@@ -284,24 +284,36 @@ static File MakePlatformSloeberTXT(File requestedFileToWorkAround) {
284
284
platformTXT = platformTXT .replaceAll ("\" ?(-DMBEDTLS_\\ S+)=\\ \\ ?\" (mbedtls\\ S+)\" \\ \\ ?\" *" ,
285
285
"\" $1=\\ \\ \" $2\\ \\ \" \" " );
286
286
287
- // Sometimes "-DUSB_MANUFACTURER={build.usb_manufacturer}"
288
- // "-DUSB_PRODUCT={build.usb_product}"
289
- // is used fi LinKit smart
290
- platformTXT = platformTXT .replace ("\" -DUSB_MANUFACTURER={build.usb_manufacturer}\" " ,
291
- "\" -DUSB_MANUFACTURER=\\ \" {build.usb_manufacturer}\\ \" \" " );
292
- platformTXT = platformTXT .replace ("\" -DUSB_PRODUCT={build.usb_product}\" " ,
293
- "\" -DUSB_PRODUCT=\\ \" {build.usb_product}\\ \" \" " );
294
- platformTXT = platformTXT .replace (" -DARDUINO_BOARD=\" {build.board}\" " ,
295
- " \" -DARDUINO_BOARD=\\ \" {build.board}\\ \" \" " );
296
-
297
- } else {
298
- platformTXT = platformTXT .replace (" -DUSB_MANUFACTURER={build.usb_manufacturer} " ,
299
- " '-DUSB_MANUFACTURER=\" {build.usb_manufacturer}\" ' " );
300
- platformTXT = platformTXT .replace (" -DUSB_PRODUCT={build.usb_product} " ,
301
- " '-DUSB_PRODUCT=\" {build.usb_product}\" '" );
302
- platformTXT = platformTXT .replace (" -DARDUINO_BOARD=\" {build.board}\" " ,
303
- " '-DARDUINO_BOARD=\" {build.board}\" ' " );
287
+ // // Sometimes "-DUSB_MANUFACTURER={build.usb_manufacturer}"
288
+ // // "-DUSB_PRODUCT={build.usb_product}"
289
+ // // is used fi LinKit smart
290
+ // platformTXT = platformTXT.replace("\"-DUSB_MANUFACTURER={build.usb_manufacturer}\"",
291
+ // "\"-DUSB_MANUFACTURER=\\\"{build.usb_manufacturer}\\\"\"");
292
+ // platformTXT = platformTXT.replace("\"-DUSB_PRODUCT={build.usb_product}\"",
293
+ // "\"-DUSB_PRODUCT=\\\"{build.usb_product}\\\"\"");
294
+ // platformTXT = platformTXT.replace(" -DARDUINO_BOARD=\"{build.board}\" ",
295
+ // " \"-DARDUINO_BOARD=\\\"{build.board}\\\"\" ");
296
+ //
297
+ // } else {
298
+ // platformTXT = platformTXT.replace(" -DUSB_MANUFACTURER={build.usb_manufacturer} ",
299
+ // " '-DUSB_MANUFACTURER=\"{build.usb_manufacturer}\"' ");
300
+ // platformTXT = platformTXT.replace(" -DUSB_PRODUCT={build.usb_product} ",
301
+ // " '-DUSB_PRODUCT=\"{build.usb_product}\" '");
302
+ // platformTXT = platformTXT.replace(" -DARDUINO_BOARD=\"{build.board}\" ",
303
+ // " '-DARDUINO_BOARD=\"{build.board}\"' ");
304
304
}
305
+
306
+ // Sometimes "-DUSB_MANUFACTURER={build.usb_manufacturer}"
307
+ // "-DUSB_PRODUCT={build.usb_product}"
308
+ // is used fi LinKit smart
309
+ platformTXT = platformTXT .replace ("\" -DUSB_MANUFACTURER={build.usb_manufacturer}\" " ,
310
+ "\" -DUSB_MANUFACTURER=\\ \" {build.usb_manufacturer}\\ \" \" " );
311
+ platformTXT = platformTXT .replace ("\" -DUSB_PRODUCT={build.usb_product}\" " ,
312
+ "\" -DUSB_PRODUCT=\\ \" {build.usb_product}\\ \" \" " );
313
+ platformTXT = platformTXT .replace (" -DARDUINO_BOARD=\" {build.board}\" " ,
314
+ " \" -DARDUINO_BOARD=\\ \" {build.board}\\ \" \" " );
315
+
316
+
305
317
platformTXT = platformTXT .replace ("{" , "${" );
306
318
// Arduino zero openocd script uses { as parameter delimiter for program
307
319
platformTXT = platformTXT .replace ("program ${${" , "program {${" );
0 commit comments