Commit Graph

1590 Commits

Author SHA1 Message Date
3cd7de5649 Merge branch 'master' into develop 2021-08-09 15:49:50 +02:00
f8b36a651d
bumped version 2021-08-09 15:49:07 +02:00
82c8090afd Merge pull request 'Release v1.8.0' (#16) from develop into master
Reviewed-on: #16
2021-08-09 15:46:53 +02:00
fac74219f0 Merge branch 'master' into develop 2021-08-09 14:39:52 +02:00
3305e1d489 Merge pull request 'Update TMTC and linter script' (#15) from mueller/master into develop
Reviewed-on: #15
2021-08-09 14:19:43 +02:00
7c598f26a8
instructions to run linter 2021-08-09 11:45:01 +02:00
5ea6903881
updated linter python script 2021-08-09 11:38:37 +02:00
6824e7d8c7
made CLI and GUI executable 2021-08-09 11:31:08 +02:00
ca63149a67
Merge remote-tracking branch 'origin/develop' into mueller/master 2021-08-09 11:29:55 +02:00
f00cd8f6bd Merge pull request 'meier/plocSupervisor' (#14) from meier/plocSupervisor into develop
Reviewed-on: #14
2021-08-09 11:28:39 +02:00
Jakob.Meier
547b4b2137 fixed conflicts 2021-08-08 15:20:28 +02:00
Jakob.Meier
e7d8199e67 ploc updater commands 2021-08-08 15:02:29 +02:00
Jakob.Meier
98a1d0f856 supervisor CAN loopback test 2021-08-08 10:58:14 +02:00
Jakob.Meier
36ae6a233c ploc udpater test 2021-08-07 14:34:26 +02:00
3e8626bfaf
tmtccmd update 2021-08-04 17:40:39 +02:00
a226bf659e Merge pull request 'added reboot command' (#12) from mueller/master into develop
Reviewed-on: #12
2021-08-04 10:02:42 +02:00
bc32472d88
added reboot command 2021-08-03 15:28:28 +02:00
Jakob.Meier
4aebf4c0d9 debug tcs added 2021-08-02 15:28:34 +02:00
477743f626 Merge pull request 'meier/plocSupervisor' (#11) from meier/plocSupervisor into develop
Reviewed-on: #11
2021-08-02 12:59:04 +02:00
Jakob.Meier
d782aa2715 space packet id typo 2021-08-02 11:30:20 +02:00
Jakob.Meier
93fdc0fc7f some more supervisor TCs 2021-08-02 11:27:34 +02:00
Jakob.Meier
9a7d5f08d0 supervisor run configuration 2021-08-01 17:12:09 +02:00
Jakob.Meier
6fcd52daa6 added processing of mram dump tm in service 8 hook 2021-07-31 08:32:14 +02:00
Jakob.Meier
1b1f26ac3a mram dump and mram wipe tc, fix in hook_implementations 2021-07-29 08:58:12 +02:00
Jakob.Meier
6601233f41 Merge branch 'develop' into meier/plocSupervisor 2021-07-28 19:37:20 +02:00
Jakob.Meier
55ca910549 few more ploc supervisor commands 2021-07-28 19:35:46 +02:00
8b7331c210 Merge branch 'mueller/master' into develop 2021-07-28 15:28:21 +02:00
31bc3d8689
tmtccmd update 2021-07-28 15:24:39 +02:00
7ffda5f9ee
tmtccmd update 2021-07-27 11:54:35 +02:00
f2e95444c7
tmtccmd update 2021-07-27 11:50:29 +02:00
0b6bfdd23a
tmtccmd update 2021-07-27 11:48:42 +02:00
389836c10f Merge pull request 'v1.7.1' (#10) from develop into master
Reviewed-on: #10
2021-07-27 09:39:52 +02:00
ed1d9a81ed Merge branch 'master' into develop 2021-07-27 09:39:44 +02:00
132d9d2456 Merge pull request 'v1.7.1' (#9) from v1.7.1 into develop
Reviewed-on: #9
2021-07-26 18:17:33 +02:00
6f8d63ba87 Merge pull request 'v1.7.0' (#8) from develop into master
Reviewed-on: #8
Reviewed-by: Jakob.Meier <meierj@irs.uni-stuttgart.de>
2021-07-26 18:17:08 +02:00
1f990e9647
v1.7.1 2021-07-26 17:57:19 +02:00
2a6c0a6cab
tmtccmd update 2021-07-26 17:53:38 +02:00
9aaf3cfa7a
tmtccmd update 2021-07-26 17:29:49 +02:00
a81b8b608d
assigned packet ID for tcp com if 2021-07-26 17:24:53 +02:00
Jakob.Meier
75ae2c786b update availabe and watchdogs enable command 2021-07-26 16:29:54 +02:00
6758ecef0d
service 200 handler (but test task missing) 2021-07-26 14:13:58 +02:00
Jakob.Meier
6352a6f272 Merge branch 'develop' into meier/plocSupervisor 2021-07-25 20:39:49 +02:00
Jakob.Meier
390081d00e ploc supervisor get boot status report added, not tested 2021-07-25 17:56:36 +02:00
2e942ec21e
printing own and tmtccmd version now
tmtccmd updated to v1.7.2
2021-07-24 14:58:47 +02:00
3436172026 Merge branch 'develop' of https://egit.irs.uni-stuttgart.de/eive/eive_tmtc into develop 2021-07-24 14:41:35 +02:00
7302b10e06
bumped version number 2021-07-24 14:41:23 +02:00
193060ea65 Merge pull request 'meier/plocSupervisor' (#7) from meier/plocSupervisor into develop
Reviewed-on: #7
2021-07-24 14:40:57 +02:00
Jakob.Meier
e552a92db4 all object ids are of bytes type now 2021-07-24 13:39:15 +02:00
Jakob.Meier
b0e78beaff Merge branch 'develop' into meier/plocSupervisor 2021-07-24 12:12:20 +02:00
Jakob.Meier
6d3be2af33 removed unused code in ploc_supervisor.py 2021-07-24 12:08:12 +02:00