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

…s/LABDOS01 into LABDOS01A
UniversalScientificTechnologies · Dec 8, 2023 · a4c140e · a4c140e
2 parents 7330783 + d8ff8d3
commit a4c140e
Show file tree

Hide file tree

Showing 14 changed files with 59 additions and 59 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 = "b7b5d52f50649c658c81e64f7c1a3c5abdc06e3b,User";
+String githash = "09dcb98450eda14c03ecef8e47c3ea8ff361d9e2,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 3
+MINOR 4
 RELEASE 0
-BUILD 120
+BUILD 121
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 = "b7b5d52f50649c658c81e64f7c1a3c5abdc06e3b,User";
+String githash = "09dcb98450eda14c03ecef8e47c3ea8ff361d9e2,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 24
+BUILD 25
diff --git a/...ild/fw_LABDOS_LABDOS_1024.119-CIBuild.hex → ...ild/fw_LABDOS_LABDOS_1024.120-CIBuild.hex b/...ild/fw_LABDOS_LABDOS_1024.119-CIBuild.hex → ...ild/fw_LABDOS_LABDOS_1024.120-CIBuild.hex
@@ -1231,17 +1231,17 @@
 :104CE0006291AE17BF07C8F3089510E0CDE8D0E099
 :104CF00004C0FE010E94B3232196CE38D107C9F724
 :044D0000F894FFCF55
-:104D04000000C5058000010002FFFFFFFF6237625B
-:104D14003564353266353036343963363538633880
-:104D24003165363466376331613363356162646398
-:104D340030366533622C43494275696C6400372E02
-:104D4400332E302D3131392D43494275696C642E2F
+:104D04000000C5058000010002FFFFFFFF30396489
+:104D14006362393834353065646131346330336506
+:104D24006365663865343763336561386666333680
+:104D340031643965322C43494275696C6400372EFD
+:104D4400342E302D3132302D43494275696C642E36
 :104D54004C3530300024484953542C00235344200C
 :104D6400696E69742066616C736500235344206620
 :104D7400616C7365002E747874002346696C656EEB
 :104D8400616D652C00234376616B2E2E2E00234823
 :104D94006D6D6D2E2E2E0024444F532C4C414244F5
-:104DA4004F533031412C002346696C6573697A6531
+:104DA4004F533031422C002346696C6573697A6530
 :104DB4002C00000000006C079B073F076B074207AD
 :104DC40049075C0700000000720A880A3F07A50A29
 :104DD400580BC40ACE0A2F00000000009D185D1F66

diff --git a/...BDOS_1024.119-CIBuild.with_bootloader.hex → ...BDOS_1024.120-CIBuild.with_bootloader.hex b/...BDOS_1024.119-CIBuild.with_bootloader.hex → ...BDOS_1024.120-CIBuild.with_bootloader.hex
@@ -1232,16 +1232,16 @@
 :104CE0006291AE17BF07C8F3089510E0CDE8D0E099
 :104CF00004C0FE010E94B3232196CE38D107C9F724
 :104D0000F894FFCF0000C5058000010002FFFFFFFF
-:104D1000FF62376235643532663530363439633692
-:104D2000353863383165363466376331613363351E
-:104D30006162646330366533622C43494275696C45
-:104D40006400372E332E302D3131392D43494275D1
+:104D1000FF30396463623938343530656461313469
+:104D2000633033656365663865343763336561388E
+:104D30006666333631643965322C43494275696C95
+:104D40006400372E342E302D3132302D43494275D8
 :104D5000696C642E4C3530300024484953542C0083
 :104D600023534420696E69742066616C7365002367
 :104D700053442066616C7365002E7478740023467A
 :104D8000696C656E616D652C00234376616B2E2E18
 :104D90002E0023486D6D6D2E2E2E0024444F532C73
-:104DA0004C4142444F533031412C002346696C65DD
+:104DA0004C4142444F533031422C002346696C65DC
 :104DB00073697A652C00000000006C079B073F07B1
 :104DC0006B07420749075C0700000000720A880A67
 :104DD0003F07A50A580BC40ACE0A2F0000000000A6

