Commit Graph

5527 Commits

Author SHA1 Message Date
04541b4a19
revert change
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build started...
2023-03-10 15:35:17 +01:00
4a386ad3d1
simplification
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-03-10 15:21:36 +01:00
6452242f2f
fix merge conflict properly
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-03-10 15:06:05 +01:00
79abd05820
Merge remote-tracking branch 'origin/develop' into feature_move_acs_event_handling_to_system
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-03-10 15:05:11 +01:00
793d6feaaa
Merge remote-tracking branch 'origin/develop' into feature_move_acs_event_handling_to_system
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-03-10 15:03:55 +01:00
8b6a03a3ab Merge pull request 'ACS Modes Refactoring' (#455) from acs-modes-refactoring into develop
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Reviewed-on: #455
2023-03-10 15:02:25 +01:00
b6fc9d65b7
changelog
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-03-10 15:01:59 +01:00
2e431668dd
larger event queues now
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build started...
2023-03-10 14:59:52 +01:00
37a32bb6e9
bump deps
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-10 14:37:02 +01:00
2f4f7f088e
add missing break
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-10 13:58:50 +01:00
0b09816b4a
bump tmtc
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-10 13:37:31 +01:00
c85c2cf4b6
this should be it for OBSW
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-10 13:17:46 +01:00
c80426309d fixed automatic switch between safe and detumble
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-03-10 12:50:18 +01:00
ba0bc1b98b anounce mode changes
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-03-10 12:46:26 +01:00
170976566b acsCtrl does not allow ON or NORMAL anymore
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-10 12:11:10 +01:00
b1c4241b03 changed perform operation
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-10 11:55:18 +01:00
98ba4a0449 Merge pull request 'Improve SD card manager' (#454) from improve_sd_card_manager into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #454
2023-03-10 11:36:36 +01:00
68c728cbdb
Merge remote-tracking branch 'origin/develop' into improve_sd_card_manager
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-10 11:19:29 +01:00
340b600599 Merge pull request 'Request MGM measurement twice' (#453) from smaller_tweaks into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #453
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-03-10 11:18:38 +01:00
3caa9dea75
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-10 11:18:34 +01:00
86e48eea6d
changelog update
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-03-10 11:16:02 +01:00
cca8734908
add it at actuate step as well
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-03-10 11:15:08 +01:00
a9b514ddc8
solved in different PR
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-03-10 11:12:44 +01:00
677a3f95bd
always update sd state file in blocking manner
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-10 02:45:21 +01:00
fae83a0fca
this should avoid lock issues al together 2023-03-10 02:29:28 +01:00
55bd87abb6
smaller tweaks
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-03-09 23:33:53 +01:00
38907fc0f5 Merge pull request 'set initial mode for system' (#452) from bugfix_set_initial_mode into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #452
2023-03-09 21:14:45 +01:00
f8d432f6eb
initial mode is off now
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-09 20:55:28 +01:00
dd8b6ced8f
set initial mode
Some checks failed
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-03-09 20:51:22 +01:00
42779e6ace Merge pull request 'Bugfix Heater Name' (#451) from bugfix_heater_name into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #451
2023-03-09 16:58:12 +01:00
9f9b1e440a
changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-03-09 16:52:47 +01:00
ac2c4c7abc
heater name bugfix
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-03-09 16:43:35 +01:00
087db386d7 Merge pull request 'prep v1.36.0' (#449) from prep_v1.36.0 into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #449
2023-03-08 19:23:45 +01:00
2f5f47a02c
tmtc bump
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop Build started...
2023-03-08 19:20:18 +01:00
8821cc1079
prep v1.36.0
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
2023-03-08 19:17:24 +01:00
14cea6369a Merge pull request 'add health handling for TCS ASSY' (#436) from bugfix_tcs_brd_assy into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #436
2023-03-08 19:12:34 +01:00
0a37db617b
tmtc update
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-03-08 19:12:10 +01:00
101117cebe
small fix
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-08 19:06:48 +01:00
4863dad1cd
changelog
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-08 18:59:22 +01:00
1154c0e887
move acs event handling to system
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-08 18:56:27 +01:00
c6289e27ae
Merge remote-tracking branch 'origin/develop' into bugfix_tcs_brd_assy
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-08 18:54:52 +01:00
6538005a30 Merge pull request 'Feature: STR Assembly' (#437) from feature_str_assy into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #437
2023-03-08 18:13:33 +01:00
fa5883bdf3
this contains a bit more now
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build started...
2023-03-08 18:12:37 +01:00
b261a4ecfa
works
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build started...
2023-03-08 18:09:50 +01:00
a6dfe02128
regenerate csvs
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-08 16:45:21 +01:00
bcd31c9248
wrong object ID
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-08 16:42:30 +01:00
bf73f2ff04 Merge remote-tracking branch 'origin/develop' into feature_str_assy
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-08 16:34:35 +01:00
b2a8c5d7ec Merge pull request 'avoid exceptions' (#447) from bugfix_create_dir_no_exceptions into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #447
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-03-08 15:07:56 +01:00
2dd97a55f8
fixes
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-08 14:59:50 +01:00
ccf03b131b
avoid exceptions
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-03-08 14:50:25 +01:00