Commit Graph

954 Commits

Author SHA1 Message Date
37d3c44067 Merge pull request 'changed diagnostic handover' (#97) from kranz/master into develop
Reviewed-on: #97
2022-06-01 06:25:12 +02:00
351bb7c475 changed diagnostic handover 2022-05-31 17:55:53 +02:00
cba2055c59 some adaptions 2022-05-31 16:42:53 +02:00
a1cbc3bc13 debugging 2022-05-31 11:44:08 +02:00
c3012cd7a4 ip address localhost 2022-05-30 18:00:09 +02:00
048a0ea447 checked out tmtcgui from mohr/thermal 2022-05-30 13:31:11 +02:00
1bdfc40cdd tmtccli listner mode 2022-05-30 12:59:31 +02:00
b20921788e bug fixes 2022-05-30 11:58:57 +02:00
e4e0b882e5 Merge pull request 'GPS bug fix' (#96) from kranz/master into develop
Reviewed-on: #96
2022-05-30 11:24:18 +02:00
ec4b681b2e more 2022-05-30 09:25:57 +02:00
363c93a7d3 gps bug fix 2022-05-30 09:18:07 +02:00
5daf76d081 Merge pull request 'GPS HK Parsing' (#86) from mueller/gps-hk-parsing into develop
Reviewed-on: #86
2022-05-28 12:52:00 +02:00
5bde637dcc Merge branch 'mueller/gps-hk-parsing' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc into mueller/gps-hk-parsing 2022-05-28 12:51:20 +02:00
acd53c1337
resolve other merge conflict 2022-05-28 12:51:07 +02:00
59d4096327 Merge branch 'develop' into mueller/gps-hk-parsing 2022-05-28 12:49:46 +02:00
5df26aac0b
Merge remote-tracking branch 'origin/develop' into mueller/gps-hk-parsing 2022-05-28 12:49:34 +02:00
b39f2851ca Merge pull request 'rw and mgt proc changes to adjust timing and sequence' (#95) from kranz/master into develop
Reviewed-on: #95
2022-05-28 12:48:40 +02:00
27b41c0a48 reduced code duplication 2022-05-27 19:32:02 +02:00
79e0838473 rw and mgt proc changes to adjust timing and sequence 2022-05-27 18:54:48 +02:00
5662c78f7a Merge pull request 'added PL PCDU HK parsing' (#87) from mueller/plpcdu-hk-parsing into develop
Reviewed-on: #87
2022-05-27 16:28:50 +02:00
ddc1becc66 Merge pull request 'TV Tests' (#94) from mueller/tv-tests into develop
Reviewed-on: #94
2022-05-27 16:26:07 +02:00
dbe3110a96
rename run config 2022-05-27 15:30:32 +02:00
04bbc45383
new run config for TV tests 2022-05-27 15:29:39 +02:00
0795e7c279
Merge remote-tracking branch 'origin/develop' into mueller/gps-hk-parsing 2022-05-27 14:32:58 +02:00
aa733ed5ed Merge pull request 'Procedure updates' (#93) from mueller/proc-updates into develop
Reviewed-on: #93
2022-05-27 14:20:19 +02:00
44adf6cf1e
small fix 2022-05-27 14:16:47 +02:00
81501b4ae6 Merge branch 'kranz/master' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc into kranz/master 2022-05-27 11:54:05 +02:00
851593a7bf
some improvements and updates 2022-05-27 11:53:57 +02:00
d85501f43e Merge remote-tracking branch 'origin/develop' into kranz/master 2022-05-27 11:06:20 +02:00
f4038f9f70 Merge branch 'kranz/master' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc into kranz/master 2022-05-27 11:06:03 +02:00
f7d843131f
new cfg class for procedures 2022-05-27 10:50:44 +02:00
04fca35012
Merge remote-tracking branch 'origin/develop' into mueller/gps-hk-parsing 2022-05-27 10:19:29 +02:00
da544ccb13 Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-hk-parsing 2022-05-27 10:18:35 +02:00
8b644ece5e Merge pull request 'SUS HK Parsing' (#92) from mueller/sus-hk-parsing into develop
Reviewed-on: #92
2022-05-27 10:11:40 +02:00
3e087dc803
complete sus hk parsing 2022-05-27 09:54:06 +02:00
da18ebab77
added sus hk parsing 2022-05-25 18:15:22 +02:00
ef349856d6
re-generate csvs 2022-05-25 18:14:52 +02:00
49bb59df7f Merge branch 'develop' into mueller/plpcdu-hk-parsing 2022-05-25 16:26:09 +02:00
e70480bc17 Merge remote-tracking branch 'origin/develop' into mueller/gps-hk-parsing 2022-05-25 16:25:54 +02:00
a257f2b707 Merge pull request 'Continue procedures' (#91) from kranz/master into develop
Reviewed-on: #91
2022-05-25 16:25:35 +02:00
74f639ab55 Merge branch 'develop' into kranz/master 2022-05-25 16:24:05 +02:00
be71cb792e
some error checking for RWs 2022-05-25 15:31:45 +02:00
01e91bffcd
kill all the duplication 2022-05-25 15:21:50 +02:00
708edeb458 Merge branch 'develop' into mueller/plpcdu-hk-parsing 2022-05-25 15:02:22 +02:00
c3c65d325e Merge remote-tracking branch 'origin/develop' into mueller/gps-hk-parsing 2022-05-25 15:02:06 +02:00
42aeb874c0
bump tmtccmd 2022-05-25 15:01:40 +02:00
3f813d9381 Merge remote-tracking branch 'origin/develop' into mueller/gps-hk-parsing 2022-05-25 15:01:26 +02:00
8a00855798 Merge pull request 'TV test procedures' (#89) from kranz/master into develop
Reviewed-on: #89
2022-05-25 15:01:09 +02:00
6db60f9238 Merge remote-tracking branch 'origin/develop' into kranz/master 2022-05-25 14:59:52 +02:00
ec13c20325
afmt 2022-05-25 14:59:30 +02:00