|
|
dbc3868f47
|
Merge pull request 'minor tweaks for XADC code' (#736) from minor-xadc-tweak into main
Reviewed-on: #736
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
|
2023-07-11 09:40:05 +02:00 |
|
|
|
852f1203c6
|
changelog
|
2023-07-11 09:39:21 +02:00 |
|
|
|
643f8c5b54
|
Merge branch 'main' into minor-xadc-tweak
|
2023-07-11 09:38:14 +02:00 |
|
|
|
3fb083fd87
|
Merge pull request 'TCS improvements' (#735) from tcs-tweaks into main
Reviewed-on: #735
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
|
2023-07-11 09:37:57 +02:00 |
|
|
|
fdf1c7a611
|
seems to work now
|
2023-07-10 18:29:55 +02:00 |
|
|
|
cf582dd6a4
|
Merge branch 'bump-fsfw' into tcs-observability
|
2023-07-10 17:52:56 +02:00 |
|
|
|
c7f716c433
|
fsfw bump and changelog
|
2023-07-10 17:51:37 +02:00 |
|
|
|
d2dfc22373
|
Merge branch 'tcs-heater-upper-limit' into tcs-observability
|
2023-07-10 16:33:42 +02:00 |
|
|
|
53d53e8771
|
disable test case
|
2023-07-10 16:33:29 +02:00 |
|
|
|
84e37d8b7b
|
bump tmtc
|
2023-07-10 16:30:18 +02:00 |
|
|
|
7c4f98ec22
|
add back with other name and comment
|
2023-07-10 15:23:04 +02:00 |
|
|
|
a61d7901bf
|
Merge branch 'tcs-heater-upper-limit' into tcs-observability
|
2023-07-10 14:58:16 +02:00 |
|
|
|
7e01a9602e
|
TCS improvements
|
2023-07-10 14:46:35 +02:00 |
|
|
|
be1d1cf5bf
|
minor tweaks for XADC code
|
2023-07-10 14:15:56 +02:00 |
|
|
|
ce2755e161
|
that should be it
|
2023-07-10 13:56:30 +02:00 |
|
|
|
33de08eafc
|
this should be better
|
2023-07-10 13:28:36 +02:00 |
|
|
|
106d73238b
|
Merge remote-tracking branch 'origin/main' into tcs-heater-upper-limit
|
2023-07-10 13:07:26 +02:00 |
|
|
|
3f4a34d616
|
Merge pull request 'Make OBSW compatible to prospective FW v5.0.0' (#734) from tmp-devs-to-q7-i2c into main
Reviewed-on: #734
|
2023-07-10 11:19:35 +02:00 |
|
|
|
268f10ced5
|
COMPILE
|
2023-07-10 11:14:19 +02:00 |
|
|
|
647f3d00bb
|
this should do the job
|
2023-07-10 11:03:17 +02:00 |
|
|
|
2210ec3737
|
Merge branch 'tcs-heater-upper-limit' into tcs-observability
|
2023-07-07 16:21:42 +02:00 |
|
|
|
df3755d6cc
|
done
|
2023-07-07 16:18:16 +02:00 |
|
|
|
a351dcf99e
|
changelog
|
2023-07-07 15:59:15 +02:00 |
|
|
|
06fe113d7f
|
that should be sufficient
|
2023-07-07 15:33:48 +02:00 |
|
|
|
43d86c9aad
|
resolve merge conflicts properly
|
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
|
2023-07-07 12:22:37 +02:00 |
|
|
|
f7c49adea5
|
Merge branch 'tcs-heater-upper-limit' into tcs-observability
|
2023-07-07 12:06:51 +02:00 |
|
|
|
b662e220e1
|
bump tmtc
|
2023-07-07 12:06:39 +02:00 |
|
|
|
7337595d47
|
add event
|
2023-07-07 12:05:29 +02:00 |
|
|
|
f2f73b088d
|
add event
|
2023-07-07 12:03:34 +02:00 |
|
|
|
fce16cc695
|
Merge branch 'tcs-heater-upper-limit' into tcs-observability
|
2023-07-07 11:58:24 +02:00 |
|
|
|
ff7d0b3989
|
compile fixes
|
2023-07-07 11:57:00 +02:00 |
|
|
|
6bf9fd5969
|
changelog
|
2023-07-07 11:51:11 +02:00 |
|
|
|
a7ab26d804
|
Merge branch 'tcs-heater-upper-limit' into tcs-observability
|
2023-07-07 11:50:32 +02:00 |
|
|
|
977e9f366f
|
Merge remote-tracking branch 'origin/main' into tcs-heater-upper-limit
|
2023-07-07 11:47:58 +02:00 |
|
|
|
b3d2fdc277
|
Merge pull request 'Another TCS fix' (#731) from another-tcs-fix into main
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
|
2023-07-07 11:47:05 +02:00 |
|
|
|
a6461fcaf8
|
Merge remote-tracking branch 'origin/main' into another-tcs-fix
|
2023-07-07 11:45:22 +02:00 |
|
|
|
6ae0fdf191
|
Merge pull request 'TCS CTRL bugfix' (#730) from tcs-ctrl-bugfix into main
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
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
|
2023-07-07 11:14:42 +02:00 |
|
|
|
0b673fcdec
|
Merge remote-tracking branch 'origin/main' into tcs-heater-upper-limit
|
2023-07-07 11:07:35 +02:00 |
|
|
|
908cf8dcc3
|
Merge remote-tracking branch 'origin/main' into another-tcs-fix
|
2023-07-07 11:03:20 +02:00 |
|
|
|
ec39dc05ae
|
Merge remote-tracking branch 'origin/main' into tcs-ctrl-bugfix
|
2023-07-07 11:02:43 +02:00 |
|
|
|
bd33a51bf1
|
Merge remote-tracking branch 'origin/main' into some-more-tcs-tweaks
|
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
Reviewed-on: #728
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
|
2023-07-07 10:59:36 +02:00 |
|
|
|
2bad2a142b
|
changelog
|
2023-07-07 10:58:42 +02:00 |
|
|
|
b0b43b3ecc
|
Merge branch 'main' into some-more-tcs-tweaks
|
2023-07-07 10:56:50 +02:00 |
|
