|
|
c496271a0e
|
Merge remote-tracking branch 'origin/develop' into add_heater_info_set
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-08 21:42:20 +01:00 |
|
|
|
3159574cfa
|
resolve more merge conflicts
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-08 21:41:19 +01:00 |
|
|
|
5542507024
|
changelog
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-08 21:40:09 +01:00 |
|
|
|
fa62f07dce
|
Merge remote-tracking branch 'origin/develop' into add_heater_info_set
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-02-08 21:39:27 +01:00 |
|
|
|
c61e8f6dd7
|
Merge pull request 'Heater Handling' (#325) from heater_handling into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #325
|
2023-02-08 21:35:04 +01:00 |
|
|
|
8d69996d4c
|
bump fsfw
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-08 21:27:42 +01:00 |
|
|
|
c843e34464
|
prep v1.26.2
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-08 21:22:07 +01:00 |
|
|
|
7eab7169f7
|
Merge remote-tracking branch 'origin/develop' into heater_handling
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
EIVE/eive-obsw/pipeline/head Build queued...
|
2023-02-08 21:17:33 +01:00 |
|
|
|
9d14788ef3
|
bump tmtc
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-08 21:11:24 +01:00 |
|
|
|
7ec8ca3356
|
updates
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-08 20:40:53 +01:00 |
|
|
|
fc61066848
|
Merge pull request 'PDEC evil fix' (#374) from pdec_evil_fix into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #374
|
2023-02-08 20:08:54 +01:00 |
|
|
|
cea0a28cee
|
bump changelog
EIVE/eive-obsw/pipeline/pr-develop Build queued...
|
2023-02-08 20:06:15 +01:00 |
|
|
|
557fe5a9a2
|
PDEC evil fix
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop Build started...
|
2023-02-08 20:01:56 +01:00 |
|
|
|
f7e59edaf2
|
Merge pull request 'ACS Update Scheduling' (#373) from acs_update_scheduling_again into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #373
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
|
2023-02-08 18:00:07 +01:00 |
|
|
|
4052534235
|
Merge remote-tracking branch 'origin/develop' into acs_update_scheduling_again
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-08 17:55:07 +01:00 |
|
|
|
ee885b516f
|
Merge pull request 'start replacing chained locks' (#372) from awesome_acs_branch into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #372
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
|
2023-02-08 17:52:07 +01:00 |
|
|
|
a4d551e420
|
Merge remote-tracking branch 'origin/develop' into mueller/pus-15-tm-storage
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-08 17:43:43 +01:00 |
|
|
|
b943fee515
|
changelog
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-08 17:17:19 +01:00 |
|
|
|
5f9a52977b
|
replaced all chained locks
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-08 17:02:59 +01:00 |
|
|
|
1d12d5f144
|
removed sensorValues inits
|
2023-02-08 17:02:22 +01:00 |
|
|
|
fddfa80f76
|
fix unittest
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-08 16:58:32 +01:00 |
|
|
|
c04936d0dc
|
Merge remote-tracking branch 'origin/develop' into heater_handling
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-02-08 16:54:07 +01:00 |
|
|
|
13b3fe03b8
|
afmt and changelog
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-08 16:46:30 +01:00 |
|
|
|
79a13b8b6a
|
update sched again
|
2023-02-08 16:45:19 +01:00 |
|
|
|
2e11f067e2
|
start replacing chained locks
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-08 15:30:14 +01:00 |
|
|
|
e1e6ce5d34
|
bump patch version, prep v1.26.1
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-08 15:03:22 +01:00 |
|
|
|
4528e61fcd
|
initialize ACS controller
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-08 15:02:56 +01:00 |
|
|
|
881f9ea7ea
|
prep v1.26.0
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-08 14:52:11 +01:00 |
|
|
|
b1da4bb81b
|
remove doubly scheduled ACS CTRL
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-08 14:33:48 +01:00 |
|
|
|
50d8d0b278
|
remove old unneeded IF ID
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-08 14:22:56 +01:00 |
|
|
|
7e0b30e845
|
ACS section separate
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2023-02-08 14:11:49 +01:00 |
|
|
|
349ebca08d
|
re-run generators
all associated changes and fixes
|
2023-02-08 14:11:11 +01:00 |
|
|
|
6dcec02377
|
Merge pull request 'Final Version of the ACS Controller' (#367) from eggert/acs into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #367
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
|
2023-02-08 13:50:10 +01:00 |
|
|
|
da166c7bc3
|
resolve merge conflicts
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-08 13:40:03 +01:00 |
|
|
|
80f48acb07
|
Merge remote-tracking branch 'origin/develop' into eggert/acs
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-02-08 13:27:09 +01:00 |
|
|
|
c1d8693d3c
|
Merge pull request 'ACS Update scheduling' (#366) from acs_update_scheduling into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #366
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
|
2023-02-08 13:23:33 +01:00 |
|
|
|
6ae0ee5b26
|
small update
EIVE/eive-obsw/pipeline/pr-develop Build started...
|
2023-02-08 13:23:05 +01:00 |
|
|
|
098fcc4f12
|
Merge branch 'develop' into eggert/acs
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-02-08 13:21:49 +01:00 |
|
|
|
bfa61632c2
|
use singular enum name
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-08 13:18:45 +01:00 |
|
|
|
e25eed7687
|
now it compiles
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-08 13:17:47 +01:00 |
|
|
|
4412690652
|
Merge remote-tracking branch 'origin/develop' into acs_update_scheduling
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-02-08 13:08:00 +01:00 |
|
|
|
7c53cafbbe
|
Merge pull request 'Some GPS updates' (#369) from some_more_gps_updates into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #369
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
|
2023-02-08 13:04:45 +01:00 |
|
|
|
f2629f1b51
|
Merge pull request 'MGM calibration fix' (#357) from eggert/mgm-calibration-fix into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #357
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
|
2023-02-08 13:02:40 +01:00 |
|
|
|
6fa1084d21
|
Merge remote-tracking branch 'origin/develop' into acs_update_scheduling
EIVE/eive-obsw/pipeline/pr-develop There was a failure building this commit
|
2023-02-08 13:01:21 +01:00 |
|
|
|
ba5621f4b7
|
Merge remote-tracking branch 'origin/develop' into some_more_gps_updates
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
|
2023-02-08 13:00:07 +01:00 |
|
|
|
fdb2b52f2f
|
Merge pull request 'Update version handling' (#371) from update_version_handling into develop
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #371
|
2023-02-08 11:57:49 +01:00 |
|
|
|
02f0349525
|
done
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-develop Build queued...
|
2023-02-08 11:53:20 +01:00 |
|
|
|
de95a1ba61
|
add new events
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-08 11:22:57 +01:00 |
|
|
|
b7ec4e3b20
|
bump tmtc
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-08 11:21:39 +01:00 |
|
|
|
37988fbfd4
|
complete impl
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-02-08 11:17:08 +01:00 |
|
