2a7e82bd28
Merge branch 'master' into source/vorago
2020-08-21 15:27:28 +02:00
49d4b6ebc7
Merge pull request 'All includes are relative now #147 ' ( #164 ) from gaisser/fsfw:gaisser_relative_paths into master
2020-08-18 12:07:40 +02:00
9e0a905096
Two paths gone wrong
2020-08-13 20:58:49 +02:00
d5dedce294
Relative Paths
2020-08-13 20:53:35 +02:00
e535bc1427
Merge pull request 'PUS: PUS Services' ( #139 ) from KSat/fsfw:mueller_PusServices into master
2020-08-12 10:07:36 +02:00
18105e2d16
Merge pull request 'CSB improvements' ( #143 ) from KSat/fsfw:mueller/feature/CSBupdate into master
2020-08-12 10:05:43 +02:00
ebc11bd777
Merge pull request 'Corrected warning in framework mk to fit name of setting' ( #160 ) from gaisser_framework_mk_small_change into master
2020-08-11 17:21:06 +02:00
3d4daa51d5
Corrected warning to fit name of setting
2020-08-11 17:17:50 +02:00
3905b72b08
Merge pull request 'linux hotfix' ( #155 ) from KSat/fsfw:mueller/LinuxHotfix into master
2020-08-07 22:29:29 +02:00
90a3e2b8c5
linux hotfix
2020-08-07 22:26:01 +02:00
ea9288d848
updated subsystem ID range
2020-08-04 15:17:40 +02:00
78442a8b92
Amending PR #145 , forgot some documentation
2020-08-04 12:25:29 +02:00
03539a6991
Merge pull request 'HasActionsIF + CommandMessage Typo' ( #145 ) from KSat/fsfw:mueller/feature/HasActionsIF into master
2020-08-04 12:18:29 +02:00
6ac36cec15
removed other include in framework.mk
2020-08-02 15:56:38 +02:00
d58fc5c6f7
removed includes in framework.mk
2020-08-02 15:55:56 +02:00
be6060ec94
Merge remote-tracking branch 'upstream/master' into mueller_PusServices
2020-08-02 15:55:22 +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
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
b400deed1a
removed config includes
2020-07-17 14:37:54 +02:00
307c954007
fixed CommandMessageTypo
...
and integrated HasActionsIF interface changes
2020-07-16 12:49:53 +02:00
aca0c94c51
CSB new update init
2020-07-16 11:47:11 +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
