5391 Commits

Author SHA1 Message Date
b64cc8f404 Merge branch 'develop' into bugfix_watchdog_init 2023-03-06 11:34:27 +01:00
acae88c67c Merge pull request 'More buffer time' () from bugfix_imtq_timing into develop
Reviewed-on: 
2023-03-06 11:33:39 +01:00
4fa5aa6b84
remove printout and re-polling 2023-03-06 11:28:25 +01:00
b48a6e2318
24 ms it takes.. 2023-03-06 11:11:35 +01:00
193ed01bce
fix printouts 2023-03-06 11:06:38 +01:00
d18a0e98a5
why do we need so much buffer time? 2023-03-06 11:02:56 +01:00
6e10ccd2d6
More buffer time 2023-03-06 09:17:03 +01:00
3b61697615
refactored FIFO handling 2023-03-06 00:55:12 +01:00
f82cc2aeda
probably contains app name as well 2023-03-05 20:06:06 +01:00
1938addaa8 Merge pull request 'v1.35.0' () from prep_next_release into develop
Reviewed-on: 
v1.35.0
2023-03-04 17:17:05 +01:00
e6b5ee65f3
prep v1.35.0 2023-03-04 17:19:36 +01:00
4d6ccaeb4b
changelog update 2023-03-04 17:12:56 +01:00
3003a4c4d1 Merge pull request 'IMTQ Commanding Fix' () from imtq-cmd-fix into develop
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-03-04 17:07:06 +01:00
f96fbf707d
PR in changelog 2023-03-04 17:09:51 +01:00
80115640ba
changelog 2023-03-04 17:09:24 +01:00
4c1b79fd66
that was an evil bug 2023-03-04 17:06:23 +01:00
c8a2395d61
a lot of bugfixes for IMTQ 2023-03-04 14:32:18 +01:00
f6f3f17505
changelog 2023-03-04 12:01:15 +01:00
300f3230d1
bump fsfw 2023-03-04 12:00:38 +01:00
c71a1a29f3 Merge branch 'develop' into imtq-cmd-fix 2023-03-04 10:46:02 +01:00
cfbc53792d Merge pull request 'Watchdog Extension' () from feature_watchdog_extension into develop
Reviewed-on: 
Reviewed-by: Jakob Meier <meierj@irs.uni-stuttgart.de>
2023-03-04 10:45:48 +01:00
5b5489c8da Merge branch 'develop' into feature_watchdog_extension 2023-03-04 10:45:37 +01:00
773e1c9ecc fixed UB on startup 2023-03-04 10:33:47 +01:00
f041655378 use dipoleSet or overwrite it in case of external command 2023-03-04 10:15:51 +01:00
b20266f153 Merge pull request 'v1.34.0' () from prep_v1.34.0 into develop
Reviewed-on: 
v1.34.0
2023-03-03 16:50:10 +01:00
e6b0b4048c
changelog eive-tmtc version 2023-03-03 16:52:38 +01:00
982db82ddb
bump tmtc 2023-03-03 16:52:10 +01:00
0d175951ec
some missing changelog entries 2023-03-03 16:49:21 +01:00
3b383b98df
prep v1.34.0 2023-03-03 16:45:25 +01:00
41f1eaec44 Merge pull request 'hotfixees' () from hotfixees into develop
Reviewed-on: 
2023-03-03 16:03:55 +01:00
05be170890
hotfixees 2023-03-03 16:06:38 +01:00
1e4766ddfc Merge pull request 'lockfix' () from hotfix_acs_brd_polling into develop
Reviewed-on: 
2023-03-03 15:36:45 +01:00
8720dacb7f Merge branch 'develop' into hotfix_acs_brd_polling 2023-03-03 15:36:35 +01:00
39bf9f9b5b Merge pull request 'Possible Bugfix: Use system clock in Countdown' () from bugfix_countdown_uses_sysclock into develop
Reviewed-on: 
2023-03-03 15:31:29 +01:00
2165f34a28
Merge remote-tracking branch 'origin/develop' into bugfix_countdown_uses_sysclock 2023-03-03 15:30:18 +01:00
70e1d41a08 Merge pull request 'rework lock handling in rtd handler' () from tweaks_rtd_locks into develop
Reviewed-on: 
2023-03-03 15:21:57 +01:00
3b0490835c Merge branch 'develop' into tweaks_rtd_locks 2023-03-03 15:21:46 +01:00
6c7d1e674c Merge pull request 'Smaller lock tweaks' () from smaller_lock_tweaks into develop
Reviewed-on: 
2023-03-03 15:21:35 +01:00
cc3bcdfaeb Merge branch 'develop' into smaller_lock_tweaks 2023-03-03 15:21:24 +01:00
26f9c499d8 Merge pull request 'acs hotfix v2' () from acs-hotfix-the-second into develop
Reviewed-on: 
2023-03-03 15:20:59 +01:00
59e165be4f lockfix 2023-03-03 15:10:52 +01:00
53133573e1 measurement base code and comment 2023-03-03 14:58:03 +01:00
7a7f25a638 lets see if this fixes issues 2023-03-03 14:36:52 +01:00
ec2ec32af4 actually use the stuff i wrote 2023-03-03 11:56:31 +01:00
fcba76b7f1
rework lock handling in rtd handler 2023-03-03 11:43:47 +01:00
60afb573a0
comment 2023-03-03 11:06:30 +01:00
ff50203fbb
smaller lock tweaks 2023-03-03 11:04:08 +01:00
da72b3a96a Merge pull request 'fixed that mgm value was overwritten in wrong unit' () from acs-mgm-vector-hotfix into develop
Reviewed-on: 
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-03-03 10:53:12 +01:00
1cf3fbaabe fixed that mgm value was overwritten in wrong unit 2023-03-03 10:51:12 +01:00
245b5dfcc6 Merge pull request 'Rework Lock Handling' () from rework_lock_handling into develop
Reviewed-on: 
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-03-03 09:13:32 +01:00