Commit Graph

2228 Commits

Author SHA1 Message Date
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
f7fd1e5bec Merge pull request 'v1.9.0' (#53) from develop into master
Reviewed-on: #53
2022-04-07 17:39:41 +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
43be3fd370 Merge pull request 'Update PL PCDU Commands' (#50) from mueller/new-pl-pcdu-cmds into develop
Reviewed-on: #50
2022-04-07 11:36:01 +02:00
8f2ff3034f
tmtccmd update 2022-04-07 10:05:53 +02:00
Robin Mueller
5d9f008320
small bugfix for PL PCDU commanding 2022-04-07 00:15:15 +02:00
Robin Mueller
61937a0272
bump tmtccmd requirement 2022-04-06 19:04:18 +02:00
Robin Mueller
1380460754
renamed function 2022-04-06 18:25:54 +02:00
Robin Mueller
ce7be3a3eb
hk handing bpx fix 2022-04-06 17:35:04 +02:00
Robin Mueller
d4ebb1b8aa
update hk handling 2022-04-06 17:01:01 +02:00
Robin Mueller
3fac640101
update action reply handling 2022-04-06 16:41:46 +02:00
Robin Mueller
50747d8a5e
getter function renamed 2022-04-06 16:19:59 +02:00
Robin Mueller
49f88a5b3d
pre send CB works properly now 2022-04-06 16:17:51 +02:00
Robin Mueller
fc2b50979e
submodule updates 2022-04-06 15:54:20 +02:00
Robin Mueller
d32e427e0f
pack HK command instead of diag 2022-04-06 12:13:28 +02:00
Robin Mueller
8917f303ec Merge remote-tracking branch 'origin/mueller/major-tmtc-update' into mueller/master 2022-04-06 12:12:14 +02:00
Robin Mueller
1c10575264
tmtccmd update 2022-04-06 12:08:18 +02:00
6088230a5f
bump minor version 2022-04-06 11:44:40 +02:00
b2acb7fec5
update for changed tmtccmd API 2022-04-06 11:43:17 +02:00
3f5d77a5e5
request diag packet 2022-04-05 19:49:42 +02:00
5b2dfa55eb Merge remote-tracking branch 'origin/develop' into mueller/major-tmtc-update 2022-04-05 19:43:22 +02:00
38b21e4fc8 Merge branch 'develop' into mueller/new-pl-pcdu-cmds 2022-04-05 19:40:48 +02:00
2c8c0a97e2 Merge pull request 'meier/syrlinks' (#51) from meier/syrlinks into develop
Reviewed-on: #51
2022-04-05 19:40:31 +02:00
007adfd66a
tmtccmd update 2022-04-05 19:40:03 +02:00