Skip to content

Commit

Permalink
Merge branch 'FyzTyd2024' of github.com:UniversalScientificTechnologi…
Browse files Browse the repository at this point in the history
…es/AIRDOS04 into FyzTyd2024
  • Loading branch information
kaklik committed Jun 16, 2024
2 parents 7d48740 + b241837 commit 226617a
Show file tree
Hide file tree
Showing 8 changed files with 3,888 additions and 3,888 deletions.
2 changes: 1 addition & 1 deletion fw/AIRDOS04/githash.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file is overwritten by github actions, do not update it manually
String githash = "c41002ce861fd430e51909f334f2ecf3695395a6,User";
String githash = "15e7888167f7143e72ff2d918425b27bc1d8a111,User";
#define GHRELEASE 1
#define GHBUILD 0
#define GHBUILDTYPE User
2 changes: 1 addition & 1 deletion fw/AIRDOS04/nextversion
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
MAJOR 1
MINOR 1
RELEASE 1
BUILD 43
BUILD 44
8 changes: 4 additions & 4 deletions fw/build/fw_AIRDOS04X_AIRDOS04X.-CIBuild.hex
Original file line number Diff line number Diff line change
Expand Up @@ -1543,10 +1543,10 @@
:1060600004C07C916D9370836291AE17BF07C8F333
:10607000089511E0C0E1D1E004C0FE010E94EF2AC2
:0C6080002196C131D107C9F7F894FFCF79
:10608C0000008A0A800001FFFFFFFF6334313030CB
:10609C0032636538363166643433306535313930C6
:1060AC0039663333346632656366333639353339A2
:1060BC003561362C43494275696C6400312E312EA2
:10608C0000008A0A800001FFFFFFFF3135653738B9
:10609C0038383136376637313433653732666632E5
:1060AC006439313834323562323762633164386185
:1060BC003131312C43494275696C6400312E312EDB
:1060CC00302D2D43494275696C6400244849535462
:1060DC002C0023534420696E69742066616C7365CF
:1060EC00002353442066616C7365002E7478740031
Expand Down
6 changes: 3 additions & 3 deletions fw/build/fw_AIRDOS04X_AIRDOS04X.-CIBuild.with_bootloader.hex
Original file line number Diff line number Diff line change
Expand Up @@ -1544,9 +1544,9 @@
:1060600004C07C916D9370836291AE17BF07C8F333
:10607000089511E0C0E1D1E004C0FE010E94EF2AC2
:106080002196C131D107C9F7F894FFCF00008A0AE1
:10609000800001FFFFFFFF63343130303263653829
:1060A00036316664343330653531393039663333EF
:1060B0003466326563663336393533393561362CAB
:10609000800001FFFFFFFF31356537383838313672
:1060A00037663731343365373266663264393138B2
:1060B0003432356232376263316438613131312CC8
:1060C00043494275696C6400312E312E302D2D43C9
:1060D000494275696C640024484953542C00235389
:1060E0004420696E69742066616C736500235344B3
Expand Down
1,926 changes: 0 additions & 1,926 deletions fw/build/fw_AIRDOS04_AIRDOS04.42-CIBuild.hex

This file was deleted.

1,953 changes: 0 additions & 1,953 deletions fw/build/fw_AIRDOS04_AIRDOS04.42-CIBuild.with_bootloader.hex

This file was deleted.

1,926 changes: 1,926 additions & 0 deletions fw/build/fw_AIRDOS04_AIRDOS04.43-CIBuild.hex

Large diffs are not rendered by default.

1,953 changes: 1,953 additions & 0 deletions fw/build/fw_AIRDOS04_AIRDOS04.43-CIBuild.with_bootloader.hex

Large diffs are not rendered by default.

0 comments on commit 226617a

Please sign in to comment.