Commit Graph

2249 Commits

Author SHA1 Message Date
a58229dcd5 Merge pull request 'v1.10.0' (#65) from develop into master
Reviewed-on: #65
2022-05-05 14:35:03 +02:00
78a634fb5f Merge branch 'master' into develop 2022-05-05 14:34:48 +02:00
258c1074f1 Merge branch 'mueller/heater-cmds' into develop 2022-05-05 14:33:13 +02:00
9ec84a01a3
small bugfix 2022-05-05 14:33:02 +02:00
17b6422cf5 Merge pull request 'Heater Commands' (#63) from mueller/heater-cmds into develop
Reviewed-on: #63
2022-05-05 14:32:42 +02:00
d86a85b06d
completed health commands 2022-05-05 14:30:28 +02:00
b8af022487
bump tmtccmd 2022-05-05 13:42:58 +02:00
7e460d05c3
complete RW HK handling 2022-05-05 13:39:20 +02:00
0be25b10f3
dedicated RW HK handler file 2022-05-05 13:36:51 +02:00
510ba82fef
rw cmds cntd 2022-05-05 02:00:18 +02:00
bc4099c5bf
added more rw cmds 2022-05-05 01:21:57 +02:00
4bf58da187
Merge remote-tracking branch 'origin/develop' into mueller/heater-cmds 2022-05-05 00:44:56 +02:00
dd34a049d3
Merge remote-tracking branch 'origin/develop' into mueller/rw-cmds 2022-05-05 00:40:11 +02:00
2e24f764a6 Merge pull request 'PLOC Commands' (#64) from meier/ploc into develop
Reviewed-on: #64
2022-05-05 00:37:14 +02:00
Jakob Meier
a4bf730b22 Merge branch 'develop' into meier/ploc 2022-05-04 19:09:28 +02:00
Jakob Meier
213e6709ac cam cmd reply handling 2022-05-04 19:08:54 +02:00
5e9f83cd68
add returnvalue 2022-05-04 16:47:25 +02:00
72552c5090
update changelog 2022-05-04 14:46:00 +02:00
0486751571 Merge remote-tracking branch 'origin/develop' into mueller/heater-cmds 2022-05-04 14:44:48 +02:00
11ea4ad44e
add changelog 2022-05-04 14:43:47 +02:00
Jakob Meier
9c3a8e9ff2 removed unused adc monitor commands 2022-05-04 12:48:43 +02:00
6f8fe84d67 rerun generators, bugfix 2022-05-04 10:26:32 +02:00
8bc51b293b
old API 2022-05-04 08:48:43 +02:00
Jakob Meier
b3f40b38fc Merge branch 'meier/develop' into meier/ploc 2022-05-03 19:12:50 +02:00
Jakob Meier
0eb4d0fb26 fixed conflicts 2022-05-03 19:12:37 +02:00
Jakob Meier
7413a5db5f supervisor read gpio reply handling 2022-05-03 19:09:23 +02:00
927508e65d
heater names 2022-05-03 19:03:10 +02:00
79d6e15c55
some heater cmds improvements 2022-05-03 19:01:38 +02:00
f60228f521
cleaned up cmd handling 2022-05-03 18:36:28 +02:00
aab5c28960
update auto-generated files 2022-05-03 16:32:33 +02:00
Jakob Meier
c7a19f7122 udpate gitignore 2022-05-03 15:27:43 +02:00
Jakob Meier
c5f99d80a2 fixed conflicts 2022-05-03 15:02:10 +02:00
Jakob Meier
fe833edc91 tmtccmd update 2022-05-02 13:47:44 +02:00
0a47c17fa6
bump tmtccmd 2022-05-02 12:53:01 +02:00
d7efe7d864
re-generate event list 2022-05-02 12:41:02 +02:00
f23ed26807 Merge remote-tracking branch 'origin/develop' into mueller/rw-cmds 2022-05-02 12:39:36 +02:00
8d0a831229
rerun event parser 2022-05-02 12:39:02 +02:00
4e127cb049
update tmtccmd 2022-05-02 12:37:12 +02:00
fd1534c168 Merge pull request 'tmtc improvements' (#62) from meier/ploc into develop
Reviewed-on: #62
2022-05-02 12:36:32 +02:00
Jakob Meier
bd3d5396da added tmtc_conf.json 2022-04-30 15:33:24 +02:00
Jakob Meier
d8ba63c496 gitignore update 2022-04-30 15:32:34 +02:00
Jakob Meier
58b9a3cdaf tmtccmd update 2022-04-30 15:31:40 +02:00
Jakob Meier
d7c0f99a21 removed obsolete commands 2022-04-30 11:10:22 +02:00
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
2b8fa356c9 Merge branch 'meier/ploc' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc into meier/ploc 2022-04-29 23:35:41 +02:00
a0b398d214 commands to tritstate mpsoc uart tx line 2022-04-29 23:35:34 +02:00
e939f2b934 improved input request 2022-04-29 18:21:18 +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