@@ -76,7 +76,9 @@ for item in "${@:2:${#@}-5}"; do
76
76
INCLUDES+=" $item "
77
77
fi
78
78
elif [ " $prefix " = " -D" ]; then
79
- DEFINES+=" $item "
79
+ if [[ " ${item: 2: 7} " != " ARDUINO" ]] && [[ " $item " != " -DESP32" ]]; then # skip ARDUINO defines
80
+ DEFINES+=" $item "
81
+ fi
80
82
elif [[ " $item " != " -Wall" && " $item " != " -Werror=all" && " $item " != " -Wextra" ]]; then
81
83
C_FLAGS+=" $item "
82
84
fi
@@ -335,22 +337,20 @@ echo " CPPDEFINES=[" >> "$AR_PLATFORMIO_PY"
335
337
set -- $DEFINES
336
338
for item; do
337
339
item=" ${item: 2} " # remove -D
338
- if [[ " ${item: 0: 7} " != " ARDUINO" ]] && [[ " $item " != " ESP32" ]]; then # skip ARDUINO defines
339
- if [[ $item == * " =" * ]]; then
340
- item=(${item// =/ } )
341
- re=' ^[+-]?[0-9]+([.][0-9]+)?$'
342
- if [[ ${item[1]} =~ $re ]]; then
343
- echo " (\" ${item[0]} \" , ${item[1]} )," >> " $AR_PLATFORMIO_PY "
344
- else
345
- echo " (\" ${item[0]} \" , '${item[1]} ')," >> " $AR_PLATFORMIO_PY "
346
- fi
340
+ if [[ $item == * " =" * ]]; then
341
+ item=(${item// =/ } )
342
+ re=' ^[+-]?[0-9]+([.][0-9]+)?$'
343
+ if [[ ${item[1]} =~ $re ]]; then
344
+ echo " (\" ${item[0]} \" , ${item[1]} )," >> " $AR_PLATFORMIO_PY "
347
345
else
348
- echo " \" $item \" ," >> " $AR_PLATFORMIO_PY "
346
+ echo " ( \" ${ item[0]} \" , ' ${item[1]} ') ," >> " $AR_PLATFORMIO_PY "
349
347
fi
348
+ else
349
+ echo " \" $item \" ," >> " $AR_PLATFORMIO_PY "
350
350
fi
351
351
done
352
352
353
- # remobe backslashes for Arduino
353
+ # remove backslashes for Arduino
354
354
DEFINES=` echo " $DEFINES " | tr -d ' \\' `
355
355
356
356
0 commit comments