59
59
arch = arch_default
60
60
arduino_platform = arduino_platform_default
61
61
arduino_cli = ""
62
- arduino_cli_default_version = "0.18 .0"
63
- arduino_cli_version = arduino_cli_default_version
62
+ arduino_cli_default_ver = "0.19 .0"
63
+ arduino_cli_ver = arduino_cli_default_ver
64
64
65
65
# List
66
66
sketch_list = []
@@ -152,7 +152,7 @@ def create_config():
152
152
153
153
def check_config ():
154
154
global arduino_cli
155
- global arduino_cli_version
155
+ global arduino_cli_ver
156
156
global arduino_cli_path
157
157
global sketches_path_list
158
158
global search_path_list
@@ -205,13 +205,13 @@ def check_config():
205
205
else :
206
206
res = re .match (r".*Version:\s+(\d+\.\d+\.\d+).*" , output .decode ("utf-8" ))
207
207
if res :
208
- arduino_cli_version = res .group (1 )
209
- print (f"Arduino CLI version used: { arduino_cli_version } " )
210
- if version .parse (arduino_cli_version ) <= version .parse ("0.10.0" ):
211
- print ("Arduino CLI version <= 0.10.0 is no more supported" )
208
+ arduino_cli_ver = res .group (1 )
209
+ print (f"Arduino CLI version used: { arduino_cli_ver } " )
210
+ if version .parse (arduino_cli_ver ) < version .parse (arduino_cli_default_ver ):
211
+ print (f "Arduino CLI version < { arduino_cli_default_ver } not supported" )
212
212
else :
213
213
print ("Unable to define Arduino CLI version." )
214
- print (f"Use default: { arduino_cli_default_version } " )
214
+ print (f"Use default: { arduino_cli_default_ver } " )
215
215
216
216
if args .url :
217
217
stm32_url = args .url
@@ -458,10 +458,6 @@ def find_board():
458
458
if args .board :
459
459
arg_board_pattern = re .compile (args .board , re .IGNORECASE )
460
460
461
- if version .parse (arduino_cli_version ) >= version .parse ("0.18.0" ):
462
- fqbn_key = "fqbn"
463
- else :
464
- fqbn_key = "FQBN"
465
461
fqbn_list_tmp = []
466
462
try :
467
463
output = subprocess .check_output (
@@ -476,8 +472,8 @@ def find_board():
476
472
boards_list = json .loads (output )
477
473
if boards_list is not None :
478
474
for board in boards_list ["boards" ]:
479
- if arduino_platform in board [fqbn_key ]:
480
- fqbn_list_tmp .append (board [fqbn_key ])
475
+ if arduino_platform in board ["fqbn" ]:
476
+ fqbn_list_tmp .append (board ["fqbn" ])
481
477
if not len (fqbn_list_tmp ):
482
478
print (f"No boards found for { arduino_platform } " )
483
479
quit (1 )
0 commit comments