Commit Graph

100 Commits

Author SHA1 Message Date
ee67e46a9f Merge remote-tracking branch 'origin/development' into mueller/fsfw-update-2 2021-02-09 14:44:19 +01:00
9b2772c126 better diagnostic printout if case there are issues 2021-02-08 13:42:44 +01:00
484f9b6b37 some tweaks 2021-01-29 17:16:34 +01:00
2edf158312 correct preprocessor define now used 2021-01-03 14:16:52 +01:00
c19e628d79 all cstdout uses wrapped in preprocessor defines 2021-01-03 13:58:18 +01:00
d607332f8d removed comment 2020-12-22 14:19:13 +01:00
3b391d3380 deleted service types header 2020-12-22 14:15:21 +01:00
703d2590ff update csb 2020-12-15 15:20:08 +01:00
25db9bc9ed tmtcservices update 2020-12-14 21:30:39 +01:00
5e234f1e23 cmake init, printChar tests 2020-12-07 01:40:10 +01:00
e71020d631 Removed comments and added include 2020-09-29 15:24:29 +02:00
a71528551a include added 2020-09-29 15:10:08 +02:00
183b6a4193 small bugfix 2020-09-29 13:34:27 +02:00
7851a71a8e commanding service base hotfix 2020-09-22 14:00:18 +02:00
b8d638cb69 Merge branch 'master' into gaisser_fixes_fixedMap 2020-09-10 15:27:15 +02:00
976fd54f5e Merge branch 'master' into gaisser_fixes_fixedMap 2020-09-08 14:17:53 +02:00
d87cf0a612 Merge branch 'master' into gaisser_bugs_fixedMap_FIFO 2020-09-08 14:14:38 +02:00
2a28114b49 Fixes for #190 and #189 2020-09-07 15:43:48 +02:00
2439ac455b tmtc bridge update, uses dynamic FIFO now 2020-09-06 15:48:30 +02:00
03b2ca679d include guard correction 2020-09-01 12:58:29 +02:00
cc5c944c84 Merge branch 'master' into gaisser_fixes_fixedMap 2020-09-01 11:41:03 +02:00
795b1e5245 Merge remote-tracking branch 'upstream/master' into mueller_FIFO_static_normal 2020-08-27 20:18:06 +02:00
d5dedce294 Relative Paths 2020-08-13 20:53:35 +02:00
7dbab61ab7 Merge remote-tracking branch 'origin/master' into gaisser_fixes_fixedMap 2020-08-12 10:10:39 +02:00
8c722feafb Fixes #47 and #36 2020-08-11 16:21:59 +02:00
d8bf1931cc doc correction 2020-08-01 16:55:20 +02:00
2198406714 csb update 2020-08-01 16:53:17 +02:00
4213e2e081 Merge remote-tracking branch 'upstram/master' into mueller/feature/CSBupdate 2020-08-01 16:46:27 +02:00
35fe41361b Merge remote-tracking branch 'upstream/master' into mueller_FIFO_static_normal 2020-07-28 13:08:04 +02:00
802004107b Merge remote-tracking branch 'upstream/master' into mueller_FIFO_static_normal 2020-07-28 13:07:35 +02:00
32f22dd974 Merge pull request 'CommandingServiceBase improvements' (#105) from KSat/fsfw:mueller_CSB_improvements into master 2020-07-28 12:12:07 +02:00
40d0568062 Merge pull request 'PusServiceBase enhancements' (#103) from KSat/fsfw:mueller_PSB_improvement into master 2020-07-28 12:10:18 +02:00
136a68000b Merge remote-tracking branch 'upstream/master' into mueller_CSB_improvements 2020-07-25 11:00:27 +02:00
06e7f286d6 added explicit brackets 2020-07-25 10:55:28 +02:00
aca0c94c51 CSB new update init 2020-07-16 11:47:11 +02:00
52f56ca798 Merge pull request 'tmtc bridge improvements' (#136) from KSat/fsfw:mueller_TmTcBridgeImprovements into master 2020-07-14 11:58:38 +02:00
14f86422e3 additional size_t replacement 2020-07-13 19:47:31 +02:00
d34ee48126 Merge remote-tracking branch 'upstream/master' into mueller_CSB_improvements 2020-07-13 19:39:36 +02:00
26b5ef6dac Merge branch 'master' into mohr_serialize 2020-07-10 12:19:51 +02:00
1025a3cecc Merge remote-tracking branch 'upstream/master' into mueller_CSB_improvements 2020-07-09 19:49:47 +02:00
90e299977b minor formatting improvements 2020-07-09 19:41:16 +02:00
133ed9586b tmtc bridge improvements 2020-07-09 19:31:28 +02:00
d795892d57 csb fifo tweak 2020-07-07 17:54:09 +02:00
e9166ec4c7 Merge remote-tracking branch 'upstream/master' into mueller_FIFO_static_normal 2020-07-07 17:43:03 +02:00
b699c8b2b3 put FIFO in namespace, fixed doc 2020-07-06 13:38:11 +02:00
991385de65 added missing include, CSB uses static fifo now 2020-07-06 13:29:56 +02:00
8c68895c06 Merge remote-tracking branch 'origin/master' into mohr_serialize 2020-07-03 11:59:15 +02:00
d311c49998 setTaskIF implemented 2020-06-29 16:57:00 +02:00
5400e38126 slight change 2020-06-29 16:53:32 +02:00
ce3e4a1176 added getter for reject reply 2020-06-24 16:24:16 +02:00