|
|
06fe113d7f
|
that should be sufficient
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-07 15:33:48 +02:00 |
|
|
|
43d86c9aad
|
resolve merge conflicts properly
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-07 12:24:48 +02:00 |
|
|
|
c0ae25a973
|
Merge branch 'tcs-heater-upper-limit' into tcs-observability
|
2023-07-07 12:23:00 +02:00 |
|
|
|
fa85cc4d78
|
pls compile
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-07 12:22:37 +02:00 |
|
|
|
f7c49adea5
|
Merge branch 'tcs-heater-upper-limit' into tcs-observability
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
|
2023-07-07 12:06:51 +02:00 |
|
|
|
b662e220e1
|
bump tmtc
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
|
2023-07-07 12:06:39 +02:00 |
|
|
|
7337595d47
|
add event
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
|
2023-07-07 12:05:29 +02:00 |
|
|
|
f2f73b088d
|
add event
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
|
2023-07-07 12:03:34 +02:00 |
|
|
|
fce16cc695
|
Merge branch 'tcs-heater-upper-limit' into tcs-observability
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
|
2023-07-07 11:58:24 +02:00 |
|
|
|
ff7d0b3989
|
compile fixes
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-07 11:57:00 +02:00 |
|
|
|
6bf9fd5969
|
changelog
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
|
2023-07-07 11:51:11 +02:00 |
|
|
|
a7ab26d804
|
Merge branch 'tcs-heater-upper-limit' into tcs-observability
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
|
2023-07-07 11:50:32 +02:00 |
|
|
|
977e9f366f
|
Merge remote-tracking branch 'origin/main' into tcs-heater-upper-limit
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
|
2023-07-07 11:47:58 +02:00 |
|
|
|
b3d2fdc277
|
Merge pull request 'Another TCS fix' (#731) from another-tcs-fix into main
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #731
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
|
2023-07-07 11:47:27 +02:00 |
|
|
|
7388c4f661
|
Merge remote-tracking branch 'origin/main' into tcs-heater-upper-limit
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
|
2023-07-07 11:47:05 +02:00 |
|
|
|
a6461fcaf8
|
Merge remote-tracking branch 'origin/main' into another-tcs-fix
EIVE/eive-obsw/pipeline/pr-main Build queued...
|
2023-07-07 11:45:22 +02:00 |
|
|
|
6ae0fdf191
|
Merge pull request 'TCS CTRL bugfix' (#730) from tcs-ctrl-bugfix into main
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #730
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
|
2023-07-07 11:44:38 +02:00 |
|
|
|
3087049726
|
Merge branch 'main' into tcs-ctrl-bugfix
|
2023-07-07 11:44:27 +02:00 |
|
|
|
8255869f2d
|
Merge pull request 'Some TCS tweaks' (#729) from some-more-tcs-tweaks into main
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #729
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
|
2023-07-07 11:44:08 +02:00 |
|
|
|
603ddcef9c
|
Merge branch 'tcs-heater-upper-limit' into tcs-observability
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
|
2023-07-07 11:14:42 +02:00 |
|
|
|
0b673fcdec
|
Merge remote-tracking branch 'origin/main' into tcs-heater-upper-limit
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
|
2023-07-07 11:07:35 +02:00 |
|
|
|
908cf8dcc3
|
Merge remote-tracking branch 'origin/main' into another-tcs-fix
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-07 11:03:20 +02:00 |
|
|
|
ec39dc05ae
|
Merge remote-tracking branch 'origin/main' into tcs-ctrl-bugfix
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-07 11:02:43 +02:00 |
|
|
|
bd33a51bf1
|
Merge remote-tracking branch 'origin/main' into some-more-tcs-tweaks
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-07 11:00:45 +02:00 |
|
|
|
06a24da2b9
|
Merge pull request 'Add TCS CTRL heater events' (#728) from add-tcs-ctrl-heater-events into main
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #728
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
|
2023-07-07 10:59:36 +02:00 |
|
|
|
2bad2a142b
|
changelog
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-07 10:58:42 +02:00 |
|
|
|
b0b43b3ecc
|
Merge branch 'main' into some-more-tcs-tweaks
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-07 10:56:50 +02:00 |
|
|
|
c1a23e0d73
|
Merge remote-tracking branch 'origin/main' into add-tcs-ctrl-heater-events
EIVE/eive-obsw/pipeline/pr-main Build queued...
|
2023-07-07 10:56:38 +02:00 |
|
|
|
377cc64d0f
|
bump tmtc
EIVE/eive-obsw/pipeline/pr-main Build queued...
|
2023-07-07 10:55:39 +02:00 |
|
|
|
351c33e504
|
changelog
EIVE/eive-obsw/pipeline/pr-main Build queued...
|
2023-07-07 10:55:13 +02:00 |
|
|
|
a7a530cb59
|
Merge pull request 'More TMP1075 bugfixes' (#727) from more-tmp-bugfixes into main
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #727
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
|
2023-07-07 10:53:07 +02:00 |
|
|
|
f1ca4b174f
|
comment
EIVE/eive-obsw/pipeline/head This commit looks good
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-06 23:07:54 +02:00 |
|
|
|
027955597f
|
done
|
2023-07-06 23:06:50 +02:00 |
|
|
|
c558a117b0
|
some docs
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-06 22:21:00 +02:00 |
|
|
|
fc697732b4
|
Merge branch 'another-tcs-fix' into tcs-heater-upper-limit
|
2023-07-06 22:07:06 +02:00 |
|
|
|
ce19f30325
|
continue max heater duration
|
2023-07-06 22:06:54 +02:00 |
|
|
|
faffca0c2c
|
compile fix
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-06 20:19:05 +02:00 |
|
|
|
7b611810df
|
there are actually 8 heaters
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-06 20:13:33 +02:00 |
|
|
|
3e92d175d5
|
form fix
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
|
2023-07-06 20:01:57 +02:00 |
|
|
|
64ca329d5a
|
update changelog
EIVE/eive-obsw/pipeline/head Build started...
EIVE/eive-obsw/pipeline/pr-main There was a failure building this commit
|
2023-07-06 19:58:24 +02:00 |
|
|
|
12ff365433
|
TCS ctrl bugfix
EIVE/eive-obsw/pipeline/head There was a failure building this commit
|
2023-07-06 19:57:23 +02:00 |
|
|
|
5ea3bfeb7b
|
Merge branch 'main' into some-more-tcs-tweaks
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-06 19:12:01 +02:00 |
|
|
|
785c1c65a0
|
add new events
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-06 19:01:49 +02:00 |
|
|
|
3c9eec7b3f
|
heater events for TCS ctrl
EIVE/eive-obsw/pipeline/head Build started...
|
2023-07-06 18:58:57 +02:00 |
|
|
|
5630ae4962
|
changelog
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-06 17:28:12 +02:00 |
|
|
|
61ea80f92c
|
remove some cruft
EIVE/eive-obsw/pipeline/head Build queued...
EIVE/eive-obsw/pipeline/pr-main This commit looks good
|
2023-07-06 17:26:09 +02:00 |
|
|
|
6182218813
|
this works but is kind of ugly
EIVE/eive-obsw/pipeline/head Build started...
|
2023-07-06 17:23:55 +02:00 |
|
|
|
b7e4953126
|
the TCS subsystem does not work on the EM..
EIVE/eive-obsw/pipeline/head This commit looks good
|
2023-07-06 16:00:39 +02:00 |
|
|
|
ee4285075a
|
Merge pull request 'Swap PL and PS I2C' (#725) from swap-pl-ps-i2c into main
EIVE/eive-obsw/pipeline/head This commit looks good
Reviewed-on: #725
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
|
2023-07-06 15:05:53 +02:00 |
|
|
|
bda2ba79bf
|
Merge remote-tracking branch 'origin/main' into swap-pl-ps-i2c
EIVE/eive-obsw/pipeline/pr-main This commit looks good
make marius extremely happy
|
2023-07-06 14:34:12 +02:00 |
|
