Commitdbc7063

committed

fix(arduino-cli): support 1.x version

Some data format have changed.Signed-off-by: Frederic Pillon <frederic.pillon@st.com>

1 parente194ab8 commitdbc7063Copy full SHA for dbc7063

File tree

-1

lines changed

-1

lines changed

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -297,6 +297,9 @@ def check_config():`
`297`	`297`	`else:`
`298`	`298`	`cli_config=json.loads(output)`
`299`	`299`	`ifcli_configisnotNone:`
	`300`	`+# Since arduino-cli 1.x new level "config"`
	`301`	`+if"config"incli_config.keys():`
	`302`	`+cli_config=cli_config["config"]`
`300`	`303`	`ifcli_config["directories"]["data"]isnotNone:`
`301`	`304`	`sketches_path_list.append(Path(cli_config["directories"]["data"]))`
`302`	`305`	`else:`
`@@ -526,7 +529,11 @@ def find_board():`
`526`	`529`	`print(e.stdout.decode("utf-8"))`
`527`	`530`	`quit(e.returncode)`
`528`	`531`	`else:`
`529`		`-fqbn_list_tmp= [board["fqbn"]forboardinjson.loads(output)]`
	`532`	`+boards=json.loads(output)`
	`533`	`+# Since arduino-cli 1.x new level "boards" and is a dict`
	`534`	`+iftype(boards)isdict:`
	`535`	`+boards=boards["boards"]`
	`536`	`+fqbn_list_tmp= [board["fqbn"]forboardinboards]`
`530`	`537`	`ifnotlen(fqbn_list_tmp):`
`531`	`538`	`print(f"No boards found for{arduino_platform}")`
`532`	`539`	`quit(1)`

Comments

(0)