53
53
arch = arch_default
54
54
arduino_platform = arduino_platform_default
55
55
arduino_cli = ""
56
- arduino_cli_default_version = "0.10 .0"
56
+ arduino_cli_default_version = "0.17 .0"
57
57
arduino_cli_version = arduino_cli_default_version
58
58
59
59
# List
@@ -462,6 +462,10 @@ def find_board():
462
462
if args .board :
463
463
arg_board_pattern = re .compile (args .board , re .IGNORECASE )
464
464
465
+ if version .parse (arduino_cli_version ) >= version .parse ("0.18.0" ):
466
+ fqbn_key = "fqbn"
467
+ else :
468
+ fqbn_key = "FQBN"
465
469
fqbn_list_tmp = []
466
470
try :
467
471
output = subprocess .check_output (
@@ -476,8 +480,8 @@ def find_board():
476
480
boards_list = json .loads (output )
477
481
if boards_list is not None :
478
482
for board in boards_list ["boards" ]:
479
- if arduino_platform in board ["FQBN" ]:
480
- fqbn_list_tmp .append (board ["FQBN" ])
483
+ if arduino_platform in board [fqbn_key ]:
484
+ fqbn_list_tmp .append (board [fqbn_key ])
481
485
if not len (fqbn_list_tmp ):
482
486
print ("No boards found for " + arduino_platform )
483
487
quit (1 )
@@ -711,7 +715,7 @@ def genBasicCommand(b_name):
711
715
cmd .append (build_output_cache_dir )
712
716
if args .verbose :
713
717
cmd .append ("--verbose" )
714
- if version .parse (arduino_cli_version ) <= version .parse (arduino_cli_default_version ):
718
+ if version .parse (arduino_cli_version ) <= version .parse ("0.10.0" ):
715
719
cmd .append ("--output" )
716
720
cmd .append (os .path .join (output_dir , b_name , bin_dir , "dummy_sketch" ))
717
721
else :
0 commit comments