Merge branch 'dev' into gh-ci-id

Makefile

@@ -51,6 +51,14 @@ DOCKER_CMD=$(DOCKER_BIN)  -f $(DOCKER_YML)  run  --rm  builder
 # MkDocs config
 MKDOCS_YML=$(CURDIR)/scripts/IronOS-mkdocs.yml
 
+# supported models
+MODELS=TS100 TS80 TS80P Pinecil MHP30 Pinecilv2 S60 TS101 # target names & dir names
+MODELS_ML=Pinecil  Pinecilv2 # target names
+MODELS_MULTILANG=Pinecil_multi-lang  Pinecilv2_multi-lang # dir names
+
+# zip command (to pack artifacts)
+ZIP=zip -q -j -r
+
 
 ### targets
 
@@ -91,7 +99,7 @@ list:
 	@echo
 	@echo "Full list of current supported IDs:"
 	@echo "  * LANG_ID: $(shell echo "`ls Translations/ | grep -e "^translation_.*.json$$" | sed -e 's,^translation_,,g; s,\.json$$,,g; ' | tr '\n' ' '`")"
-	@echo "  * MODEL_ID: TS100 TS101 TS80 TS80P MHP30 Pinecil Pinecilv2 S60"
+	@echo "  * MODEL_ID: $(MODELS)"
 	@echo
 	@echo "For example, to make a local build of IronOS firmware for TS100 with English language, just type:"
 	@echo
@@ -171,11 +179,41 @@ build-all:
 	@chmod  0777  $(OUT_DIR)
 	cd  source  &&  bash  ./build.sh
 	@echo "All Firmware built"
