Commit Graph

260 Commits

Author SHA1 Message Date
d34ee48126 Merge remote-tracking branch 'upstream/master' into mueller_CSB_improvements 2020-07-13 19:39:36 +02:00
170a2c58f0 Merge pull request 'size_t replacement' (#140) from KSat/fsfw:mueller/hotfix/HealthTableIF into master 2020-07-13 11:52:06 +02:00
72c9ef1089 size_t replacement 2020-07-13 02:12:11 +02:00
5fb5cea949 Merge pull request 'Update SerializeAdapter' (#122) from mohr_serialize into master 2020-07-10 12:21:14 +02:00
26b5ef6dac Merge branch 'master' into mohr_serialize 2020-07-10 12:19:51 +02:00
83484237ae default argument for getter function 2020-07-09 19:53:17 +02:00
1025a3cecc Merge remote-tracking branch 'upstream/master' into mueller_CSB_improvements 2020-07-09 19:49:47 +02:00
9f4f8d945c Merge pull request 'hotfix: arrayprinter was renamed' (#131) from KSat/fsfw:mueller_hotfix_arrayprinter into master 2020-07-07 13:27:11 +02:00
986bb154be hotfix: arrayprinter was renamed 2020-07-07 13:24:04 +02:00
ce5a241f4f Merge pull request 'new initializer list ctor' (#72) from KSat/fsfw:mueller_initializer_list into master 2020-07-07 12:10:53 +02:00
56c8f4877d Merge pull request 'mueller_TmTcBridge_cherryPicked' (#40) from KSat/fsfw:mueller_TmTcBridge_cherryPicked into master 2020-07-07 12:06:47 +02:00
6f40a8c622 Merge pull request 'mueller_stopwatch' (#30) from KSat/fsfw:mueller_stopwatch into master 2020-07-07 12:05:04 +02:00
c3172d7308 Merge remote-tracking branch 'upstream/master' into mueller_TmTcBridge_cherryPicked 2020-07-03 16:33:17 +02:00
6e79972086 size_t for DataPoolAdmin 2020-07-03 15:50:29 +02:00
45430e8586 Reworked PoolRawAccess to use EndianConverter instead of converting by itself 2020-07-03 15:47:05 +02:00
89accf8940 Documented EndianConverter and changed length to size_t 2020-07-03 15:46:00 +02:00
06b481b02f Corrected filename of EndianConverter.h 2020-07-03 12:44:08 +02:00
8c68895c06 Merge remote-tracking branch 'origin/master' into mohr_serialize 2020-07-03 11:59:15 +02:00
3cd946fef8 Merge pull request 'DeviceHandlerBase: All Refactoring' (#44) from KSat/fsfw:mueller_DeviceHandlerBase_AllRefactoring into master 2020-07-03 11:48:55 +02:00
68c41e2396 Merge pull request 'new returnvalues, RETURN_FAILED is 0xFFFF now' (#120) from KSat/fsfw:mueller_returnvalues into master 2020-07-02 14:45:05 +02:00
a09aa8df4a include guard commnet 2020-07-02 14:43:19 +02:00
f67c836ded RETURN_FAILED is 1 again 2020-07-02 14:42:16 +02:00
58c5b179c6 Merge pull request 'all fixed slot sequence improvenements' (#24) from KSat/fsfw:mueller_FixedSequenceImprovements into master 2020-07-02 14:28:53 +02:00
5400e38126 slight change 2020-06-29 16:53:32 +02:00
1ed5da3a12 getter function bugfix 2020-06-24 16:26:44 +02:00
ce3e4a1176 added getter for reject reply 2020-06-24 16:24:16 +02:00
fc0d42e3e0 error output for CSB init failure 2020-06-24 16:07:02 +02:00
644896245f better returnvalues for CSB init 2020-06-24 16:03:54 +02:00
8a56964dab doc fix, various improvements 2020-06-24 16:01:17 +02:00
df418ae1b4 typedef in class declaration now 2020-06-24 12:02:01 +02:00
b2c352b0f7 Merge pull request 'linux important bugfix and general improvements' (#101) from KSat/fsfw:mueller_Linux_Bugfix into master
This fixes #100
2020-06-23 20:28:13 +02:00
7aa713a452 added function as alternative to macro 2020-06-23 14:12:55 +02:00
9dc2ea426b typo fix 2020-06-23 13:49:04 +02:00
1d6ce65682 returnvalue all ones now 2020-06-23 13:46:43 +02:00
fd8a3e9fcc new returnvalues, return failed is 0xFFFF now 2020-06-23 13:00:38 +02:00
e935b8bd04 some minor improvements 2020-06-23 10:45:47 +02:00
d51b3b68e4 Merge remote-tracking branch 'upstream/master' into mueller_TmTcBridge_cherryPicked 2020-06-23 10:37:10 +02:00
918329163f removed empty line 2020-06-23 10:31:53 +02:00
ba8122f2db Merge remote-tracking branch 'upstream/master' into mueller_FixedSequenceImprovements 2020-06-23 10:29:45 +02:00
cda3130b34 periodic reply map param is bool now 2020-06-19 01:05:51 +02:00
b412ef587a Merge remote-tracking branch 'upstream/master' into mueller_DeviceHandlerBase_AllRefactoring 2020-06-19 00:45:02 +02:00
72f3b16c24 split up huge member function for readability 2020-06-10 22:53:24 +02:00
534fddd2c6 added back comment removed for unknown reasons 2020-06-10 22:19:08 +02:00
482aedfaf2 cleaned up includes, improved doc 2020-06-10 22:13:49 +02:00
5dc2133c3a CSB improvements 2020-06-10 21:41:48 +02:00
454524d213 Merge pull request 'iomanip include missing' (#104) from KSat/fsfw:ObjectManager_hotfix into master 2020-06-10 20:55:48 +02:00
b6f6a61656 iomanip include missing 2020-06-10 20:51:59 +02:00
92074c7fa2 Merge remote-tracking branch 'upstream/master' into mueller_FixedSequenceImprovements 2020-06-10 16:45:22 +02:00
887f8331a2 Merge remote-tracking branch 'upstream/master' into mueller_TmTcBridge_cherryPicked 2020-06-10 16:44:11 +02:00
dc43222db8 Merge remote-tracking branch 'upstream/master' into mueller_stopwatch 2020-06-10 16:43:05 +02:00