eive/eive-tmtc
14
0
Fork 0
Code Issues Pull Requests 1 Projects Releases 99 Wiki Activity
1,211 Commits 6 Branches 99 Tags
074eb82e78d2d0f9e0ecfbc2020cd8d0532255ba
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
muellerr f3609b8179 Merge pull request 'Add ACS Subsystem Commands' (#117) from mueller/add-acs-ss-cmds into main 
Reviewed-on: #117
 2022-11-02 10:33:17 +01:00
muellerr 09757f0150 Merge branch 'main' into mueller/add-acs-ss-cmds 2022-11-02 10:33:06 +01:00
muellerr 38385f7826 Merge remote-tracking branch 'origin/main' into mueller/add-acs-ss-cmds 2022-10-27 16:59:25 +02:00
muellerr aefdcebde8 Merge remote-tracking branch 'origin/main' into mueller/add-acs-ss-cmds 2022-10-21 15:45:17 +02:00
muellerr 1c38b54f01 Merge remote-tracking branch 'origin/main' into mueller/add-acs-ss-cmds 2022-10-21 15:35:51 +02:00
muellerr c13f4a8575 Merge pull request 'add support for closure handling' (#119) from mueller/cfdp-closure-requested into main 
Reviewed-on: #119
 2022-10-21 15:26:37 +02:00
muellerr 90c9cf297b Merge remote-tracking branch 'origin/main' into mueller/add-acs-ss-cmds 2022-10-20 17:03:41 +02:00
muellerr 8655f0c9e6 Merge pull request 'Updated S/A depl command' (#118) from mueller/update-sa-depl-cmd into main 
Reviewed-on: #118
 2022-10-14 20:38:54 +02:00
muellerr 646cf1a14e Merge branch 'mueller/update-sa-depl-cmd' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc into mueller/update-sa-depl-cmd 2022-10-14 14:55:05 +02:00
muellerr a3c9c403d5 Merge remote-tracking branch 'origin/main' into mueller/update-sa-depl-cmd 2022-10-13 18:09:49 +02:00
muellerr a82665321e Merge remote-tracking branch 'origin/main' into mueller/add-acs-ss-cmds 2022-10-11 23:13:31 +02:00
muellerr 3b5e484de1 Merge remote-tracking branch 'origin/main' into mueller/obsw-update-cmds 2022-09-29 13:28:09 +02:00
muellerr debbe9813b Merge pull request 'scex code additions' (#115) from scex-additions into main 
Reviewed-on: #115
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>
 2022-09-29 11:48:26 +02:00
muellerr a53bfd22c4 Merge pull request 'syrlinks HK procedure' (#109) from mueller/syrlinks-proc into main 
Reviewed-on: #109
 2022-08-27 16:02:10 +02:00
muellerr abc3d6bd62 Merge remote-tracking branch 'origin/main' into mueller/syrlinks-proc 2022-08-27 12:55:46 +02:00
muellerr e4e7308962 Merge branch 'mueller/power-updates' into mueller/power-cmds-update 2022-08-26 23:39:27 +02:00
muellerr f22aba3e65 Merge remote-tracking branch 'origin/main' into mueller/power-cmds-update 2022-08-25 08:57:51 +02:00
muellerr d19cdfa566 Merge pull request 'Update PLOC SUPV TMTC handling' (#107) from mueller/update-ploc-supv-cmds into main 
Reviewed-on: #107
 2022-08-24 16:44:57 +02:00
muellerr cf8284e518 Merge remote-tracking branch 'origin/main' into mueller/update-ploc-supv-cmds 2022-08-24 16:44:29 +02:00
muellerr aadcd2b061 Merge branch 'mueller/update-ploc-supv-cmds' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc into mueller/update-ploc-supv-cmds 2022-08-24 13:47:55 +02:00
muellerr 7dfe92be8c Merge branch 'mueller/update-ploc-supv-cmds' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc into mueller/update-ploc-supv-cmds 2022-08-22 17:20:59 +02:00
muellerr f58806c88c Merge remote-tracking branch 'origin/main' into mueller/update-ploc-supv-cmds 2022-08-22 17:15:57 +02:00
muellerr 88c2d9fe52 Merge remote-tracking branch 'origin/main' into mueller/update-ploc-supv-cmds 2022-08-22 17:15:24 +02:00
muellerr 7dccd661a5 Merge pull request 'Smaller update' (#106) from mueller/bump-deps into main 
Reviewed-on: #106
 2022-08-08 17:05:04 +02:00
muellerr e43e432392 Merge branch 'main' into mueller/bump-deps 2022-08-08 17:04:54 +02:00
muellerr 00bf041e3f Merge pull request 'update dependencies' (#105) from mueller/bump-deps into main 
Reviewed-on: #105
 2022-08-08 16:35:01 +02:00
muellerr ebb1734ca7 Merge branch 'mueller/major-dependency-update' into irini 2022-07-08 16:21:01 +02:00
muellerr c29689cc0a Merge pull request 'Bump submodules' (#99) from mueller/bump-deps into develop 
Reviewed-on: #99
 2022-06-21 10:35:57 +02:00
muellerr be80758c71 Merge branch 'develop' into mueller/bump-deps 2022-06-21 10:35:49 +02:00
muellerr ee0baa15c2 Merge pull request 'New csv files' (#100) from mueller/gen-update into develop 
Reviewed-on: #100
 2022-06-21 10:33:26 +02:00
muellerr 701f6efbee Merge remote-tracking branch 'origin/develop' into mueller/bump-deps 2022-06-20 09:47:27 +02:00
muellerr 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
muellerr 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
muellerr 59d4096327 Merge branch 'develop' into mueller/gps-hk-parsing 2022-05-28 12:49:46 +02:00
muellerr 5df26aac0b Merge remote-tracking branch 'origin/develop' into mueller/gps-hk-parsing 2022-05-28 12:49:34 +02:00
muellerr 0795e7c279 Merge remote-tracking branch 'origin/develop' into mueller/gps-hk-parsing 2022-05-27 14:32:58 +02:00
muellerr 04fca35012 Merge remote-tracking branch 'origin/develop' into mueller/gps-hk-parsing 2022-05-27 10:19:29 +02:00
muellerr da544ccb13 Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-hk-parsing 2022-05-27 10:18:35 +02:00
muellerr 49bb59df7f Merge branch 'develop' into mueller/plpcdu-hk-parsing 2022-05-25 16:26:09 +02:00
muellerr e70480bc17 Merge remote-tracking branch 'origin/develop' into mueller/gps-hk-parsing 2022-05-25 16:25:54 +02:00
muellerr 708edeb458 Merge branch 'develop' into mueller/plpcdu-hk-parsing 2022-05-25 15:02:22 +02:00
muellerr c3c65d325e Merge remote-tracking branch 'origin/develop' into mueller/gps-hk-parsing 2022-05-25 15:02:06 +02:00
muellerr 3f813d9381 Merge remote-tracking branch 'origin/develop' into mueller/gps-hk-parsing 2022-05-25 15:01:26 +02:00
muellerr 6c7c8731ee Merge remote-tracking branch 'origin/develop' into mueller/gps-hk-parsing 2022-05-25 10:37:30 +02:00
muellerr 7a92bde177 Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-hk-parsing 2022-05-25 10:35:16 +02:00
muellerr f7e7f731d5 Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-hk-parsing 2022-05-24 17:43:40 +02:00
muellerr f12913d802 Merge branch 'develop' into mueller/pl-pcdu-proc 2022-05-24 17:41:56 +02:00
muellerr aa238dbabb Merge remote-tracking branch 'origin/develop' into mueller/pl-pcdu-proc 2022-05-24 17:27:56 +02:00
muellerr 1e44d81c47 Merge remote-tracking branch 'origin/develop' into mueller/gps-hk-parsing 2022-05-24 15:08:36 +02:00
muellerr 1c0a8534f9 Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-hk-parsing 2022-05-24 15:08:18 +02:00
muellerr f30913b24b Merge pull request 'ACU HK Parsing' (#80) from mueller/acu-hk into develop 
Reviewed-on: #80
 2022-05-23 18:59:56 +02:00
muellerr 3586b541c1 Merge remote-tracking branch 'origin/develop' into mueller/acu-hk 2022-05-23 18:34:44 +02:00
muellerr d36799448c Merge remote-tracking branch 'origin/develop' into mueller/acu-hk 2022-05-23 18:32:32 +02:00
muellerr ba69be6296 Merge pull request 'add rtd cmds' (#84) from mueller/rtd-cmds into develop 
Reviewed-on: #84
 2022-05-23 18:31:39 +02:00
muellerr 427efab44e Merge branch 'develop' into mueller/rtd-cmds 2022-05-23 18:30:29 +02:00
muellerr 4aa89e42ee Merge pull request 'Rad Sensor HK parsing' (#81) from mueller/rad-sensor into develop 
Reviewed-on: #81
 2022-05-23 18:30:17 +02:00
muellerr 4251b126b7 Merge remote-tracking branch 'origin/develop' into mueller/rad-sensor 2022-05-23 18:02:03 +02:00
muellerr fe36485e85 Merge remote-tracking branch 'origin/develop' into mueller/acu-hk 2022-05-23 18:01:25 +02:00
muellerr 9332fb8690 Merge branch 'develop' into mueller/rtd-cmds 2022-05-23 18:00:10 +02:00
muellerr e884f397cd Merge remote-tracking branch 'origin/develop' into mueller/acu-hk 2022-05-23 15:50:45 +02:00
muellerr ff66dd5dd2 Merge pull request 'bump tmtccmd dependency' (#77) from mueller/bump-tmtccmd into develop 
Reviewed-on: #77
 2022-05-20 15:31:57 +02:00
muellerr 881baf7a82 Merge pull request 'HK Parsing and TC PROC Tests' (#76) from mueller/hk-parsing into develop 
Reviewed-on: #76
 2022-05-19 19:30:19 +02:00
muellerr da3f143a9b Merge remote-tracking branch 'origin/develop' into mueller/hk-parsing 2022-05-19 18:16:50 +02:00
muellerr 3caaffc151 Merge remote-tracking branch 'origin/develop' into mueller/hk-parsing 2022-05-19 17:37:41 +02:00
muellerr ff651a7f7a Merge pull request 'continued hk parsing' (#75) from mueller/hk-parsing into develop 
Reviewed-on: #75
 2022-05-19 13:23:48 +02:00
muellerr 8162cf1508 Merge pull request 'Package update' (#71) from mueller/package-update into develop 
Reviewed-on: #71
 2022-05-17 14:30:51 +02:00
muellerr 893b1822e2 Merge pull request 'TMTC simplification' (#70) from mueller/tmtc-simplification into develop 
Reviewed-on: #70
 2022-05-17 12:53:10 +02:00
muellerr 542e6ca48f Merge branch 'mueller/tmtc-simplification' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc into mueller/tmtc-simplification 2022-05-17 11:41:01 +02:00
muellerr 1a9b44711a Merge branch 'develop' into mueller/tmtc-simplification 2022-05-17 11:21:56 +02:00
muellerr a681850248 Merge pull request 'RW CMDs' (#61) from mueller/rw-cmds into develop 
Reviewed-on: #61
 2022-05-11 17:59:49 +02:00
muellerr 325d06ee85 Merge remote-tracking branch 'origin/develop' into mueller/rw-cmds 2022-05-11 17:58:42 +02:00
muellerr 9d105ee97f Merge remote-tracking branch 'origin/develop' into mueller/rw-cmds 2022-05-10 17:57:29 +02:00
muellerr 47a022b684 Merge remote-tracking branch 'origin/develop' into mueller/rw-cmds 2022-05-06 13:34:18 +02:00
muellerr bce981e1f3 Merge branch 'mueller/update-dependencies' into mueller/rw-cmds 2022-05-05 16:18:19 +02:00
muellerr 418b51b413 Merge remote-tracking branch 'origin/develop' into mueller/rw-cmds 2022-05-05 14:38:19 +02:00
muellerr 258c1074f1 Merge branch 'mueller/heater-cmds' into develop 2022-05-05 14:33:13 +02:00
muellerr 17b6422cf5 Merge pull request 'Heater Commands' (#63) from mueller/heater-cmds into develop 
Reviewed-on: #63
 2022-05-05 14:32:42 +02:00
muellerr 4bf58da187 Merge remote-tracking branch 'origin/develop' into mueller/heater-cmds 2022-05-05 00:44:56 +02:00
muellerr dd34a049d3 Merge remote-tracking branch 'origin/develop' into mueller/rw-cmds 2022-05-05 00:40:11 +02:00
muellerr 0486751571 Merge remote-tracking branch 'origin/develop' into mueller/heater-cmds 2022-05-04 14:44:48 +02:00
muellerr f23ed26807 Merge remote-tracking branch 'origin/develop' into mueller/rw-cmds 2022-05-02 12:39:36 +02:00
Robin Mueller a6c91640a1 Merge remote-tracking branch 'origin/develop' into mueller/master 2022-04-11 14:43:09 +02:00
muellerr 9055281da4 Merge remote-tracking branch 'origin/develop' into mueller/master 2022-04-09 17:59:56 +02:00
Robin Mueller a0ca7e28a7 Merge remote-tracking branch 'origin/develop' into mueller/split-p60-hk 2022-04-08 14:12:58 +02:00
muellerr 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
Robin Mueller 8917f303ec Merge remote-tracking branch 'origin/mueller/major-tmtc-update' into mueller/master 2022-04-06 12:12:14 +02:00
muellerr 5b2dfa55eb Merge remote-tracking branch 'origin/develop' into mueller/major-tmtc-update 2022-04-05 19:43:22 +02:00
muellerr 38b21e4fc8 Merge branch 'develop' into mueller/new-pl-pcdu-cmds 2022-04-05 19:40:48 +02:00
Robin Mueller e67eb6633e Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc into mueller/master 2022-04-05 00:55:17 +02:00
Robin Mueller a39c7007c6 Merge remote-tracking branch 'origin/develop' into mueller/master 2022-04-04 12:00:29 +02:00
muellerr a14784666f Merge remote-tracking branch 'origin/develop' into mueller/new-pl-pcdu-cmds 2022-03-31 14:49:23 +02:00
muellerr cd87968c3d Merge remote-tracking branch 'origin/develop' into mueller/new-pl-pcdu-cmds 2022-03-31 14:46:32 +02:00
muellerr 57f810f9de Merge remote-tracking branch 'origin/develop' into mueller/master 2022-03-31 14:45:45 +02:00
muellerr c2bdb2326b Merge remote-tracking branch 'origin/develop' into mueller/master 2022-03-22 11:16:17 +01:00
muellerr ce26794812 Merge remote-tracking branch 'origin/develop' into mueller/master 2022-03-14 09:38:10 +01:00
Robin Mueller 74f5ebd4e5 Merge branch 'mueller/master' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc into mueller/master 2022-03-02 11:26:46 +01:00
Robin Mueller 2c96b9ed4c Merge remote-tracking branch 'origin/develop' into mueller/master 2022-03-01 17:33:02 +01:00
Robin Mueller a408a3caec Merge remote-tracking branch 'origin/develop' into mueller/master 2022-03-01 17:31:49 +01:00
Robin Mueller 56d414d9fc Merge remote-tracking branch 'origin/develop' into mueller/master 2022-02-28 13:29:11 +01:00
Robin Mueller 3a045ec4b4 Merge remote-tracking branch 'origin/develop' into mueller/pcdu-cmd-updates 2022-01-27 16:38:07 +01:00