|
|
1623dd1c80
|
Merge branch 'develop' into feature_scheduling_tweaks
EIVE/eive-obsw/pipeline/pr-develop Build queued...
|
2023-03-15 16:28:26 +01:00 |
|
|
|
94ae33a554
|
Merge branch 'develop' into refactoring_bugfixes_power_switching
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 16:27:54 +01:00 |
|
|
|
e3c41dd807
|
Merge pull request 'ACS Safe Ctrl Failure Event' (#484) from acs-safe-mode-failure into develop
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
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 16:25:13 +01:00 |
|
|
|
11e5866f31
|
added some defines
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 16:24:46 +01:00 |
|
|
|
9b8092fb09
|
this seems to work
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
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 16:21:14 +01:00 |
|
|
|
2f263c6aa6
|
small bugfix
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 16:21:05 +01:00 |
|
|
|
8201a4140a
|
works better now
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 16:19:37 +01:00 |
|
|
|
364342855d
|
maybe force a mode command?
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
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
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 15:43:20 +01:00 |
|
|
|
dc44af5b29
|
copy and paste error
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 15:20:47 +01:00 |
|
|
|
27f29eda40
|
small error
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 15:16:12 +01:00 |
|
|
|
50a62b9243
|
sth broke..
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
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
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 14:56:26 +01:00 |
|
|
|
d273621419
|
some tweaks
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
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
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
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
EIVE/eive-obsw/pipeline/pr-develop Build queued...
|
2023-03-15 14:14:31 +01:00 |
|
|
|
69525b6fd1
|
bump fsfw
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
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
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
EIVE/eive-obsw/pipeline/head Build queued...
|
2023-03-15 11:42:03 +01:00 |
|
|
|
be848ea5e4
|
changelog update
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
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 11:31:55 +01:00 |
|
|
|
53c38d9c05
|
Merge remote-tracking branch 'origin/develop' into acs-ctrl-finite-check
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 11:31:31 +01:00 |
|
|
|
d894479f75
|
Merge remote-tracking branch 'origin/develop' into acs-safe-mode-failure
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
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
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
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
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-03-15 10:10:47 +01:00 |
|
|
|
c4fe772fe7
|
changelog
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 |
|
|
|
5e2f7fa3ed
|
reran gens
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-03-15 09:39:46 +01:00 |
|
|
|
7ddfdc0978
|
post merge fix
|
2023-03-15 09:38:31 +01:00 |
|
|
|
bb895c9e12
|
Merge branch 'develop' into acs-ctrl-finite-check
|
2023-03-15 09:37:15 +01:00 |
|
|
|
8b11302028
|
unittest works again
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
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 |
|
|
|
a6e6ee053d
|
Merge branch 'develop' into thermal_controller
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-03-14 20:03:29 +01:00 |
|
|
|
3eb5fc7f47
|
Merge pull request 'patch for v1.37.2' (#483) from patch_v1.37.2 into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #483
|
2023-03-14 20:03:00 +01:00 |
|
|
|
533aaa207c
|
bump version
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop Build queued...
|
2023-03-14 20:02:39 +01:00 |
|
|
|
005d5a5223
|
prep patch version
|
2023-03-14 20:02:27 +01:00 |
|
