Merge branch 'AIRDOS04A' of github.com:UniversalScientificTechnologie…

…s/AIRDOS04 into AIRDOS04A, extended build
UniversalScientificTechnologies · Dec 12, 2023 · 619670a · 619670a
1 parent e441379
commit 619670a
Show file tree

Hide file tree

Showing 8 changed files with 3,226 additions and 3,164 deletions.
diff --git a/fw/AIRDOS04/githash.h b/fw/AIRDOS04/githash.h
@@ -1,5 +1,5 @@
 // This file is overwritten by github actions, do not update it manually
-String githash = "cc4005053ad7f2301d97810a52c897330c6dfa81,User";
+String githash = "88b4015775b9e86055e9014bd6b24cfea9659a48,User";
 #define GHRELEASE 1
 #define GHBUILD 0
 #define GHBUILDTYPE User
diff --git a/fw/AIRDOS04/nextversion b/fw/AIRDOS04/nextversion
@@ -2,4 +2,4 @@
 MAJOR 1
 MINOR 0
 RELEASE 1
-BUILD 12
+BUILD 13
diff --git a/fw/build/fw_AIRDOS04X_AIRDOS04X.-CIBuild.hex b/fw/build/fw_AIRDOS04X_AIRDOS04X.-CIBuild.hex
@@ -1543,10 +1543,10 @@
 :1060600004C07C916D9370836291AE17BF07C8F333
 :10607000089511E0C0E1D1E004C0FE010E94EF2AC2
 :0C6080002196C131D107C9F7F894FFCF79
-:10608C0000008A0A800001FFFFFFFF636334303099
-:10609C0035303533616437663233303164393738F3
-:1060AC0031306135326338393733333063366466B7
-:1060BC006138312C43494275696C6400312E302EA5
+:10608C0000008A0A800001FFFFFFFF3838623430BD
+:10609C003135373735623965383630353565393015
+:1060AC00313462643662323463666561393635394F
+:1060BC006134382C43494275696C6400312E302EA2
 :1060CC00302D2D43494275696C6400244849535462
 :1060DC002C0023534420696E69742066616C7365CF
 :1060EC00002353442066616C7365002E7478740031

diff --git a/fw/build/fw_AIRDOS04X_AIRDOS04X.-CIBuild.with_bootloader.hex b/fw/build/fw_AIRDOS04X_AIRDOS04X.-CIBuild.with_bootloader.hex
@@ -1544,9 +1544,9 @@
 :1060600004C07C916D9370836291AE17BF07C8F333
 :10607000089511E0C0E1D1E004C0FE010E94EF2AC2
 :106080002196C131D107C9F7F894FFCF00008A0AE1
-:10609000800001FFFFFFFF6363343030353035335C
-:1060A00061643766323330316439373831306135C5
-:1060B0003263383937333330633664666138312CB4
+:10609000800001FFFFFFFF38386234303135373779
+:1060A00035623965383630353565393031346264BA
+:1060B0003662323463666561393635396134382C7D
 :1060C00043494275696C6400312E302E302D2D43CA
 :1060D000494275696C640024484953542C00235389
 :1060E0004420696E69742066616C736500235344B3

diff --git a/fw/build/fw_AIRDOS04_AIRDOS04.11-CIBuild.hex b/fw/build/fw_AIRDOS04_AIRDOS04.11-CIBuild.hex
diff --git a/fw/build/fw_AIRDOS04_AIRDOS04.11-CIBuild.with_bootloader.hex b/fw/build/fw_AIRDOS04_AIRDOS04.11-CIBuild.with_bootloader.hex
diff --git a/fw/build/fw_AIRDOS04_AIRDOS04.12-CIBuild.hex b/fw/build/fw_AIRDOS04_AIRDOS04.12-CIBuild.hex
diff --git a/fw/build/fw_AIRDOS04_AIRDOS04.12-CIBuild.with_bootloader.hex b/fw/build/fw_AIRDOS04_AIRDOS04.12-CIBuild.with_bootloader.hex