Commit Graph

50 Commits

Author SHA1 Message Date
802004107b Merge remote-tracking branch 'upstream/master' into mueller_FIFO_static_normal 2020-07-28 13:07:35 +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
26b5ef6dac Merge branch 'master' into mohr_serialize 2020-07-10 12:19:51 +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
e935b8bd04 some minor improvements 2020-06-23 10:45:47 +02:00
887f8331a2 Merge remote-tracking branch 'upstream/master' into mueller_TmTcBridge_cherryPicked 2020-06-10 16:44:11 +02:00
6be607e422 FIFO protected 2020-05-04 17:33:56 +02:00
2c6b446500 it is done :-)
However, commented outputs are not changed yet.
2020-04-23 19:13:18 +02:00
07247dbf40 added virtual keyword for init and performOp() 2020-04-23 11:50:13 +02:00
3a3960ed1c better names 2020-04-23 10:32:05 +02:00
ab2794e2d8 minor form changes 2020-04-23 10:31:27 +02:00
e3a4eca3f9 info output commented out 2020-04-23 10:31:20 +02:00
d7278c4493 adapting tmtc bridge 2020-04-23 10:31:06 +02:00
d0ce075e0d added old comment 2020-04-22 18:21:50 +02:00
04835587a7 delay variable removed 2020-04-22 18:20:04 +02:00
57c225d4fc faulty includes removed 2020-04-22 18:15:45 +02:00
cf3190a904 Actually, not that horrible, thanks to sed 2020-04-21 22:28:43 +02:00
7a79fab52a receiveTc (almost) empty now 2020-04-21 21:48:47 +02:00
2093329481 working on updating SerializeIF, to quote Basti: This is going to be horrible 2020-04-21 21:34:03 +02:00
fdbc5d5c57 com downlink message now debug and commented out 2020-04-21 14:54:04 +02:00
b252299bdb U. Mohr suggestions worked in
Furthermore, some enhancements added:
delay between sent tm and max number of sent tm per cycle
can be specified
2020-04-21 14:51:26 +02:00
5026517028 info output correction 2020-04-18 13:35:41 +02:00
98c0b2c9ac null replaced by nullptr.
storeID initialization added, all nullptr/0 initializations in header
2020-04-18 13:16:00 +02:00
ad01a36c02 std::flush instead of std::endl 2020-04-17 23:25:08 +02:00
914dec3691 debug output change 2020-04-17 23:22:50 +02:00
2e95906f27 recvBuffer and recvSize initialized 2020-04-17 23:22:38 +02:00
8a6a2bf840 comment deleted 2020-04-17 23:20:58 +02:00
20c67c4aa3 tmtc bridge bugfix:
tm data deleted when overwriting old data
2020-04-17 23:20:47 +02:00
8cb4a9897e tmtc bridge debug output corrected 2020-04-17 23:20:10 +02:00
4a218470cf max number of stored packets lowered 2020-04-17 23:18:16 +02:00
b422ff601a connect and disconnect functions public 2020-04-17 23:17:59 +02:00
f3af2987e6 receiveTc function adapted 2020-04-17 23:17:32 +02:00
c867b83541 doc extended, instructions for sendTm and recvTc 2020-04-17 23:17:04 +02:00
ceb688daf4 tmtc bridge bugfix 2020-04-17 23:14:11 +02:00
2173d43d92 Generic TMTC Bridge added 2020-04-17 23:11:58 +02:00
75106e7317 Merge branch 'mueller_CSB_AbstractFunctionsAtTop' of KSat/fsfw into master
Added some comments in Commanding Service Base and moved abstract functions to the top for better visibility.
2020-02-11 16:10:26 +01:00
3f2f76b8cf Update 'tmtcservices/CommandingServiceBase.h'
Added a few comments
2020-02-11 15:38:12 +01:00
c98f19b4c0 Update 'tmtcservices/PusServiceBase.h'
Removed comment.
2020-02-11 15:17:03 +01:00
11861c0dbc Moved CSB abstract functions to top
Interface functions closer at top
2020-02-03 22:27:44 +01:00
47b588c429 PusServiceBase bufix + doc
Bugfix for error parameter 2 (wrong type). Some formatting and doc
improvements
2020-01-18 22:53:38 +01:00
cd7e47ccbb Updated FreeRTOS Osal
CommandingServiceBase is no longer a template
2019-08-28 14:50:24 +02:00
fd782b20c0 Adding Code for Linux 2018-12-19 19:42:00 +01:00
575f70ba03 updating code from Flying Laptop
This is the framework of Flying Laptop OBSW version A.13.0.
2018-07-12 16:29:32 +02:00
Bastian Baetz
1d22a6c97e Today's the day. Renamed platform to framework. 2016-06-15 23:48:49 +02:00