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

…s/LABDOS01 into LABDOS01A, extended build
UniversalScientificTechnologies · Dec 8, 2023 · 1311793 · 1311793
1 parent a4c140e
commit 1311793
Show file tree

Hide file tree

Showing 22 changed files with 10,130 additions and 10,135 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 = "09dcb98450eda14c03ecef8e47c3ea8ff361d9e2,User";
+String githash = "a4c140ec09c2aa0b8e2e1424d23d7d28babb49e6,User";
 #define GHRELEASE 0
 #define GHBUILD 0
 #define GHBUILDTYPE User
diff --git a/fw/LABDOS/nextversion b/fw/LABDOS/nextversion
@@ -1,5 +1,5 @@
 #this file is maintained by github actions
-MAJOR 7
-MINOR 4
+MAJOR 8
+MINOR 0
 RELEASE 0
-BUILD 121
+BUILD 122
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 = "09dcb98450eda14c03ecef8e47c3ea8ff361d9e2,User";
+String githash = "a4c140ec09c2aa0b8e2e1424d23d7d28babb49e6,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 25
+BUILD 26
diff --git a/fw/build/fw_LABDOS_LABDOS_1024.120-CIBuild.hex b/fw/build/fw_LABDOS_LABDOS_1024.120-CIBuild.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_1024.120-CIBuild.with_bootloader.hex b/fw/build/fw_LABDOS_LABDOS_1024.120-CIBuild.with_bootloader.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_1024.121-CIBuild.hex b/fw/build/fw_LABDOS_LABDOS_1024.121-CIBuild.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_1024.121-CIBuild.with_bootloader.hex b/fw/build/fw_LABDOS_LABDOS_1024.121-CIBuild.with_bootloader.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_1024_16Mhz.120-CIBuild.hex b/fw/build/fw_LABDOS_LABDOS_1024_16Mhz.120-CIBuild.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_1024_16Mhz.120-CIBuild.with_bootloader.hex b/fw/build/fw_LABDOS_LABDOS_1024_16Mhz.120-CIBuild.with_bootloader.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_1024_16Mhz.121-CIBuild.hex b/fw/build/fw_LABDOS_LABDOS_1024_16Mhz.121-CIBuild.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_1024_16Mhz.121-CIBuild.with_bootloader.hex b/fw/build/fw_LABDOS_LABDOS_1024_16Mhz.121-CIBuild.with_bootloader.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_512.120-CIBuild.hex b/fw/build/fw_LABDOS_LABDOS_512.120-CIBuild.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_512.120-CIBuild.with_bootloader.hex b/fw/build/fw_LABDOS_LABDOS_512.120-CIBuild.with_bootloader.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_512.121-CIBuild.hex b/fw/build/fw_LABDOS_LABDOS_512.121-CIBuild.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_512.121-CIBuild.with_bootloader.hex b/fw/build/fw_LABDOS_LABDOS_512.121-CIBuild.with_bootloader.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_512_16Mhz.120-CIBuild.hex b/fw/build/fw_LABDOS_LABDOS_512_16Mhz.120-CIBuild.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_512_16Mhz.120-CIBuild.with_bootloader.hex b/fw/build/fw_LABDOS_LABDOS_512_16Mhz.120-CIBuild.with_bootloader.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_512_16Mhz.121-CIBuild.hex b/fw/build/fw_LABDOS_LABDOS_512_16Mhz.121-CIBuild.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_512_16Mhz.121-CIBuild.with_bootloader.hex b/fw/build/fw_LABDOS_LABDOS_512_16Mhz.121-CIBuild.with_bootloader.hex
diff --git a/fw/build/fw_UAVDOS_UAVDOS.24-CIBuild.hex → fw/build/fw_UAVDOS_UAVDOS.25-CIBuild.hex b/fw/build/fw_UAVDOS_UAVDOS.24-CIBuild.hex → fw/build/fw_UAVDOS_UAVDOS.25-CIBuild.hex
@@ -765,10 +765,10 @@
 :102FC000E1F7329704C07C916D9370836291AE17E4
 :102FD000BF07C8F3089510E0C3E8D0E004C0FE01C5
 :102FE0000E948B152196C438D107C9F7F894FFCFFA
-:102FF00000004F048000030001554156303000307E
-:103000003964636239383435306564613134633032
-:103010003365636566386534376333656138666682
-:10302000333631643965322C43494275696C64002A
+:102FF00000004F048000030001554156303000614D
+:103000003463313430656330396332616130623842
+:103010006532653134323464323364376432386255
+:10302000616262343965362C43494275696C6400CB
 :10303000234376616B2E2E2E0023486D6D6D2E2E50
 :103040002E0024444F532C4C4142444F53303141C5
 :103050002C00982F8A4291443771CFFBC0B5A5DB75

diff --git a/...DOS_UAVDOS.24-CIBuild.with_bootloader.hex → ...DOS_UAVDOS.25-CIBuild.with_bootloader.hex b/...DOS_UAVDOS.24-CIBuild.with_bootloader.hex → ...DOS_UAVDOS.25-CIBuild.with_bootloader.hex
@@ -766,10 +766,10 @@
 :102FC000E1F7329704C07C916D9370836291AE17E4
 :102FD000BF07C8F3089510E0C3E8D0E004C0FE01C5
 :102FE0000E948B152196C438D107C9F7F894FFCFFA
-:102FF00000004F048000030001554156303000307E
-:103000003964636239383435306564613134633032
-:103010003365636566386534376333656138666682
-:10302000333631643965322C43494275696C64002A
+:102FF00000004F048000030001554156303000614D
+:103000003463313430656330396332616130623842
+:103010006532653134323464323364376432386255
+:10302000616262343965362C43494275696C6400CB
 :10303000234376616B2E2E2E0023486D6D6D2E2E50
 :103040002E0024444F532C4C4142444F53303141C5
 :103050002C00982F8A4291443771CFFBC0B5A5DB75