|
|
0cefef8a35
|
rough but possible fix..
|
2023-07-13 16:38:20 +02:00 |
|
|
|
d3f3a3efd0
|
Merge branch 'smaller-str-fix' into str_set_time
|
2023-07-13 14:57:53 +02:00 |
|
|
|
6398532462
|
only enable STR set for normal mode
|
2023-07-13 14:57:24 +02:00 |
|
|
|
16f26d7758
|
afmt
|
2023-07-13 14:52:32 +02:00 |
|
|
|
0e3980dc37
|
this works
|
2023-07-13 14:52:07 +02:00 |
|
|
|
cc7e39c484
|
Merge remote-tracking branch 'origin/main' into str_set_time
|
2023-07-13 13:26:41 +02:00 |
|
|
|
448e24e69f
|
Merge branch 'str_set_time' of https://egit.irs.uni-stuttgart.de/eive/eive-obsw into str_set_time
|
2023-07-13 13:21:56 +02:00 |
|
|
|
70c4f8f3fd
|
Merge pull request 'v6.1.0' (#740) from prep_v6.1.0 into main
Reviewed-on: #740
v6.1.0
|
2023-07-13 13:07:07 +02:00 |
|
|
|
1f44533b3e
|
bump minor version
|
2023-07-13 12:00:57 +02:00 |
|
|
|
863c0af2a1
|
what the hell is wrong with the thing?
|
2023-07-13 10:53:58 +02:00 |
|
|
|
0fb85883a5
|
always add STR, rename set field
|
2023-07-13 10:16:52 +02:00 |
|
|
|
965c8d21cc
|
Merge branch 'main' into str_set_time
|
2023-07-13 10:09:38 +02:00 |
|
|
|
546053f95a
|
Merge pull request 'STR tests' (#739) from startracker-tests into main
Reviewed-on: #739
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
|
2023-07-13 09:33:03 +02:00 |
|
|
|
608eecb091
|
this is realy buggy somewhere..
|
2023-07-12 18:33:02 +02:00 |
|
|
|
ff432a4194
|
what the hell is wrong here..
|
2023-07-12 18:17:00 +02:00 |
|
|
|
e9d48687d7
|
i hate this stupid class
|
2023-07-12 17:59:07 +02:00 |
|
|
|
735c60d4c2
|
Merge branch 'startracker-tests' into str_set_time
|
2023-07-12 17:11:15 +02:00 |
|
|
|
770d9b7ad3
|
Merge remote-tracking branch 'origin/main' into str_set_time
|
2023-07-12 17:06:18 +02:00 |
|
|
|
86f7d05526
|
changelog
|
2023-07-12 17:03:17 +02:00 |
|
|
|
8cc5220dd0
|
remove printout
|
2023-07-12 17:02:52 +02:00 |
|
|
|
a800ad6c9a
|
Merge remote-tracking branch 'origin/main' into startracker-tests
|
2023-07-12 16:58:49 +02:00 |
|
|
|
887bfc87c3
|
Merge pull request 'use correct clock API in TCS CTRL' (#738) from small-tcs-fix into main
Reviewed-on: #738
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
|
2023-07-12 10:29:47 +02:00 |
|
|
|
54309b512f
|
use correct clock API
|
2023-07-11 17:29:27 +02:00 |
|
|
|
74859dd5c6
|
Merge pull request 'TCS Observability' (#733) from tcs-observability into main
Reviewed-on: #733
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
|
2023-07-11 16:47:58 +02:00 |
|
|
|
13e965948c
|
TCS observability
|
2023-07-11 13:52:41 +02:00 |
|
|
|
46bb602c96
|
bump tmtc
|
2023-07-11 11:01:32 +02:00 |
|
|
|
72dbc34936
|
Merge remote-tracking branch 'origin/main' into tcs-observability
|
2023-07-11 11:00:03 +02:00 |
|
|
|
55affe5a42
|
Merge pull request 'TCS heater upper burn limit' (#732) from tcs-heater-upper-limit into main
Reviewed-on: #732
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
|
2023-07-11 10:56:42 +02:00 |
|
|
|
914a22f642
|
Merge branch 'main' into tcs-heater-upper-limit
|
2023-07-11 10:46:02 +02:00 |
|
|
|
ed7d75a777
|
thermal controller
|
2023-07-11 10:44:46 +02:00 |
|
|
|
9443d3844a
|
Merge pull request 'fsfw bump and changelog' (#737) from bump-fsfw into main
Reviewed-on: #737
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
|
2023-07-11 10:38:59 +02:00 |
|
|
|
8800b20409
|
Merge remote-tracking branch 'origin/main' into tcs-heater-upper-limit
|
2023-07-11 09:45:01 +02:00 |
|
|
|
690f8cb49a
|
Merge remote-tracking branch 'origin/main' into bump-fsfw
|
2023-07-11 09:41:44 +02:00 |
|
|
|
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 |
|
