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

…s/LABDOS01 into LABDOS01A, extended build, extended build
UniversalScientificTechnologies · Dec 9, 2023 · 9be240d · 9be240d
1 parent 5211fc3
commit 9be240d
Show file tree

Hide file tree

Showing 14 changed files with 2,876 additions and 2,877 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 = "a4c140ec09c2aa0b8e2e1424d23d7d28babb49e6,User";
+String githash = "1311793d48915b81accec155353eb83dda536fee,User";
 #define GHRELEASE 0
 #define GHBUILD 0
 #define GHBUILDTYPE User
diff --git a/fw/LABDOS/nextversion b/fw/LABDOS/nextversion
@@ -2,4 +2,4 @@
 MAJOR 8
 MINOR 0
 RELEASE 0
-BUILD 122
+BUILD 123
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 = "a4c140ec09c2aa0b8e2e1424d23d7d28babb49e6,User";
+String githash = "1311793d48915b81accec155353eb83dda536fee,User";
 #define GHRELEASE 3
 #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 3
-BUILD 26
+BUILD 27
diff --git a/...ild/fw_LABDOS_LABDOS_1024.121-CIBuild.hex → fw/build/fw_LABDOS_LABDOS_1024.122-Beta.hex b/...ild/fw_LABDOS_LABDOS_1024.121-CIBuild.hex → fw/build/fw_LABDOS_LABDOS_1024.122-Beta.hex
diff --git a/...BDOS_1024.121-CIBuild.with_bootloader.hex → ..._LABDOS_1024.122-Beta.with_bootloader.hex b/...BDOS_1024.121-CIBuild.with_bootloader.hex → ..._LABDOS_1024.122-Beta.with_bootloader.hex
diff --git a/..._LABDOS_LABDOS_1024_16Mhz.121-CIBuild.hex → .../fw_LABDOS_LABDOS_1024_16Mhz.122-Beta.hex b/..._LABDOS_LABDOS_1024_16Mhz.121-CIBuild.hex → .../fw_LABDOS_LABDOS_1024_16Mhz.122-Beta.hex
diff --git a/...024_16Mhz.121-CIBuild.with_bootloader.hex → ...S_1024_16Mhz.122-Beta.with_bootloader.hex b/...024_16Mhz.121-CIBuild.with_bootloader.hex → ...S_1024_16Mhz.122-Beta.with_bootloader.hex
diff --git a/...uild/fw_LABDOS_LABDOS_512.121-CIBuild.hex → fw/build/fw_LABDOS_LABDOS_512.122-Beta.hex b/...uild/fw_LABDOS_LABDOS_512.121-CIBuild.hex → fw/build/fw_LABDOS_LABDOS_512.122-Beta.hex
diff --git a/...ABDOS_512.121-CIBuild.with_bootloader.hex → ...S_LABDOS_512.122-Beta.with_bootloader.hex b/...ABDOS_512.121-CIBuild.with_bootloader.hex → ...S_LABDOS_512.122-Beta.with_bootloader.hex
diff --git a/...w_LABDOS_LABDOS_512_16Mhz.121-CIBuild.hex → ...d/fw_LABDOS_LABDOS_512_16Mhz.122-Beta.hex b/...w_LABDOS_LABDOS_512_16Mhz.121-CIBuild.hex → ...d/fw_LABDOS_LABDOS_512_16Mhz.122-Beta.hex
diff --git a/...512_16Mhz.121-CIBuild.with_bootloader.hex → ...OS_512_16Mhz.122-Beta.with_bootloader.hex b/...512_16Mhz.121-CIBuild.with_bootloader.hex → ...OS_512_16Mhz.122-Beta.with_bootloader.hex
diff --git a/fw/build/fw_UAVDOS_UAVDOS.25-CIBuild.hex → fw/build/fw_UAVDOS_UAVDOS.26-Beta.hex b/fw/build/fw_UAVDOS_UAVDOS.25-CIBuild.hex → fw/build/fw_UAVDOS_UAVDOS.26-Beta.hex
diff --git a/...DOS_UAVDOS.25-CIBuild.with_bootloader.hex → ...UAVDOS_UAVDOS.26-Beta.with_bootloader.hex b/...DOS_UAVDOS.25-CIBuild.with_bootloader.hex → ...UAVDOS_UAVDOS.26-Beta.with_bootloader.hex