diff --git a/..._LABDOS_LABDOS_1024_16Mhz.119-CIBuild.hex → ..._LABDOS_LABDOS_1024_16Mhz.120-CIBuild.hex b/..._LABDOS_LABDOS_1024_16Mhz.119-CIBuild.hex → ..._LABDOS_LABDOS_1024_16Mhz.120-CIBuild.hex
@@ -1232,17 +1232,17 @@
 :104CF000E1F7329704C07C916D9370836291AE1797
 :104D0000BF07C8F3089510E0CDE8D0E004C0FE016D
 :104D10000E94C1232196CE38D107C9F7F894FFCF5E
-:104D20000000C5058000010002FFFFFFFF6237623F
-:104D30003564353266353036343963363538633864
-:104D4000316536346637633161336335616264637C
-:104D500030366533622C43494275696C6400372EE6
-:104D6000332E302D3131392D43494275696C642E13
+:104D20000000C5058000010002FFFFFFFF3039646D
+:104D300063623938343530656461313463303365EA
+:104D40006365663865343763336561386666333664
+:104D500031643965322C43494275696C6400372EE1
+:104D6000342E302D3132302D43494275696C642E1A
 :104D70004C3530300024484953542C0023534420F0
 :104D8000696E69742066616C736500235344206604
 :104D9000616C7365002E747874002346696C656ECF
 :104DA000616D652C00234376616B2E2E2E00234807
 :104DB0006D6D6D2E2E2E0024444F532C4C414244D9
-:104DC0004F533031412C002346696C6573697A6515
+:104DC0004F533031422C002346696C6573697A6514
 :104DD0002C00000000006B079A073E076A07410796
 :104DE00048075B0700000000710A870A3E07A40A13
 :104DF000570BC30ACD0A2F0000000000A5186B1F37

diff --git a/...024_16Mhz.119-CIBuild.with_bootloader.hex → ...024_16Mhz.120-CIBuild.with_bootloader.hex b/...024_16Mhz.119-CIBuild.with_bootloader.hex → ...024_16Mhz.120-CIBuild.with_bootloader.hex
@@ -1233,17 +1233,17 @@
 :104CF000E1F7329704C07C916D9370836291AE1797
 :104D0000BF07C8F3089510E0CDE8D0E004C0FE016D
 :104D10000E94C1232196CE38D107C9F7F894FFCF5E
-:104D20000000C5058000010002FFFFFFFF6237623F
-:104D30003564353266353036343963363538633864
-:104D4000316536346637633161336335616264637C
-:104D500030366533622C43494275696C6400372EE6
-:104D6000332E302D3131392D43494275696C642E13
+:104D20000000C5058000010002FFFFFFFF3039646D
+:104D300063623938343530656461313463303365EA
+:104D40006365663865343763336561386666333664
+:104D500031643965322C43494275696C6400372EE1
+:104D6000342E302D3132302D43494275696C642E1A
 :104D70004C3530300024484953542C0023534420F0
 :104D8000696E69742066616C736500235344206604
 :104D9000616C7365002E747874002346696C656ECF
 :104DA000616D652C00234376616B2E2E2E00234807
 :104DB0006D6D6D2E2E2E0024444F532C4C414244D9
-:104DC0004F533031412C002346696C6573697A6515
+:104DC0004F533031422C002346696C6573697A6514
 :104DD0002C00000000006B079A073E076A07410796
 :104DE00048075B0700000000710A870A3E07A40A13
 :104DF000570BC30ACD0A2F0000000000A5186B1F37

diff --git a/...uild/fw_LABDOS_LABDOS_512.119-CIBuild.hex → ...uild/fw_LABDOS_LABDOS_512.120-CIBuild.hex b/...uild/fw_LABDOS_LABDOS_512.119-CIBuild.hex → ...uild/fw_LABDOS_LABDOS_512.120-CIBuild.hex
@@ -1232,17 +1232,17 @@
 :104CF00004C07C916D9370836291AE17BF07C8F3B7
 :104D0000089510E0CDE8D0E004C0FE010E94BF236A
 :0C4D10002196CE38D107C9F7F894FFCFE8
