5306 Commits

Author SHA1 Message Date
dfb1e88f55
lockslockslocks 2023-03-02 15:32:12 +01:00
7b539e2fa5
rework lock handling 2023-03-02 15:22:21 +01:00
4b37a19644
try to use more locks with timeouts 2023-03-02 15:21:45 +01:00
b5049fa8d0 Merge pull request 'allow quicker startup' () from feature_allow_quicker_transition into develop
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-03-02 14:46:15 +01:00
652326443b Merge branch 'develop' into feature_allow_quicker_transition 2023-03-02 14:45:29 +01:00
d4b7c6493a Merge pull request 'CHANGELOG and tmtc' () from bugfixes_acs_polling into develop
Reviewed-on: 
2023-03-02 14:45:17 +01:00
4aa6ed4de4 Merge branch 'develop' into bugfixes_acs_polling 2023-03-02 14:45:08 +01:00
9067c4180e
bump tmtc 2023-03-02 14:48:00 +01:00
0056ebcb62
bump changelog 2023-03-02 14:46:20 +01:00
a2485a2195 Merge branch 'develop' into feature_allow_quicker_transition 2023-03-02 14:44:12 +01:00
eaa0fc6cbe
bump changelog 2023-03-02 14:43:50 +01:00
14188a4f3b
bugfixes imtq 2023-03-02 14:42:42 +01:00
eee92baa6e Merge pull request 'Set MGM3100 set valid and IMTQ handler bugfix' () from bugfixes_acs_polling into develop
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-03-02 14:41:39 +01:00
6104bf7adb
set MGM3100 set valid 2023-03-02 13:39:29 +01:00
8ff70462cb Merge branch 'develop' into feature_allow_quicker_transition 2023-03-02 10:10:23 +01:00
2e9de68e17 Merge pull request 'all SPI sched in now in same PST' () from rework_all_spi_sched_in_pst into develop
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-03-02 09:00:07 +01:00
8ad1daa11f changelog 2023-03-02 09:02:49 +01:00
4a820fba55
all SPI sched in now in same PST 2023-03-01 23:17:33 +01:00
d045498761
allow quicker transition 2023-03-01 19:03:18 +01:00
0a7eb6f6bc Merge pull request 'v1.33.0' () from v1.33.0 into develop
Reviewed-on: 
v1.33.0
2023-03-01 18:40:11 +01:00
3784cf688f
missing includes 2023-03-01 18:42:43 +01:00
f646566228
prep v1.33.0 2023-03-01 18:40:05 +01:00
58527dacf6
regenerate csvs 2023-03-01 18:38:55 +01:00
03cf5891b0 Merge pull request 'add profiling comment' () from profiling_comment into develop
Reviewed-on: 
2023-03-01 18:22:41 +01:00
1b79bfc02a
add profiling comment 2023-03-01 18:24:44 +01:00
3c6c990b8f Merge pull request 'Rework SUS polling' () from rework_sus_polling into develop
Reviewed-on: 
2023-03-01 18:12:54 +01:00
1252897a1c
cleaning up 2023-03-01 18:15:53 +01:00
22b2f137b4
changelog 2023-03-01 18:10:16 +01:00
c347b6d1d4
copy and pasta fixes 2023-03-01 18:09:33 +01:00
ef5bc9731d Merge branch 'develop' into rework_sus_polling 2023-03-01 16:58:28 +01:00
67128b398c
bugfix, seems to work now 2023-03-01 16:58:07 +01:00
c251d93305
wörkz 2023-03-01 16:36:21 +01:00
26aeb88d84
conitniue sus polling 2023-03-01 10:47:57 +01:00
11f476878d
rework SUS polling 2023-02-28 19:14:15 +01:00
db90c59557 Merge pull request 'compile warning fix and defensive programming' () from smaller_tweaks into develop
Reviewed-on: 
Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>
2023-02-28 18:02:40 +01:00
0fabe3adb6 Merge pull request 'Rework ACS board polling' () from rework_acs_board_polling into develop
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-02-28 15:01:22 +01:00
f2598b5c4c
small fix for sched blocks 2023-02-28 15:02:37 +01:00
f7573b4902 Merge remote-tracking branch 'origin/develop' into rework_acs_board_polling 2023-02-28 15:01:33 +01:00
9556ce6d9f Merge pull request 'that should fix the error printout' () from bugfix_read_only_check into develop
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-02-28 14:52:09 +01:00
6f1a2952d5 Merge branch 'develop' into bugfix_read_only_check 2023-02-28 14:52:02 +01:00
10807d577f
bump tmtc 2023-02-28 11:53:34 +01:00
6e6dff56f2 Merge remote-tracking branch 'origin/develop' into rework_acs_board_polling 2023-02-28 11:53:10 +01:00
959adcafb1 Merge branch 'develop' into smaller_tweaks 2023-02-28 11:48:05 +01:00
251dddc42d
compile warning fix and defensive programming 2023-02-28 01:53:48 +01:00
1129836112
that should fix the issue 2023-02-28 01:40:27 +01:00
d4923ac3e8
wörks 2023-02-28 01:25:25 +01:00
8e5adae8ef Merge pull request 'PDEC Config Persistent' () from meier/pdec-config-persistent into develop
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-02-27 18:33:51 +01:00
e9514b1c97
new MGM polling 2023-02-27 11:44:52 +01:00
Jakob Meier
c06dd15303 minor bugfix in PDEC Handler 2023-02-27 11:35:43 +01:00
Jakob Meier
89ba9f7009 removed class id header 2023-02-27 09:12:50 +01:00