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

…s/AIRDOS04 into AIRDOS04A
UniversalScientificTechnologies · Dec 19, 2023 · e9b3d01 · e9b3d01
2 parents f2f9120 + b512341
commit e9b3d01
Show file tree

Hide file tree

Showing 12 changed files with 18,121 additions and 22 deletions.
diff --git a/fw/AIRDOS04/githash.h b/fw/AIRDOS04/githash.h
@@ -1,5 +1,5 @@
 // This file is overwritten by github actions, do not update it manually
-String githash = "9b5cf9571b15da03150b04ad0d93ecf7ad6cea92,User";
+String githash = "fa714456a1656f776ce252b96f4c1c9a42ef939c,User";
 #define GHRELEASE 2
 #define GHBUILD 0
 #define GHBUILDTYPE User
diff --git a/fw/AIRDOS04/nextversion b/fw/AIRDOS04/nextversion
@@ -2,4 +2,4 @@
 MAJOR 1
 MINOR 0
 RELEASE 2
-BUILD 18
+BUILD 19
diff --git a/fw/build/fw_AIRDOS04X_AIRDOS04X.-Release.hex → fw/build/fw_AIRDOS04X_AIRDOS04X.-CIBuild.hex b/fw/build/fw_AIRDOS04X_AIRDOS04X.-Release.hex → fw/build/fw_AIRDOS04X_AIRDOS04X.-CIBuild.hex
@@ -1543,11 +1543,11 @@
 :1060600004C07C916D9370836291AE17BF07C8F333
 :10607000089511E0C0E1D1E004C0FE010E94EF2AC2
 :0C6080002196C131D107C9F7F894FFCF79
-:10608C0000008A0A800001FFFFFFFF39623563665A
-:10609C003935373162313564613033313530623006
-:1060AC0034616430643933656366376164366365C3
-:1060BC006139322C52656C6561736500312E302E5E
-:1060CC00302D2D52656C656173650024484953541D
+:10608C0000008A0A800001FFFFFFFF666137313490
+:10609C0034353661313635366637373663653235E9
+:1060AC00326239366634633163396134326566394C
+:1060BC003339632C43494275696C6400312E302EA0
+:1060CC00302D2D43494275696C6400244849535462
 :1060DC002C0023534420696E69742066616C7365CF
 :1060EC00002353442066616C7365002E7478740031
 :1060FC002346696C656E616D652C002442415454D5

diff --git a/...4X_AIRDOS04X.-Release.with_bootloader.hex → ...4X_AIRDOS04X.-CIBuild.with_bootloader.hex b/...4X_AIRDOS04X.-Release.with_bootloader.hex → ...4X_AIRDOS04X.-CIBuild.with_bootloader.hex
@@ -1544,11 +1544,11 @@
 :1060600004C07C916D9370836291AE17BF07C8F333
 :10607000089511E0C0E1D1E004C0FE010E94EF2AC2
 :106080002196C131D107C9F7F894FFCF00008A0AE1
-:10609000800001FFFFFFFF39623563663935373114
-:1060A00062313564613033313530623034616430AF
-:1060B0006439336563663761643663656139322CF0
-:1060C00052656C6561736500312E302E302D2D5276
-:1060D000656C656173650024484953542C00235353
+:10609000800001FFFFFFFF66613731343435366120
+:1060A00031363536663737366365323532623936E2
+:1060B0006634633163396134326566393339632C50
+:1060C00043494275696C6400312E302E302D2D43CA
+:1060D000494275696C640024484953542C00235389
 :1060E0004420696E69742066616C736500235344B3
 :1060F0002066616C7365002E747874002346696CA9
 :10610000656E616D652C0024424154542C0023437C

diff --git a/fw/build/fw_AIRDOS04_AIRDOS04.17-Release.hex → fw/build/fw_AIRDOS04_AIRDOS04.18-CIBuild.hex b/fw/build/fw_AIRDOS04_AIRDOS04.17-Release.hex → fw/build/fw_AIRDOS04_AIRDOS04.18-CIBuild.hex
@@ -1573,11 +1573,11 @@
 :1062400070836291AE17BF07C8F3089511E0C0E1F3
 :10625000D1E004C0FE010E94DC2B2196C131D107A0
 :06626000C9F7F894FFCF1E
-:1062660000008E0A800001FFFFFFFF39623563667A
-:10627600393537316231356461303331353062302A
-:1062860034616430643933656366376164366365E7
-:106296006139322C52656C6561736500312E302E82
-:1062A600312D31372D52656C65617365002448497F
+:1062660000008E0A800001FFFFFFFF6661373134B0
+:10627600343536613136353666373736636532350D
+:106286003262393666346331633961343265663970
+:106296003339632C43494275696C6400312E302EC4
+:1062A600322D31382D43494275696C6400244849C2
 :1062B60053542C0023534420696E69742066616C24
 :1062C6007365002353442066616C7365002E7478F1
 :1062D60074002346696C656E616D652C002442412D

diff --git a/...4_AIRDOS04.17-Release.with_bootloader.hex → ...4_AIRDOS04.18-CIBuild.with_bootloader.hex b/...4_AIRDOS04.17-Release.with_bootloader.hex → ...4_AIRDOS04.18-CIBuild.with_bootloader.hex
@@ -1574,11 +1574,11 @@
 :1062400070836291AE17BF07C8F3089511E0C0E1F3
 :10625000D1E004C0FE010E94DC2B2196C131D107A0
 :10626000C9F7F894FFCF00008E0A800001FFFFFFFE
-:10627000FF396235636639353731623135646130F3
-:10628000333135306230346164306439336563668C
-:106290003761643663656139322C52656C656173B0
-:1062A0006500312E302E312D31372D52656C6561F0
-:1062B00073650024484953542C0023534420696ECD
+:10627000FF6661373134343536613136353666374D
+:1062800037366365323532623936663463316339A5
+:106290006134326566393339632C43494275696C20
+:1062A0006400312E302E322D31382D43494275692C
+:1062B0006C640024484953542C0023534420696ED5
 :1062C00069742066616C7365002353442066616CB9
 :1062D0007365002E747874002346696C656E616D79
 :1062E000652C0024424154542C00234376616B2ECC

diff --git a/notebooks/.ipynb_checkpoints/calibration-checkpoint.ipynb b/notebooks/.ipynb_checkpoints/calibration-checkpoint.ipynb
diff --git a/notebooks/.ipynb_checkpoints/fik9-checkpoint.ipynb b/notebooks/.ipynb_checkpoints/fik9-checkpoint.ipynb
diff --git a/notebooks/.ipynb_checkpoints/parser-checkpoint.ipynb b/notebooks/.ipynb_checkpoints/parser-checkpoint.ipynb
@@ -0,0 +1,6 @@
+{
+ "cells": [],
+ "metadata": {},
+ "nbformat": 4,
+ "nbformat_minor": 5
+}
diff --git a/notebooks/calibration.ipynb b/notebooks/calibration.ipynb
diff --git a/notebooks/fik9.ipynb b/notebooks/fik9.ipynb
diff --git a/notebooks/parser.ipynb b/notebooks/parser.ipynb