-	@cp  -r  $(OUT_HEX)/*.bin  $(OUT_DIR)
-	@cp  -r  $(OUT_HEX)/*.hex  $(OUT_DIR)
-	@cp  -r  $(OUT_HEX)/*.dfu  $(OUT_DIR)
+	@for model in $(MODELS); do \
+		mkdir  -p  $(OUT_DIR)/$${model} ; \
+		cp  -r  $(OUT_HEX)/$${model}_*.bin  $(OUT_DIR)/$${model}/ ; \
+		cp  -r  $(OUT_HEX)/$${model}_*.hex  $(OUT_DIR)/$${model}/ ; \
+		cp  -r  $(OUT_HEX)/$${model}_*.dfu  $(OUT_DIR)/$${model}/ ; \
+	done;
 	@echo "Resulting output directory: $(OUT_DIR)"
 
+# target to build multilang supported builds for Pinecil & PinecilV2
+build-multilang:
+	@for modelml in $(MODELS_ML); do \
+		$(MAKE)  -C source/  -j2  model=$${modelml}  firmware-multi_compressed_European  firmware-multi_compressed_Bulgarian+Russian+Serbian+Ukrainian  firmware-multi_Chinese+Japanese ; \
+		mkdir  -p  $(OUT_DIR)/$${modelml}_multi-lang ; \
+		cp  $(OUT_HEX)/$${modelml}_multi_*.bin   $(OUT_DIR)/$${modelml}_multi-lang ; \
+		cp  $(OUT_HEX)/$${modelml}_multi_*.hex   $(OUT_DIR)/$${modelml}_multi-lang ; \
+		cp  $(OUT_HEX)/$${modelml}_multi_*.dfu   $(OUT_DIR)/$${modelml}_multi-lang ; \
+	done;
+	@echo "Resulting output directory: $(OUT_DIR)"
+
+# target to reproduce zips according to github CI settings; artifacts will be in $(OUT_DIR)/CI/*.zip
+ci: tests  build-all  build-multilang
+	@mkdir  -p  $(OUT_DIR)/metadata;
+	@for m in $(MODELS) $(MODELS_MULTILANG); do \
+		cp LICENSE scripts/LICENSE_RELEASE.md  $(OUT_DIR)/$${m}/ ; \
+		$(ZIP)  $(OUT_DIR)/$${m}.zip  $(OUT_DIR)/$${m} ;           \
+		./source/metadata.py  $${m}.json  $${m};                   \
+		cp  $(OUT_HEX)/$${m}.json  $(OUT_DIR)/metadata;            \
+	done;
+	@$(ZIP)  $(OUT_DIR)/metadata.zip  $(OUT_DIR)/metadata
+	@mkdir -p  $(OUT_DIR)/CI
+	@mv        $(OUT_DIR)/*.zip       $(OUT_DIR)/CI
+	@chmod  0777  $(OUT_DIR)/CI
+	@chmod  0666  $(OUT_DIR)/CI/*.zip
+	@echo "Resulting artifacts directory: $(OUT_DIR)/CI"
+
 # pass-through target for Makefile inside source/ dir
 %:
 	$(MAKE)  -C source/  $@
@@ -191,4 +229,9 @@ clean-build:
 clean-full: clean-build  docker-clean
 
 # phony targets
-.PHONY:  help  list  docker-check  docker-shell  docker-build  docker-clean  docs  docs-deploy  test-md  test-sh  test-py  test-ccpp  tests  clean-build  clean-full
+.PHONY:  help  list
+.PHONY:  docker-check  docker-shell  docker-build  docker-clean
+.PHONY:  docs  docs-deploy
+.PHONY:  test-md  test-sh  test-py  test-ccpp  tests
+.PHONY:  build-all  build-multilang  ci
+.PHONY:  clean-build  clean-full

Translations/translation_BE.json

@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Некантралюемае\nразаграванне"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Пераканайцеся, што пры наступнай загрузцы наканечнік і ручка маюць пакаёвую тэмпературу!"
         },
@@ -313,4 +316,4 @@
             "description": ""
         }
     }
-}
+}

Translations/translation_BG.json

@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Thermal\nRunaway"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },
@@ -313,4 +316,4 @@
             "description": ""
         }
     }
-}
+}

Translations/translation_CS.json

@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Teplotní\nOchrana"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Před restartem se ujistěte, že hrot a držák mají pokojovou teplotu!"
         },
@@ -313,4 +316,4 @@
             "description": ""
         }
     }
-}
+}

Translations/translation_DA.json

@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Thermal\nRunaway"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },

Translations/translation_DE.json

@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Thermal\nRunaway"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Vor dem Neustart bitte sicherstellen, dass Lötspitze & Gerät Raumtemperatur haben!"
         },

Translations/translation_EL.json

@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Θερμική\nΦυγή"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Πριν την επανεκκίνηση, βεβαιωθείτε ότι η μύτη και η συσκ. είναι σε θερμ. δωματίου!"
         },

Translations/translation_EN.json

@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Thermal\nRunaway"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },

Translations/translation_ES.json

@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Térmico\nFuera de control"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "¡Antes de reiniciar, asegúrese de que la punta y el mango estén a temperatura ambiente!"
         },

Translations/translation_FI.json

@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Thermal\nRunaway"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },

Translations/translation_FR.json

@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Emballement\nthermique"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Avant de redémarrer, assurez-vous que la panne et la poignée sont à température ambiante !"
         },

Translations/translation_HR.json

@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Neispravan\ngrijač"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Prije restarta provjerite da su vrh i ručka na sobnoj temperaturi!"
         },

Translations/translation_HU.json

@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Kontrollálatlan\nhőmérséklet!"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Újraindítás előtt a hegy és az eszköz legyen szobahőmérsékletű!"
         },

Translations/translation_IT.json

@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Temperatura\nfuori controllo"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Prima di riavviare assicurati che la punta e l'impugnatura siano a temperatura ambiente!"
         },

Translations/translation_JA_JP.json

@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "過熱"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },

Translations/translation_LT.json

@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Perkaitimo\npavojus"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },

Translations/translation_NB.json

@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Termisk\nrømling"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },

Translations/translation_NL.json

@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Verwarming\nOncontroleerbaar"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },

Translations/translation_NL_BE.json

@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Thermal\nRunaway"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },

Translations/translation_PL.json

@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Ucieczka\ntermiczna"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Upewnij się, że końcówka i uchwyt mają temperaturę pokojową podczas następnego rozruchu!"
         },

Translations/translation_PT.json

@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Thermal\nRunaway"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Antes de reiniciar certifique-se que o ferro está à temperatura ambiente!"
         },

Translations/translation_RO.json

@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Încălzire\nEşuată"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Înainte de repornire, asiguraţi-vă că vârful şi mânerul sunt la temperatura camerei!"
         },

Translations/translation_RU.json

@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Неуправляемый\nРазогрев"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Пожалуйста, убедитесь, что жало и корпус имеют комнатную температуру при следующей загрузке!"
         },

Translations/translation_SK.json

@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Únik\nTepla"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },

Translations/translation_SL.json

@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Thermal\nRunaway"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },

Translations/translation_SR_CYRL.json

@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Thermal\nRunaway"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },

Translations/translation_SR_LATN.json

@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Thermal\nRunaway"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },

Translations/translation_SV.json

@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Thermal\nRunaway"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },

Translations/translation_TR.json

@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Thermal\nRunaway"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Before rebooting, make sure tip & handle are at room temperature!"
         },

Translations/translation_UK.json

@@ -30,6 +30,9 @@
         "WarningThermalRunaway": {
             "message": "Некерований\nрозігрів"
         },
+        "WarningTipShorted": {
+            "message": "!Tip Shorted!"
+        },
         "SettingsCalibrationWarning": {
             "message": "Під час наступного завантаження переконайтеся, що жало і ручка мають кімнатну температуру!"
         },