Commit Graph

6425 Commits

Author SHA1 Message Date
c37f26021c
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-24 21:36:31 +01:00
58e427d51d
small order fix
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-24 21:35:28 +01:00
3d93431278
prep v1.40.0
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
2023-03-24 21:34:03 +01:00
b301cbc750 Merge pull request 'improve sd lock handling again' (#523) from another_imrovement_sd_lock_handling into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #523
2023-03-24 21:29:39 +01:00
e69812b48b
improve sd lock handling again
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
2023-03-24 21:29:13 +01:00
0301c18af2
resolve some merge conflicts
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-24 21:20:27 +01:00
f71972609c
Merge remote-tracking branch 'origin/develop' into thermal_controller
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-03-24 21:15:29 +01:00
61c26fe53a Merge pull request 'Dual Lane Boards: Allow Side Switches' (#412) from feature_allow_side_switch into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #412
2023-03-24 21:10:55 +01:00
40c000b183
changelog
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-03-24 21:10:59 +01:00
bee8838010
Merge remote-tracking branch 'origin/develop' into feature_allow_side_switch
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-03-24 21:09:43 +01:00
ff25f6ff3f Merge pull request 'Finish COM and ACS restructuring' (#522) from cleaning_com_acs into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #522
2023-03-24 21:08:32 +01:00
dd28767d68
changelog
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-03-24 21:08:44 +01:00
13f269e6aa
fix unittest
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-03-24 21:08:00 +01:00
6331aef987
EM bugfix
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build started...
2023-03-24 21:05:11 +01:00
59d40a6794
finish acs and com
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop Build started...
2023-03-24 21:01:00 +01:00
29ba7b87b7
re-run generators
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-03-24 20:51:03 +01:00
87e1746d71
done 2023-03-24 20:50:33 +01:00
da386edd05
cleaniiing
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-03-24 20:03:35 +01:00
c40a192c48 Merge pull request 'more cleaning' (#521) from cleaning_com into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #521
2023-03-24 19:53:31 +01:00
58058bd402 Merge branch 'develop' into cleaning_com
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-03-24 19:53:18 +01:00
2fa5024236
more cleaning
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
2023-03-24 19:53:09 +01:00
3135bb923e
afmt 2023-03-24 19:49:08 +01:00
6f368ef01a Merge pull request 'Cleaning COM' (#520) from cleaning_com into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #520
2023-03-24 19:49:01 +01:00
d6409b6112
em adaption
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build started...
2023-03-24 19:47:48 +01:00
72598e2ae6
bump tmtc
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop Build started...
2023-03-24 19:43:37 +01:00
9dc0c5bde0
cleaning up com
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
2023-03-24 19:37:03 +01:00
ec40044b6e
some bugfixes
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-24 19:14:27 +01:00
bea0c31a12
Merge remote-tracking branch 'origin/develop' into feature_allow_side_switch
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-24 17:29:13 +01:00
04e5c212d7 Merge pull request 'bugfix fsfwgen' (#519) from bugfix_fsfwgen_duplicate_events into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #519
2023-03-24 15:40:04 +01:00
fe1fb9425e
bugfix fsfwgen
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
EIVE/eive-obsw/pipeline/head Build started...
2023-03-24 15:39:45 +01:00
8fa5777634 Merge pull request 'MEKF invalid handling fix' (#514) from mekf-invalid-reset-counter into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #514
2023-03-24 15:03:17 +01:00
613d7738a8
update generates files
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-03-24 15:02:13 +01:00
b32e0ef4fb
Merge remote-tracking branch 'origin/develop' into mekf-invalid-reset-counter 2023-03-24 15:01:01 +01:00
82a9dbd632 Merge pull request 'some bugfixes for custom CSP router' (#518) from custom_csp_router_task into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #518
2023-03-24 14:55:12 +01:00
7e35a0a481 Merge branch 'develop' into custom_csp_router_task
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-03-24 14:55:02 +01:00
7dc587e2df
some bugfixes
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-03-24 14:53:07 +01:00
1e1d41270b Merge pull request 'Refactoring Syrlinks COM' (#517) from refactoring_syrlinks_com_if into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #517
2023-03-24 14:49:07 +01:00
15b3144760 Merge branch 'develop' into refactoring_syrlinks_com_if
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build started...
2023-03-24 14:48:08 +01:00
d9284478c4 Merge pull request 'custom CSP router task' (#516) from custom_csp_router_task into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #516
2023-03-24 14:47:55 +01:00
74603f9969
Merge remote-tracking branch 'origin/develop' into refactoring_syrlinks_com_if
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-24 14:22:12 +01:00
69bb3922d3 Merge branch 'custom_csp_router_task' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into custom_csp_router_task
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-24 14:17:56 +01:00
52c439c501
Merge remote-tracking branch 'origin/develop' into custom_csp_router_task 2023-03-24 14:17:51 +01:00
f273eaccfb
bump submodules 2023-03-24 14:17:28 +01:00
5ec001652f Merge branch 'develop' into custom_csp_router_task
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-03-24 14:17:20 +01:00
cbbac0d7a9 Merge pull request 'some tweaks for busy handling' (#500) from tweak_papb_busy_polling into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #500
2023-03-24 14:15:00 +01:00
267f900545
changelog
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build started...
2023-03-24 14:15:01 +01:00
012e173487
okay this should work
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build started...
2023-03-24 14:11:08 +01:00
91b83d477b
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-24 13:28:27 +01:00
349332c1e1
adapt all priorities
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-24 13:26:27 +01:00
d226726a27
this is going to be annyoing
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-03-24 11:58:45 +01:00