fix LABDOS version string, extended build

UniversalScientificTechnologies · Feb 25, 2023 · 4f32be1 · 4f32be1
1 parent 21c8579
commit 4f32be1
Show file tree

Hide file tree

Showing 14 changed files with 2,510 additions and 2,520 deletions.
diff --git a/fw/LABDOS/githash.h b/fw/LABDOS/githash.h
@@ -1,5 +1,5 @@
 // This file is overwritten by github actions, do not update it manually
-String githash = "41c59d0fee8283e8167c63231ebbd69bf6dbf775,User";
+String githash = "27a4bd2946f5f5bb41b307b60bb6e11ca4b3af6b,User";
 #define GHRELEASE 2
 #define GHBUILD 0
 #define GHBUILDTYPE User
diff --git a/fw/LABDOS/nextversion b/fw/LABDOS/nextversion
@@ -2,4 +2,4 @@
 MAJOR 7
 MINOR 1
 RELEASE 2
-BUILD 111
+BUILD 112
diff --git a/fw/UAVDOS/githash.h b/fw/UAVDOS/githash.h
@@ -1,5 +1,5 @@
 // This file is overwritten by github actions, do not update it manually
-String githash = "41c59d0fee8283e8167c63231ebbd69bf6dbf775,User";
+String githash = "27a4bd2946f5f5bb41b307b60bb6e11ca4b3af6b,User";
 #define GHRELEASE 2
 #define GHBUILD 0
 #define GHBUILDTYPE User
diff --git a/fw/UAVDOS/nextversion b/fw/UAVDOS/nextversion
@@ -2,4 +2,4 @@
 MAJOR 0
 MINOR 1
 RELEASE 2
-BUILD 15
+BUILD 16
diff --git a/...ild/fw_LABDOS_LABDOS_1024.110-CIBuild.hex → ...ild/fw_LABDOS_LABDOS_1024.111-CIBuild.hex b/...ild/fw_LABDOS_LABDOS_1024.110-CIBuild.hex → ...ild/fw_LABDOS_LABDOS_1024.111-CIBuild.hex
diff --git a/...BDOS_1024.110-CIBuild.with_bootloader.hex → ...BDOS_1024.111-CIBuild.with_bootloader.hex b/...BDOS_1024.110-CIBuild.with_bootloader.hex → ...BDOS_1024.111-CIBuild.with_bootloader.hex
diff --git a/..._LABDOS_LABDOS_1024_16Mhz.110-CIBuild.hex → ..._LABDOS_LABDOS_1024_16Mhz.111-CIBuild.hex b/..._LABDOS_LABDOS_1024_16Mhz.110-CIBuild.hex → ..._LABDOS_LABDOS_1024_16Mhz.111-CIBuild.hex
diff --git a/...024_16Mhz.110-CIBuild.with_bootloader.hex → ...024_16Mhz.111-CIBuild.with_bootloader.hex b/...024_16Mhz.110-CIBuild.with_bootloader.hex → ...024_16Mhz.111-CIBuild.with_bootloader.hex
diff --git a/...uild/fw_LABDOS_LABDOS_512.110-CIBuild.hex → ...uild/fw_LABDOS_LABDOS_512.111-CIBuild.hex b/...uild/fw_LABDOS_LABDOS_512.110-CIBuild.hex → ...uild/fw_LABDOS_LABDOS_512.111-CIBuild.hex
diff --git a/...ABDOS_512.110-CIBuild.with_bootloader.hex → ...ABDOS_512.111-CIBuild.with_bootloader.hex b/...ABDOS_512.110-CIBuild.with_bootloader.hex → ...ABDOS_512.111-CIBuild.with_bootloader.hex
diff --git a/...w_LABDOS_LABDOS_512_16Mhz.110-CIBuild.hex → ...w_LABDOS_LABDOS_512_16Mhz.111-CIBuild.hex b/...w_LABDOS_LABDOS_512_16Mhz.110-CIBuild.hex → ...w_LABDOS_LABDOS_512_16Mhz.111-CIBuild.hex
diff --git a/...512_16Mhz.110-CIBuild.with_bootloader.hex → ...512_16Mhz.111-CIBuild.with_bootloader.hex b/...512_16Mhz.110-CIBuild.with_bootloader.hex → ...512_16Mhz.111-CIBuild.with_bootloader.hex
diff --git a/fw/build/fw_UAVDOS_UAVDOS.14-CIBuild.hex → fw/build/fw_UAVDOS_UAVDOS.15-CIBuild.hex b/fw/build/fw_UAVDOS_UAVDOS.14-CIBuild.hex → fw/build/fw_UAVDOS_UAVDOS.15-CIBuild.hex
@@ -765,10 +765,10 @@
 :102FC000E1F7329704C07C916D9370836291AE17E4
 :102FD000BF07C8F3089510E0C3E8D0E004C0FE01C5
 :102FE0000E948B152196C438D107C9F7F894FFCFFA
-:102FF00000004F048000030001554156303000347A
-:103000003163353964306665653832383365383157
-:10301000363763363332333165626264363962661D
-:10302000366462663737352C43494275696C6400F3
+:102FF00000004F048000030001554156303000327C
+:10300000376134626432393436663566356262342B
+:103010003162333037623630626236653131636136
+:10302000346233616636622C43494275696C6400D0
 :10303000234376616B2E2E2E0023486D6D6D2E2E50
 :103040002E0024444F532C4C4142444F53303141C5
 :103050002C00982F8A4291443771CFFBC0B5A5DB75

diff --git a/...DOS_UAVDOS.14-CIBuild.with_bootloader.hex → ...DOS_UAVDOS.15-CIBuild.with_bootloader.hex b/...DOS_UAVDOS.14-CIBuild.with_bootloader.hex → ...DOS_UAVDOS.15-CIBuild.with_bootloader.hex
@@ -766,10 +766,10 @@
 :102FC000E1F7329704C07C916D9370836291AE17E4
 :102FD000BF07C8F3089510E0C3E8D0E004C0FE01C5
 :102FE0000E948B152196C438D107C9F7F894FFCFFA
-:102FF00000004F048000030001554156303000347A
-:103000003163353964306665653832383365383157
-:10301000363763363332333165626264363962661D
-:10302000366462663737352C43494275696C6400F3
+:102FF00000004F048000030001554156303000327C
+:10300000376134626432393436663566356262342B
+:103010003162333037623630626236653131636136
+:10302000346233616636622C43494275696C6400D0
 :10303000234376616B2E2E2E0023486D6D6D2E2E50
 :103040002E0024444F532C4C4142444F53303141C5
 :103050002C00982F8A4291443771CFFBC0B5A5DB75