-:104D1C000000C7058000010001FFFFFFFF62376242
-:104D2C003564353266353036343963363538633868
-:104D3C003165363466376331613363356162646380
-:104D4C0030366533622C43494275696C6400372EEA
-:104D5C00332E302D3131392D43494275696C642E17
+:104D1C000000C7058000010001FFFFFFFF30396470
+:104D2C0063623938343530656461313463303365EE
+:104D3C006365663865343763336561386666333668
+:104D4C0031643965322C43494275696C6400372EE5
+:104D5C00342E302D3132302D43494275696C642E1E
 :104D6C004C3234340024484953542C0023534420EF
 :104D7C00696E69742066616C736500235344206608
 :104D8C00616C7365002E747874002346696C656ED3
 :104D9C00616D652C00234376616B2E2E2E0023480B
 :104DAC006D6D6D2E2E2E0024444F532C4C414244DD
-:104DBC004F533031412C0030002346696C657369C8
+:104DBC004F533031422C0030002346696C657369C7
 :104DCC007A652C00000000007807A7074B077707CF
 :104DDC004E0755076807000000007E0A940A4B072F
 :104DEC00B10A640BD00ADA0A2F0000000000A918DF

diff --git a/...ABDOS_512.119-CIBuild.with_bootloader.hex → ...ABDOS_512.120-CIBuild.with_bootloader.hex b/...ABDOS_512.119-CIBuild.with_bootloader.hex → ...ABDOS_512.120-CIBuild.with_bootloader.hex
@@ -1233,17 +1233,17 @@
 :104CF00004C07C916D9370836291AE17BF07C8F3B7
 :104D0000089510E0CDE8D0E004C0FE010E94BF236A
 :104D10002196CE38D107C9F7F894FFCF0000C70518
-:104D20008000010001FFFFFFFF623762356435320A
-:104D30006635303634396336353863383165363464
-:104D4000663763316133633561626463303665337E
-:104D5000622C43494275696C6400372E332E302D26
-:104D60003131392D43494275696C642E4C323434EB
+:104D20008000010001FFFFFFFF3039646362393802
+:104D300034353065646131346330336563656638BA
+:104D40006534376333656138666633363164396597
+:104D5000322C43494275696C6400372E342E302D55
+:104D60003132302D43494275696C642E4C323434F3
 :104D70000024484953542C0023534420696E69741D
 :104D80002066616C7365002353442066616C736513
 :104D9000002E747874002346696C656E616D652C15
 :104DA00000234376616B2E2E2E0023486D6D6D2EF1
 :104DB0002E2E0024444F532C4C4142444F5330314B
-:104DC000412C0030002346696C6573697A652C00BC
+:104DC000422C0030002346696C6573697A652C00BB
 :104DD000000000007807A7074B0777074E07550725
 :104DE0006807000000007E0A940A4B07B10A640BB2
 :104DF000D00ADA0A2F0000000000A918691F4B072B

diff --git a/...w_LABDOS_LABDOS_512_16Mhz.119-CIBuild.hex → ...w_LABDOS_LABDOS_512_16Mhz.120-CIBuild.hex b/...w_LABDOS_LABDOS_512_16Mhz.119-CIBuild.hex → ...w_LABDOS_LABDOS_512_16Mhz.120-CIBuild.hex
@@ -1234,17 +1234,17 @@
 :104D10006D9370836291AE17BF07C8F3089510E0DA
 :104D2000CDE8D0E004C0FE010E94CD232196CE380C
 :084D3000D107C9F7F894FFCF89
-:104D38000000C7058000010001FFFFFFFF62376226
-:104D4800356435326635303634396336353863384C
-:104D58003165363466376331613363356162646364
-:104D680030366533622C43494275696C6400372ECE
-:104D7800332E302D3131392D43494275696C642EFB
+:104D38000000C7058000010001FFFFFFFF30396454
+:104D480063623938343530656461313463303365D2
+:104D5800636566386534376333656138666633364C
+:104D680031643965322C43494275696C6400372EC9
+:104D7800342E302D3132302D43494275696C642E02
 :104D88004C3234340024484953542C0023534420D3
 :104D9800696E69742066616C7365002353442066EC
 :104DA800616C7365002E747874002346696C656EB7
 :104DB800616D652C00234376616B2E2E2E002348EF
 :104DC8006D6D6D2E2E2E0024444F532C4C414244C1
