Merge pull request #1091 from fpistm/subvariant

[variant] Improve variant support and genericity

Author: fpistm

.github/actions/pio-build/entrypoint.sh

@@ -11,6 +11,15 @@ platformio platform install "https://github.com/platformio/platform-ststm32.git"
 python3 -c "import json; import os; fp=open(os.path.expanduser('~/.platformio/platforms/ststm32/platform.json'), 'r+'); data=json.load(fp); data['packages']['framework-arduinoststm32']['version'] = '*'; del data['packages']['framework-arduinoststm32']['owner']; fp.seek(0); fp.truncate(); json.dump(data, fp); fp.close()" || {
   exit 1
 }
+
+# Fix for variant path change while not updated in PIO
+python3 -c "import json; import os; fp=open(os.path.expanduser('~/.platformio/platforms/ststm32/boards/malyanm300_f070cb.json'), 'r+'); data=json.load(fp); data['build']['variant'] = 'STM32F0xx/F070CBT'; data['build']['extra_flags'] = '-DSTM32F070xB -DVARIANT_H=\\\\\"variant_MALYANMx00_F070CB.h\\\\\"'; fp.seek(0); fp.truncate(); json.dump(data, fp); fp.close()" || {
+  exit 1
+}
+python3 -c "import json; import os; fp=open(os.path.expanduser('~/.platformio/platforms/ststm32/boards/nucleo_l152re.json'), 'r+'); data=json.load(fp); data['build']['variant'] = 'STM32L1xx/L151RET_L152RET_L162RET'; data['build']['extra_flags'] = '-DSTM32L152xE -DVARIANT_H=\\\\\"variant_NUCLEO_L152RE.h\\\\\"'; fp.seek(0); fp.truncate(); json.dump(data, fp); fp.close()" || {
+  exit 1
+}
+
 ln --symbolic "$GITHUB_WORKSPACE" "$HOME/.platformio/packages/framework-arduinoststm32" || {
   exit 1
 }
@@ -24,6 +33,6 @@ tar --extract --bzip2 --file="$CMSIS_ARCHIVE" || {
 cd "$GITHUB_WORKSPACE/CI/build/" || {
   exit 1
 }
-python3 platformio-builder.py --board=blackpill_f103c8 --board=remram_v1
+python3 platformio-builder.py --board=malyanm300_f070cb --board=nucleo_l152re
 
 exit $?

.gitignore

@@ -4,6 +4,7 @@ boards.local.txt
 platform.local.txt
 path_config.json
 update_config.json
+variant_config.json
 
 # Backup
 *.bak
@@ -34,4 +35,4 @@ __pycache__/
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
-*.code-workspace
+*.code-workspace