Commit Graph

593 Commits

Author SHA1 Message Date
Jakob Meier
991d828e88 fixed conflicts 2022-04-30 09:34:45 +02:00
Jakob Meier
f263c2b9fe fix in service 8 reply handling 2022-04-30 09:26:19 +02:00
Jakob Meier
d41a59834c tmtccmd update 2022-04-30 09:25:53 +02:00
168b662288 Merge pull request 'move run config to new format' (#60) from mueller/update-run-configs into develop
Reviewed-on: #60
2022-04-28 21:13:14 +02:00
443deb8556
move run config to new format 2022-04-28 18:54:28 +02:00
Jakob Meier
16ebba3f5b reset pl command 2022-04-28 11:29:26 +02:00
76da8042a4 Merge pull request 'syrlinks update' (#59) from meier/syrlinks into develop
Reviewed-on: #59
2022-04-27 18:14:19 +02:00
4ce67f5be4 tmtccmd update 2022-04-27 16:52:18 +02:00
83fefaefd5 run generator scripts 2022-04-27 16:48:55 +02:00
a457b001a3 fix for syrlinks command packaging 2022-04-27 16:43:38 +02:00
Jakob Meier
5de92a366a reformated 2022-04-27 16:08:51 +02:00
0ef234e837
python3 she-bang fix 2022-04-27 11:26:51 +02:00
Jakob Meier
af4e3ea574 Merge branch 'meier/ploc' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc into meier/ploc 2022-04-24 13:21:20 +02:00
Jakob Meier
8df865c8c1 regenerated events 2022-04-24 12:35:00 +02:00
ad53f3e9bb improved supervsior commanding 2022-04-22 18:02:49 +02:00
0cb9dbefca Merge branch 'meier/ploc' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc into meier/ploc 2022-04-22 14:21:23 +02:00
6d80ad7476 adc channel input in hex 2022-04-22 14:21:08 +02:00
b1aaef90c7 Merge pull request 'MPSoC and Supervisor TCs' (#58) from meier/ploc into develop
Reviewed-on: #58
2022-04-22 11:12:02 +02:00
60f977aa0c Merge branch 'develop' into meier/ploc 2022-04-22 11:11:54 +02:00
Robin Mueller
28983d387b
minor tmtccmd fix 2022-04-21 16:40:12 +02:00
Jakob Meier
1dd7fddef4 adc report 2022-04-21 16:30:42 +02:00
Jakob Meier
45470f8c05 cam commands 2022-04-20 21:34:14 +02:00
Jakob Meier
c7da0103e8 fixed merge conflicts 2022-04-19 14:26:02 +02:00
Jakob Meier
edee0c1aa3 removed unsued command 2022-04-14 15:13:38 +02:00
Jakob Meier
a3d9e83dc6 supervisor event buffer request 2022-04-14 07:53:18 +02:00
Jakob Meier
f2d3f8c68c ploc supervisor enable and disable adc monitor task 2022-04-13 11:58:07 +02:00
8a30f669f0 Merge pull request 'PDU1 and PDU2 HK Handling' (#57) from mueller/pdu1-pdu2-hk-handling into develop
Reviewed-on: #57
2022-04-12 19:28:46 +02:00
Robin Mueller
ecb973c37f
hk handling working for both core and aux from pdus 2022-04-12 16:35:34 +02:00
Robin Mueller
c995ca2dda
core hk handling working 2022-04-12 16:10:51 +02:00
Robin Mueller
259cd25b6e
continued pdu1 pdu2 handling 2022-04-12 16:00:37 +02:00
Robin Mueller
a966471fe5
add pdu HK handler 2022-04-12 15:36:04 +02:00
Jakob Meier
9561dd2f14 supervisor commands 2022-04-11 16:53:20 +02:00
Robin Mueller
a6c91640a1
Merge remote-tracking branch 'origin/develop' into mueller/master 2022-04-11 14:43:09 +02:00
98783a0981 Merge pull request 'added new time commands' (#56) from mueller/time-cmd into develop
Reviewed-on: #56
2022-04-11 09:00:29 +02:00
Jakob Meier
ec8526314d removed listening from supervisor run config 2022-04-10 10:24:50 +02:00
19768cb1b1
added new time commands 2022-04-09 18:44:04 +02:00
9055281da4 Merge remote-tracking branch 'origin/develop' into mueller/master 2022-04-09 17:59:56 +02:00
091cf2dd63 Merge pull request 'split up p60 hk set' (#55) from mueller/split-p60-hk into develop
Reviewed-on: #55
2022-04-08 17:46:58 +02:00
Robin Mueller
5184912759
bump spacepackets to v0.6.2 2022-04-08 15:03:08 +02:00
Robin Mueller
3a1c7c6288
update HK handling 2022-04-08 14:46:01 +02:00
Robin Mueller
5189b20b0e
update gen csvs 2022-04-08 14:13:51 +02:00
Robin Mueller
cdce2ba092
spacepackets update 2022-04-08 14:13:11 +02:00
Robin Mueller
a0ca7e28a7 Merge remote-tracking branch 'origin/develop' into mueller/split-p60-hk 2022-04-08 14:12:58 +02:00
Robin Mueller
633bc406c7
submodule updates 2022-04-08 14:10:44 +02:00
abf4d694c7 Merge pull request 'update csv files' (#54) from mueller/gps-time-update into develop
Reviewed-on: #54
2022-04-08 14:09:20 +02:00
2accfef011
longer ping timeout 2022-04-08 09:59:21 +02:00
aa25b40070
update csv files 2022-04-07 17:28:42 +02:00
ab5cca85bf
split up p60 hk set 2022-04-07 12:51:47 +02:00
25bab108df Merge pull request 'Major TMTC Update' (#52) from mueller/major-tmtc-update into develop
Reviewed-on: #52
2022-04-07 11:39:45 +02:00
Jakob Meier
f422d92553 fixed conflict 2022-04-07 11:39:27 +02:00