-:104DD8004F533031412C0030002346696C657369AC
+:104DD8004F533031422C0030002346696C657369AB
 :104DE8007A652C00000000007707A6074A077607B7
 :104DF8004D0754076707000000007D0A930A4A0719
 :104E0800B00A630BCF0AD90A2F0000000000B118BE

diff --git a/...512_16Mhz.119-CIBuild.with_bootloader.hex → ...512_16Mhz.120-CIBuild.with_bootloader.hex b/...512_16Mhz.119-CIBuild.with_bootloader.hex → ...512_16Mhz.120-CIBuild.with_bootloader.hex
@@ -1235,16 +1235,16 @@
 :104D10006D9370836291AE17BF07C8F3089510E0DA
 :104D2000CDE8D0E004C0FE010E94CD232196CE380C
 :104D3000D107C9F7F894FFCF0000C7058000010034
-:104D400001FFFFFFFF62376235643532663530366A
-:104D50003439633635386338316536346637633114
-:104D6000613363356162646330366533622C434975
-:104D70004275696C6400372E332E302D3131392D58
+:104D400001FFFFFFFF303964636239383435306565
+:104D50006461313463303365636566386534376365
+:104D6000336561386666333631643965322C4349C0
+:104D70004275696C6400372E342E302D3132302D5F
 :104D800043494275696C642E4C32343400244849DE
 :104D900053542C0023534420696E69742066616C5F
 :104DA0007365002353442066616C7365002E74782C
 :104DB00074002346696C656E616D652C0023437633
 :104DC000616B2E2E2E0023486D6D6D2E2E2E00242D
-:104DD000444F532C4C4142444F533031412C00300E
+:104DD000444F532C4C4142444F533031422C00300D
 :104DE000002346696C6573697A652C000000000039
 :104DF0007707A6074A0776074D075407670700009D
 :104E000000007D0A930A4A07B00A630BCF0AD90A49

diff --git a/fw/build/fw_UAVDOS_UAVDOS.23-CIBuild.hex → fw/build/fw_UAVDOS_UAVDOS.24-CIBuild.hex b/fw/build/fw_UAVDOS_UAVDOS.23-CIBuild.hex → fw/build/fw_UAVDOS_UAVDOS.24-CIBuild.hex
@@ -765,10 +765,10 @@
 :102FC000E1F7329704C07C916D9370836291AE17E4
 :102FD000BF07C8F3089510E0C3E8D0E004C0FE01C5
 :102FE0000E948B152196C438D107C9F7F894FFCFFA
-:102FF00000004F048000030001554156303000624C
-:1030000037623564353266353036343963363538B3
-:1030100063383165363466376331613363356162F5
-:10302000646330366533622C43494275696C6400D1
+:102FF00000004F048000030001554156303000307E
+:103000003964636239383435306564613134633032
+:103010003365636566386534376333656138666682
+:10302000333631643965322C43494275696C64002A
 :10303000234376616B2E2E2E0023486D6D6D2E2E50
 :103040002E0024444F532C4C4142444F53303141C5
 :103050002C00982F8A4291443771CFFBC0B5A5DB75

diff --git a/...DOS_UAVDOS.23-CIBuild.with_bootloader.hex → ...DOS_UAVDOS.24-CIBuild.with_bootloader.hex b/...DOS_UAVDOS.23-CIBuild.with_bootloader.hex → ...DOS_UAVDOS.24-CIBuild.with_bootloader.hex
@@ -766,10 +766,10 @@
 :102FC000E1F7329704C07C916D9370836291AE17E4
 :102FD000BF07C8F3089510E0C3E8D0E004C0FE01C5
 :102FE0000E948B152196C438D107C9F7F894FFCFFA
-:102FF00000004F048000030001554156303000624C
-:1030000037623564353266353036343963363538B3
-:1030100063383165363466376331613363356162F5
-:10302000646330366533622C43494275696C6400D1
+:102FF00000004F048000030001554156303000307E
+:103000003964636239383435306564613134633032
+:103010003365636566386534376333656138666682
+:10302000333631643965322C43494275696C64002A
 :10303000234376616B2E2E2E0023486D6D6D2E2E50
 :103040002E0024444F532C4C4142444F53303141C5
 :103050002C00982F8A4291443771CFFBC0B5A5DB75