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

…s/AIRDOS04 into AIRDOS04A
UniversalScientificTechnologies · Apr 18, 2024 · c994276 · c994276
2 parents 6c76041 + c7dffd0
commit c994276
Show file tree

Hide file tree

Showing 8 changed files with 3,792 additions and 3,770 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 = "024e8d29042857afa79d6701768c623f252a1587,User";
+String githash = "ec53dc5eac2e08f0529508bfefecbd19f1d7e67e,User";
 #define GHRELEASE 0
 #define GHBUILD 0
 #define GHBUILDTYPE User
diff --git a/fw/AIRDOS04/nextversion b/fw/AIRDOS04/nextversion
@@ -2,4 +2,4 @@
 MAJOR 1
 MINOR 1
 RELEASE 0
-BUILD 36
+BUILD 37
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
-:10608C0000008A0A800001FFFFFFFF3032346538C0
-:10609C0064323930343238353761666137396436B9
-:1060AC003730313736386336323366323532613118
-:1060BC003538372C43494275696C6400312E312ECA
+:10608C0000008A0A800001FFFFFFFF65633533645F
+:10609C006335656163326530386630353239353099
+:1060AC00386266656665636264313966316437658A
+:1060BC003637652C43494275696C6400312E312E9C
 :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
-:10609000800001FFFFFFFF30323465386432393051
-:1060A00034323835376166613739643637303137E5
-:1060B0003638633632336632353261313538372C13
+:10609000800001FFFFFFFF65633533646335656191
+:1060A000633265303866303532393530386266658E
+:1060B0006665636264313966316437653637652CED
 :1060C00043494275696C6400312E312E302D2D43C9
 :1060D000494275696C640024484953542C00235389
 :1060E0004420696E69742066616C736500235344B3

diff --git a/fw/build/fw_AIRDOS04_AIRDOS04.35-CIBuild.hex b/fw/build/fw_AIRDOS04_AIRDOS04.35-CIBuild.hex
diff --git a/fw/build/fw_AIRDOS04_AIRDOS04.35-CIBuild.with_bootloader.hex b/fw/build/fw_AIRDOS04_AIRDOS04.35-CIBuild.with_bootloader.hex
diff --git a/fw/build/fw_AIRDOS04_AIRDOS04.36-CIBuild.hex b/fw/build/fw_AIRDOS04_AIRDOS04.36-CIBuild.hex
diff --git a/fw/build/fw_AIRDOS04_AIRDOS04.36-CIBuild.with_bootloader.hex b/fw/build/fw_AIRDOS04_AIRDOS04.36-CIBuild.with_bootloader.hex