Skip to content

[pull] master from stm32duino:master #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Apr 21, 2021
Merged

[pull] master from stm32duino:master #5

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e33cf69
Remove redundant tools/ directory in STM32Tools
fpistm Apr 20, 2021
b9ec519
[CI] Update with new package index
fpistm Apr 20, 2021
2e58d11
Remove special character from name entry
fpistm Apr 20, 2021
7680a18
Update platform specification
fpistm Apr 21, 2021
e32ba63
Update to release 2.0.0 version
fpistm Apr 21, 2021
2e9eeab
Update README.md
fpistm Apr 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[CI] Update with new package index 
Since core 2.0.0 maintainer is "STMicroelectronics"

Signed-off-by: Frederic Pillon <[email protected]>
  • Loading branch information
@fpistm
fpistm committed Apr 21, 2021
commit b9ec51900b9155b4593ba71031c69de0cd931655
93 changes: 0 additions & 93 deletions .travis.yml.old
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion CI/build/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ optional arguments:
-u <string>, --url <string>
additional URL for the board manager Default url : htt
ps://github.com/stm32duino/BoardManagerFiles/raw/maste
r/STM32/package_stm_index.json
r/package_stmicroelectronics_index.json
-v, --verbose enable arduino-cli verbose mode
--ci custom configuration for CI build

Expand Down
6 changes: 3 additions & 3 deletions CI/build/arduino-cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
path_config_filename = os.path.join(script_path, "path_config.json")

arduino_cli_path = ""
stm32_url = "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/package_stm_index.json"
stm32_url = "https://github.com/stm32duino/BoardManagerFiles/raw/master/package_stmicroelectronics_index.json"
sketches_path_list = []
default_build_output_dir = os.path.join(tempdir, "build_arduinoCliOutput")
build_output_dir = os.path.join(tempdir, "build_arduinoCliOutput" + build_id)
Expand All @@ -44,7 +44,7 @@
cores_config_file_default = os.path.join(script_path, "conf", "cores_config.json")
cores_config_file_ci = os.path.join(script_path, "conf", "cores_config_ci.json")

maintainer_default = "STM32"
maintainer_default = "STMicroelectronics"
arch_default = "stm32"
arduino_platform_default = maintainer_default + ":" + arch_default

Expand All @@ -53,7 +53,7 @@
arch = arch_default
arduino_platform = arduino_platform_default
arduino_cli = ""
arduino_cli_default_version = "0.17.0"
arduino_cli_default_version = "0.18.0"
arduino_cli_version = arduino_cli_default_version

# List
Expand Down
2 changes: 1 addition & 1 deletion CI/build/conf/cores_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"cores": [
{
"maintainer": "STM32",
"maintainer": "STMicroelectronics",
"architecture": "stm32",
"boards": [
{
Expand Down
2 changes: 1 addition & 1 deletion CI/build/conf/cores_config_ci.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"cores": [
{
"maintainer": "STM32",
"maintainer": "STMicroelectronics",
"architecture": "stm32",
"boards": [
{
Expand Down
8 changes: 4 additions & 4 deletions CI/utils/fqbn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
fqbn_list = []
arduino_cli = ""
arduino_cli_path = ""
stm32_url = "https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/package_stm_index.json"
arduino_platform = "STM32:stm32"
stm32_url = "https://github.com/stm32duino/BoardManagerFiles/raw/master/package_stmicroelectronics_index.json"
arduino_platform = "STMicroelectronics:stm32"

# Parser
parser = argparse.ArgumentParser(
Expand Down Expand Up @@ -50,8 +50,8 @@ def get_fqbn_list():
boards_list = json.loads(output)
if boards_list is not None:
for board in boards_list["boards"]:
if arduino_platform in board["FQBN"]:
fqbn_list_tmp.append(board["FQBN"])
if arduino_platform in board["fqbn"]:
fqbn_list_tmp.append(board["fqbn"])
if not len(fqbn_list_tmp):
raise subprocess.CalledProcessError(2, "No fqbn")
else:
Expand Down