Commit Graph

5795 Commits

Author SHA1 Message Date
3c6eb265c7
PLOC SUPV dummy has switch now
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-03-16 18:52:32 +01:00
b1d2f73b01
move Switches enum
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-03-16 18:47:51 +01:00
eda1f7e212
syrlinks event works
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-16 18:28:51 +01:00
56a4378a63
that should be transition safe
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-16 18:05:23 +01:00
a16671762d
Merge remote-tracking branch 'origin/develop' into thermal_controller
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-16 17:48:17 +01:00
350ed59033
handle syrlinks overheating in COM SS
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-15 17:13:25 +01:00
52ab77eded Merge pull request 'Init Boot Mode' (#474) from feature_boot_sequence_eive_sys into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #474
2023-03-15 16:29:18 +01:00
4ff1548cf2 Merge branch 'develop' into feature_boot_sequence_eive_sys 2023-03-15 16:29:11 +01:00
f6d1a41cb9 Merge pull request 'tweak scheduling frequencies' (#471) from feature_scheduling_tweaks into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #471
2023-03-15 16:28:36 +01:00
1623dd1c80 Merge branch 'develop' into feature_scheduling_tweaks
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-03-15 16:28:26 +01:00
e3c41dd807 Merge pull request 'ACS Safe Ctrl Failure Event' (#484) from acs-safe-mode-failure into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #484
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-03-15 16:27:42 +01:00
096253a9a3 Merge branch 'feature_scheduling_tweaks' into thermal_controller
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-15 16:25:13 +01:00
11e5866f31
added some defines
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-15 16:24:46 +01:00
9b8092fb09
this seems to work
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-15 16:24:01 +01:00
f546df50a1 Merge branch 'feature_boot_sequence_eive_sys' into thermal_controller
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-15 16:21:14 +01:00
2f263c6aa6
small bugfix
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-15 16:21:05 +01:00
8201a4140a
works better now
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-15 16:19:37 +01:00
364342855d
maybe force a mode command?
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-15 15:52:20 +01:00
c688a51838 Merge remote-tracking branch 'origin/feature_boot_sequence_eive_sys' into thermal_controller 2023-03-15 15:52:14 +01:00
8c83ec78fd Merge branch 'develop' into feature_boot_sequence_eive_sys
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-15 15:51:38 +01:00
715a69db89
this should cover upper bound checking when heater is off
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-15 15:43:20 +01:00
dc44af5b29
copy and paste error
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-15 15:20:47 +01:00
27f29eda40
small error
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-15 15:16:12 +01:00
50a62b9243
sth broke..
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-15 15:13:53 +01:00
da7c450e06
most temps should be valid now
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-15 15:00:06 +01:00
a92fa31cb5
better variable names, tweaks for less init events
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-15 14:56:26 +01:00
d273621419
some tweaks
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-15 14:36:18 +01:00
f229ebb141
Merge remote-tracking branch 'origin/develop' into feature_scheduling_tweaks
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-15 14:16:21 +01:00
64ec76bfb7 Merge branch 'develop' into thermal_controller
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-15 14:14:56 +01:00
a2f2e1b84e Merge pull request 'some user code fixes' (#487) from bump_fsfw into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #487
2023-03-15 14:14:43 +01:00
19753c43f1 Merge branch 'develop' into bump_fsfw
Some checks are pending
EIVE/eive-obsw/pipeline/pr-develop Build queued...
2023-03-15 14:14:31 +01:00
69525b6fd1
bump fsfw
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-03-15 14:10:53 +01:00
c1d8eda2c7 Merge remote-tracking branch 'origin/develop' into thermal_controller 2023-03-15 14:10:36 +01:00
7ab01687ce
some user code fixes
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-15 11:49:01 +01:00
22076ea25e Merge pull request 'bump fsfw' (#486) from bump_fsfw into develop
Some checks failed
EIVE/eive-obsw/pipeline/head There was a failure building this commit
Reviewed-on: #486
2023-03-15 11:42:21 +01:00
7c54e920ef
bump fsfw
Some checks are pending
EIVE/eive-obsw/pipeline/head Build queued...
2023-03-15 11:42:03 +01:00
be848ea5e4
changelog update
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-15 11:32:58 +01:00
8dd22b6ea0 Merge branch 'develop' into feature_scheduling_tweaks
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-15 11:31:55 +01:00
d894479f75
Merge remote-tracking branch 'origin/develop' into acs-safe-mode-failure
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-15 11:29:06 +01:00
37e128041f Merge pull request 'Reset RW dataset on shutdown' (#485) from rw-dataset-reset into develop
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #485
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
2023-03-15 11:27:29 +01:00
bab0bbf82d changelog
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-15 10:38:00 +01:00
7d9be35cb4 reset relevant datasets on shutdown 2023-03-15 10:36:25 +01:00
95a4d88ed4 cleanup
Some checks are pending
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-15 10:17:24 +01:00
102228100e reran event gens
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-03-15 10:10:47 +01:00
c4fe772fe7 changelog
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
2023-03-15 10:08:58 +01:00
ccf1fcaa79 stuff 2023-03-15 10:06:24 +01:00
4fdb2de510 Merge branch 'develop' into acs-safe-mode-failure
# Conflicts:
#	CHANGELOG.md
#	mission/controller/AcsController.cpp
#	mission/controller/AcsController.h
2023-03-15 10:06:02 +01:00
8b11302028
unittest works again
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
2023-03-14 20:35:49 +01:00
c1b4a1c164 Merge branch 'thermal_controller' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into thermal_controller
Some checks failed
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
2023-03-14 20:04:03 +01:00
58212d7081 Merge remote-tracking branch 'origin/develop' into thermal_controller 2023-03-14 20:04:00 +01:00