f36da8a79c
Merge remote-tracking branch 'upstream/master' into mueller/feature/DHBupdate
2020-08-02 15:49:11 +02:00
2e08037e75
revertiing pool changes
2020-08-02 15:48:09 +02:00
a0ff1e0019
reverted datapool changes
2020-08-02 15:46:25 +02:00
e188e65897
Merge pull request 'important bugfix' ( #152 ) from KSat/fsfw:hotfix/PeriodicTaskOverflowChecking into master
2020-07-30 11:22:47 +02:00
652c60c362
important bugfix
...
I checked all 5 cases for overflows when checking
for missed deadlines (there is current time, timeToWake
and lastWakeTime, with various combinations of overflows)
This should be the correct implementation now
2020-07-29 20:02:04 +02:00
c16675f69a
Merge pull request 'SerialArrayListAdapter' ( #151 ) from KSat/fsfw:bugfix/SerialArrayListAdapter into master
2020-07-28 13:08:10 +02:00
4bffcf17fb
some formatting stuff
2020-07-28 13:04:58 +02:00
036a887ea3
bugfix
2020-07-28 13:02:43 +02:00
a87a8f527f
Merge pull request 'ServiceInterfaceBuffer Bugfix #149 ' ( #150 ) from gaisser_fix_service_interface_149 into master
2020-07-28 12:51:28 +02:00
b74fbbddb9
Merge pull request 'FreeRTOS PeriodicTask improvement' ( #116 ) from KSat/fsfw:mueller_PeriodicTaskImprovements into master
2020-07-28 12:45:27 +02:00
88cec7ddb1
Merge pull request 'framework submakefile improvements' ( #114 ) from KSat/fsfw:mueller_Framework_mk_OS_FSFW into master
2020-07-28 12:37:28 +02:00
0defc6a7d8
removed folders
2020-07-28 12:36:22 +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
86c48cb7d8
Merge pull request 'Newlib nano CCSDS define' ( #49 ) from KSat/fsfw:mueller_CCSDSTime_Bugfix_Atmel into master
...
Does not hurt anyone.
2020-07-28 12:00:10 +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
be9d0a61f4
Fixes #149
2020-07-21 15:15:53 +02:00
e1c17409d9
Merge pull request 'service interface stream enhancements' ( #93 ) from KSat/fsfw:mueller_ServiceStreamEnhancement into master
2020-07-21 12:18:20 +02:00
dc4db6e031
Fixed spelling mistake in HealthHelper
2020-07-16 13:32:08 +02:00
6b03a1c03d
commented out some more components
2020-07-16 13:00:22 +02:00
c9bc022941
commented out all new hk manager components
2020-07-16 12:57:29 +02:00
36f7cf2caf
updated DHB changes
2020-07-16 12:54:30 +02:00
646e86ea85
dhb update init
2020-07-16 11:56:48 +02:00
7a4a2f986a
Merge pull request 'new intialize after task creation function' ( #137 ) from KSat/fsfw:mueller_ExecutableObjectIF_newInit into master
2020-07-14 11:59:14 +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
639e61cebf
Merge pull request 'FixedTimeslotTask FreeRTOS improvements' ( #117 ) from KSat/fsfw:mueller_FixedTimeslotTaskImprovements into master
2020-07-14 11:45:41 +02:00
8f2a7b9e68
Merge pull request 'hybrid iterator fix and improvement' ( #109 ) from KSat/fsfw:mueller_HybridIterator into master
2020-07-14 11:40:48 +02:00
ced61da357
Merge pull request 'Fixed spelling mistake in HealthHelper' ( #121 ) from gaisser_fix_spelling_mistake_health into master
2020-07-14 11:24:14 +02:00
ef2a44c683
added back inttypes.h for cleaner code
2020-07-13 22:15:38 +02:00
9f12f232bc
Merge branch 'mueller_CCSDSTime_Bugfix_Atmel' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller_CCSDSTime_Bugfix_Atmel
2020-07-13 22:07:27 +02:00
ae486f5330
Merge remote-tracking branch 'upstream/master' into mueller_CCSDSTime_Bugfix_Atmel
2020-07-13 22:02:17 +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
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
d1e922eecf
new intiialize after task creation function
2020-07-09 20:08:40 +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
90e299977b
minor formatting improvements
2020-07-09 19:41:16 +02:00
133ed9586b
tmtc bridge improvements
2020-07-09 19:31:28 +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
856f1efd6b
Merge remote-tracking branch 'upstram/master' into mueller_PeriodicTaskImprovements
2020-07-06 12:40:27 +02:00
6a0a2675b1
typedef instead of auto used now
2020-07-06 12:36:01 +02:00
