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

…s/LABDOS01 into LABDOS01A, extended build
UniversalScientificTechnologies · Apr 21, 2023 · e28c018 · e28c018
1 parent bbefbb9
commit e28c018
Show file tree

Hide file tree

Showing 22 changed files with 10,264 additions and 10,262 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 = "73e623ea183e866381c243da276f04b76dd1652d,User";
+String githash = "71cdf196883fa3ab648ae47327ef2137eb69420f,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 2
+MINOR 3
 RELEASE 0
-BUILD 117
+BUILD 118
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 = "73e623ea183e866381c243da276f04b76dd1652d,User";
+String githash = "71cdf196883fa3ab648ae47327ef2137eb69420f,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 21
+BUILD 22
diff --git a/fw/build/fw_LABDOS_LABDOS_1024.116-CIBuild.hex b/fw/build/fw_LABDOS_LABDOS_1024.116-CIBuild.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_1024.116-CIBuild.with_bootloader.hex b/fw/build/fw_LABDOS_LABDOS_1024.116-CIBuild.with_bootloader.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_1024.117-CIBuild.hex b/fw/build/fw_LABDOS_LABDOS_1024.117-CIBuild.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_1024.117-CIBuild.with_bootloader.hex b/fw/build/fw_LABDOS_LABDOS_1024.117-CIBuild.with_bootloader.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_1024_16Mhz.116-CIBuild.hex b/fw/build/fw_LABDOS_LABDOS_1024_16Mhz.116-CIBuild.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_1024_16Mhz.116-CIBuild.with_bootloader.hex b/fw/build/fw_LABDOS_LABDOS_1024_16Mhz.116-CIBuild.with_bootloader.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_1024_16Mhz.117-CIBuild.hex b/fw/build/fw_LABDOS_LABDOS_1024_16Mhz.117-CIBuild.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_1024_16Mhz.117-CIBuild.with_bootloader.hex b/fw/build/fw_LABDOS_LABDOS_1024_16Mhz.117-CIBuild.with_bootloader.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_512.116-CIBuild.hex b/fw/build/fw_LABDOS_LABDOS_512.116-CIBuild.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_512.116-CIBuild.with_bootloader.hex b/fw/build/fw_LABDOS_LABDOS_512.116-CIBuild.with_bootloader.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_512.117-CIBuild.hex b/fw/build/fw_LABDOS_LABDOS_512.117-CIBuild.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_512.117-CIBuild.with_bootloader.hex b/fw/build/fw_LABDOS_LABDOS_512.117-CIBuild.with_bootloader.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_512_16Mhz.116-CIBuild.hex b/fw/build/fw_LABDOS_LABDOS_512_16Mhz.116-CIBuild.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_512_16Mhz.116-CIBuild.with_bootloader.hex b/fw/build/fw_LABDOS_LABDOS_512_16Mhz.116-CIBuild.with_bootloader.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_512_16Mhz.117-CIBuild.hex b/fw/build/fw_LABDOS_LABDOS_512_16Mhz.117-CIBuild.hex
diff --git a/fw/build/fw_LABDOS_LABDOS_512_16Mhz.117-CIBuild.with_bootloader.hex b/fw/build/fw_LABDOS_LABDOS_512_16Mhz.117-CIBuild.with_bootloader.hex
diff --git a/fw/build/fw_UAVDOS_UAVDOS.20-CIBuild.hex → fw/build/fw_UAVDOS_UAVDOS.21-CIBuild.hex b/fw/build/fw_UAVDOS_UAVDOS.20-CIBuild.hex → fw/build/fw_UAVDOS_UAVDOS.21-CIBuild.hex
@@ -766,9 +766,9 @@
 :102FD000BF07C8F3089510E0C3E8D0E004C0FE01C5
 :102FE0000E948B152196C438D107C9F7F894FFCFFA
 :102FF00000004F0480000300015541563030003777
-:1030000033653632336561313833653836363338B7
-:103010003163323433646132373666303462373686
-:10302000646431363532642C43494275696C6400FE
+:10300000316364663139363838336661336162362C
+:10301000343861653437333237656632313337657A
+:10302000623639343230662C43494275696C64002B
 :10303000234376616B2E2E2E0023486D6D6D2E2E50
 :103040002E0024444F532C4C4142444F53303141C5
 :103050002C00982F8A4291443771CFFBC0B5A5DB75

diff --git a/...DOS_UAVDOS.20-CIBuild.with_bootloader.hex → ...DOS_UAVDOS.21-CIBuild.with_bootloader.hex b/...DOS_UAVDOS.20-CIBuild.with_bootloader.hex → ...DOS_UAVDOS.21-CIBuild.with_bootloader.hex
@@ -767,9 +767,9 @@
 :102FD000BF07C8F3089510E0C3E8D0E004C0FE01C5
 :102FE0000E948B152196C438D107C9F7F894FFCFFA
 :102FF00000004F0480000300015541563030003777
-:1030000033653632336561313833653836363338B7
-:103010003163323433646132373666303462373686
-:10302000646431363532642C43494275696C6400FE
+:10300000316364663139363838336661336162362C
+:10301000343861653437333237656632313337657A
+:10302000623639343230662C43494275696C64002B
 :10303000234376616B2E2E2E0023486D6D6D2E2E50
 :103040002E0024444F532C4C4142444F53303141C5
 :103050002C00982F8A4291443771CFFBC0B5A5DB75