@@ -385,28 +385,30 @@ def build_arduino_framework():
385
385
variant = env .BoardConfig ().get ("build.variant" )
386
386
387
387
env .Append (
388
+ CPPDEFINES = [
389
+ ("ARDUINO" , 10805 ),
390
+ ("ARDUINO_ARCH_ESP32" , 1 ),
391
+ ("ARDUINO_VARIANT" , '\\ "%s\\ "' % env .BoardConfig ().get ("build.variant" ).replace ('"' , "" )),
392
+ ("ARDUINO_BOARD" , '\\ "%s\\ "' % env .BoardConfig ().get ("name" ).replace ('"' , "" ))
393
+ ],
394
+
388
395
CPPPATH = [
389
396
join (ARDUINO_FRAMEWORK_DIR , "cores" , core ),
390
397
join (ARDUINO_FRAMEWORK_DIR , "variants" , variant )
391
398
]
392
399
)
393
400
394
- envsafe = env .Clone ()
395
- envsafe .Append (
396
- CPPDEFINES = [("ARDUINO" , 10805 ), ("ARDUINO_ARCH_ESP32" , 1 )]
397
- )
398
-
399
401
arduino_libs = []
400
402
if "build.variant" in env .BoardConfig ():
401
- envsafe .Append (
403
+ env .Append (
402
404
CPPPATH = [join (ARDUINO_FRAMEWORK_DIR , "variants" , variant )]
403
405
)
404
- arduino_libs .append (envsafe .BuildLibrary (
406
+ arduino_libs .append (env .BuildLibrary (
405
407
join ("$BUILD_DIR" , "FrameworkArduinoVariant" ),
406
408
join (ARDUINO_FRAMEWORK_DIR , "variants" , variant )
407
409
))
408
410
409
- arduino_libs .append (envsafe .BuildLibrary (
411
+ arduino_libs .append (env .BuildLibrary (
410
412
join ("$BUILD_DIR" , "FrameworkArduino" ),
411
413
join (ARDUINO_FRAMEWORK_DIR , "cores" , core )
412
414
))
0 commit comments