7704 Commits

Author SHA1 Message Date
55dcb3595b
this might fix the device 2023-09-07 16:28:55 +02:00
0337104173
another small bugfix 2023-09-07 16:09:43 +02:00
5a1b2470f0
some structure clean up 2023-09-07 16:07:59 +02:00
c51fbb9074
add recovery handling 2023-09-07 16:05:51 +02:00
58961efb3f
that should get the job done 2023-09-07 16:03:36 +02:00
f9f6ac27e8
Merge remote-tracking branch 'origin/main' into relax-sus-fdir 2023-09-07 15:41:59 +02:00
1b295139a0 Merge pull request 'Features for v6.5.0' () from features-v6.5.0 into main
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-09-07 15:12:14 +02:00
cfbd6d3b1e changelog 2023-09-06 14:38:19 +02:00
63b6db258c params for new safe mode 2023-09-06 14:37:04 +02:00
c709bd0881 changelog 2023-09-06 14:35:40 +02:00
a81eae7726 exchange nominal and 1st redundancy sensor for ploc mission board 2023-09-06 14:34:15 +02:00
a39da169d8 Merge pull request 'Bump Submodules' () from bump-submodules into main
Reviewed-on: 
v6.4.1
2023-08-21 18:53:54 +02:00
4f335ea270 bump tmtc 2023-08-21 18:49:49 +02:00
90b4a4d8c0 bump fsfw 2023-08-21 18:36:01 +02:00
3acdb54fab Merge pull request 'Prep v6.4.1' () from prep-v6.4.1 into main
Reviewed-on: 
2023-08-21 18:23:12 +02:00
6048ffe656 prep 2023-08-21 16:01:56 +02:00
5060de1f6d Merge pull request 'Fix for MAG Field Vector calculation' () from mgm4-disabled-fix into main
Reviewed-on: 
2023-08-21 14:51:29 +02:00
26bf178b2a changelog 2023-08-21 14:41:16 +02:00
b9167c7e22 valid check now includes allowed use of mgm4 2023-08-21 14:33:55 +02:00
b97afc9f1c Merge pull request 'PDEC Corrupted Config Event Parameters' () from meier/pdec-event-params into main
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-08-21 09:20:30 +02:00
a1d360502f changelog 2023-08-21 09:14:16 +02:00
Jakob Meier
ddbf4a5ff0 run auto formatter 2023-08-19 06:37:39 +02:00
Jakob Meier
6febf6242a pdec config corrupted event, readback config used as parameters 2023-08-19 06:33:31 +02:00
da71aea101 Merge pull request 'event fix for file corruption' () from persistent-tm-store-event-fix into main
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-08-17 16:45:12 +02:00
df397f6dee
changelog 2023-08-17 10:28:55 +02:00
e148e95471
event fix for file corruption 2023-08-17 10:27:33 +02:00
b11461c2f7 Merge pull request 'missing changelog entry' () from ploc-supv-changelog into main
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-08-16 13:58:04 +02:00
1748d18852
missing changelog entry 2023-08-16 10:57:02 +02:00
8a1e6bc5d2 Merge pull request 'date correction' () from prep_v6.4.0 into main
Reviewed-on: 
v6.4.0
2023-08-16 10:54:50 +02:00
72fc99dc49
date correction 2023-08-16 10:54:02 +02:00
3652b6cfad Merge pull request 'PLOC SUPV periodic HK' () from ploc-supv-periodic-hk into main
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-08-15 18:56:11 +02:00
d1a446d445
hopefully dont need this const 2023-08-15 14:43:23 +02:00
e64e9daed1
bump eive-tmtc 2023-08-15 14:42:12 +02:00
963ca0c939
PLOC SUPV 2023-08-15 14:34:10 +02:00
2d18ce4ff1
adapt changelog 2023-08-15 13:59:59 +02:00
0b35585449 Merge branch 'prep_v6.4.0' into ploc-supv-periodic-hk 2023-08-15 13:59:47 +02:00
af5f51928b
PLOC SUPV periodic HK 2023-08-15 13:49:06 +02:00
6919ab9455 Merge pull request 'new event, bump tmtc' () from new-event into main
Reviewed-on: 
2023-08-15 13:32:44 +02:00
e4545d0515
new event, bump tmtc 2023-08-15 13:29:46 +02:00
fb2995575b
prep next version 2023-08-15 13:26:45 +02:00
77e3b8c359 Merge pull request 'PDEC corrupted Config Event' () from meier/pdec-config-readback into main
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-08-15 13:24:02 +02:00
63b483b71a
Merge remote-tracking branch 'origin/main' into meier/pdec-config-readback 2023-08-15 13:22:42 +02:00
e24212207f Merge remote-tracking branch 'origin/main' into meier/pdec-config-readback 2023-08-15 13:21:53 +02:00
2ed010327f Merge pull request 'Improve Safe Strat State Machine' () from safe-strat-improvement into main
Reviewed-on: 
2023-08-15 13:19:14 +02:00
181d355741
bump tmtc 2023-08-15 13:17:08 +02:00
0fb57064d3 Merge remote-tracking branch 'origin/main' into safe-strat-improvement 2023-08-15 13:16:58 +02:00
2526873be2 Merge pull request 'Rework PDEC FDIR' () from rework-pdec-fdir into main
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-08-15 11:23:54 +02:00
bda57d9bd1
Merge remote-tracking branch 'origin/main' into meier/pdec-config-readback 2023-08-15 10:50:02 +02:00
6fc50f164e Merge remote-tracking branch 'origin/main' into rework-pdec-fdir 2023-08-15 10:49:17 +02:00
41ff0cc9ac
Merge remote-tracking branch 'origin/main' into safe-strat-improvement 2023-08-15 10:48:49 +02:00