|
c8d09debf7
|
Merge remote-tracking branch 'origin/develop' into feature_imtq_assy
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-05 16:20:53 +01:00 |
|
|
1938addaa8
|
Merge pull request 'v1.35.0' (#431) from prep_next_release into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #431
|
2023-03-04 17:17:05 +01:00 |
|
|
e6b5ee65f3
|
prep v1.35.0
EIVE/eive-obsw/pipeline/head Build started...
|
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' (#430) from imtq-cmd-fix into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #430
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
|
2023-03-04 17:07:06 +01:00 |
|
|
f96fbf707d
|
PR in changelog
EIVE/eive-obsw/pipeline/pr-develop Build queued...
|
2023-03-04 17:09:51 +01:00 |
|
|
80115640ba
|
changelog
EIVE/eive-obsw/pipeline/pr-develop Build queued...
|
2023-03-04 17:09:24 +01:00 |
|
|
4c1b79fd66
|
that was an evil bug
EIVE/eive-obsw/pipeline/pr-develop Build started...
|
2023-03-04 17:06:23 +01:00 |
|
|
c8a2395d61
|
a lot of bugfixes for IMTQ
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-04 14:32:18 +01:00 |
|
|
f6f3f17505
|
changelog
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
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
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-04 10:46:02 +01:00 |
|
|
cfbc53792d
|
Merge pull request 'Watchdog Extension' (#404) from feature_watchdog_extension into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #404
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
EIVE/eive-obsw/pipeline/pr-develop Build queued...
|
2023-03-04 10:45:37 +01:00 |
|
|
773e1c9ecc
|
fixed UB on startup
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-04 10:33:47 +01:00 |
|
|
f041655378
|
use dipoleSet or overwrite it in case of external command
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-04 10:15:51 +01:00 |
|
|
f209ac6b2d
|
Merge remote-tracking branch 'origin/develop' into feature_imtq_assy
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-03 17:03:55 +01:00 |
|
|
b20266f153
|
Merge pull request 'v1.34.0' (#429) from prep_v1.34.0 into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #429
|
2023-03-03 16:50:10 +01:00 |
|
|
e6b0b4048c
|
changelog eive-tmtc version
EIVE/eive-obsw/pipeline/head Build queued...
|
2023-03-03 16:52:38 +01:00 |
|
|
982db82ddb
|
bump tmtc
EIVE/eive-obsw/pipeline/head Build started...
|
2023-03-03 16:52:10 +01:00 |
|
|
0d175951ec
|
some missing changelog entries
EIVE/eive-obsw/pipeline/head Build started...
|
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' (#428) from hotfixees into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #428
|
2023-03-03 16:03:55 +01:00 |
|
|
05be170890
|
hotfixees
EIVE/eive-obsw/pipeline/head Build started...
|
2023-03-03 16:06:38 +01:00 |
|
|
1e4766ddfc
|
Merge pull request 'lockfix' (#427) from hotfix_acs_brd_polling into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #427
|
2023-03-03 15:36:45 +01:00 |
|
|
8720dacb7f
|
Merge branch 'develop' into hotfix_acs_brd_polling
EIVE/eive-obsw/pipeline/pr-develop Build queued...
|
2023-03-03 15:36:35 +01:00 |
|
|
39bf9f9b5b
|
Merge pull request 'Possible Bugfix: Use system clock in Countdown' (#426) from bugfix_countdown_uses_sysclock into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #426
|
2023-03-03 15:31:29 +01:00 |
|
|
2165f34a28
|
Merge remote-tracking branch 'origin/develop' into bugfix_countdown_uses_sysclock
EIVE/eive-obsw/pipeline/pr-develop Build queued...
|
2023-03-03 15:30:18 +01:00 |
|
|
70e1d41a08
|
Merge pull request 'rework lock handling in rtd handler' (#424) from tweaks_rtd_locks into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #424
|
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' (#423) from smaller_lock_tweaks into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #423
|
2023-03-03 15:21:35 +01:00 |
|
|
cc3bcdfaeb
|
Merge branch 'develop' into smaller_lock_tweaks
EIVE/eive-obsw/pipeline/pr-develop Build queued...
|
2023-03-03 15:21:24 +01:00 |
|
|
26f9c499d8
|
Merge pull request 'acs hotfix v2' (#425) from acs-hotfix-the-second into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #425
|
2023-03-03 15:20:59 +01:00 |
|
|
59e165be4f
|
lockfix
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-03-03 15:10:52 +01:00 |
|
|
53133573e1
|
measurement base code and comment
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop Build queued...
|
2023-03-03 14:58:03 +01:00 |
|
|
7a7f25a638
|
lets see if this fixes issues
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-03-03 14:36:52 +01:00 |
|
|
ec2ec32af4
|
actually use the stuff i wrote
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-03 11:56:31 +01:00 |
|
|
fcba76b7f1
|
rework lock handling in rtd handler
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-03 11:43:47 +01:00 |
|
|
60afb573a0
|
comment
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-03 11:06:30 +01:00 |
|
|
ff50203fbb
|
smaller lock tweaks
EIVE/eive-obsw/pipeline/head Build started...
|
2023-03-03 11:04:08 +01:00 |
|
|
da72b3a96a
|
Merge pull request 'fixed that mgm value was overwritten in wrong unit' (#422) from acs-mgm-vector-hotfix into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #422
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
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop Build started...
|
2023-03-03 10:51:12 +01:00 |
|
|
245b5dfcc6
|
Merge pull request 'Rework Lock Handling' (#419) from rework_lock_handling into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #419
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
|
2023-03-03 09:13:32 +01:00 |
|
|
04e3d2486d
|
Merge remote-tracking branch 'origin/develop' into feature_imtq_assy
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-02 18:40:11 +01:00 |
|
|
c4ef164f41
|
Merge branch 'develop' into rework_lock_handling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-02 18:29:45 +01:00 |
|
|
39bb90eb61
|
Merge pull request 'Fixed units in ACS Control Laws Safe and Detumble' (#421) from acs-units-fix into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #421
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
|
2023-03-02 18:28:39 +01:00 |
|
|
7a4a42c692
|
Merge branch 'develop' into acs-units-fix
EIVE/eive-obsw/pipeline/pr-develop Build queued...
|
2023-03-02 18:28:24 +01:00 |
|
|
21ed43614e
|
Merge pull request 'Health handling for SUS assy' (#418) from bugfix_sus_brd_assy into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #418
|
2023-03-02 18:26:55 +01:00 |
|
|
7288a5edbd
|
go to off immediately
EIVE/eive-obsw/pipeline/pr-develop Build started...
|
2023-03-02 18:27:27 +01:00 |
|
|
d55daebabf
|
Merge remote-tracking branch 'origin/develop' into bugfix_sus_brd_assy
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-02 18:04:29 +01:00 |
|