 gaisser
|
6efdf170f4
|
Merge pull request 'Removed old test files' (#226) from gaisser/fsfw:master into master
Reviewed-on: fsfw/fsfw#226
|
2020-09-30 20:26:08 +02:00 |
|
|
Steffen Gaisser
|
a14558ef1f
|
Removed old test files
|
2020-09-30 20:25:02 +02:00 |
|
|
Steffen Gaisser
|
fcabf93af3
|
Added a few comments
|
2020-09-30 16:27:18 +02:00 |
|
|
Steffen Gaisser
|
ab9858b0c7
|
Added comments
|
2020-09-30 16:15:48 +02:00 |
|
|
Steffen Gaisser
|
823bae1a2a
|
Added null pointer checks for FIFO Base
|
2020-09-30 16:06:17 +02:00 |
|
|
Steffen Gaisser
|
2f61bd0a0f
|
A few typos and more docu
|
2020-09-30 14:38:46 +02:00 |
|
|
Steffen Gaisser
|
aeeef53508
|
Added Documentation to placement factory
|
2020-09-30 14:34:02 +02:00 |
|
|
gaisser
|
5340b9c58e
|
Merge pull request 'Typo in FixedOrderedMultimap' (#220) from gaisser/fsfw:gaisser_another_small_fix into master
Reviewed-on: fsfw/fsfw#220
|
2020-09-30 10:58:26 +02:00 |
|
|
gaisser
|
659671e1df
|
Merge branch 'master' into gaisser_another_small_fix
|
2020-09-30 10:57:50 +02:00 |
|
|
Steffen Gaisser
|
5fc583117d
|
Typo in FixedOrderedMultimap
|
2020-09-30 10:55:34 +02:00 |
|
|
Steffen Gaisser
|
303fcec9f6
|
Added a missing include
|
2020-09-29 17:49:04 +02:00 |
|
|
gaisser
|
896302c506
|
Merge branch 'master' into gaisser_service200_returns
|
2020-09-29 15:43:18 +02:00 |
|
|
Steffen Gaisser
|
1bdccedabe
|
Fixes #86
|
2020-09-29 15:39:24 +02:00 |
|
|
Steffen Gaisser
|
e71020d631
|
Removed comments and added include
|
2020-09-29 15:24:29 +02:00 |
|
|
gaisser
|
a3235ced17
|
Merge pull request 'include added' (#215) from KSat/fsfw:mueller/VerifHotfix into master
Reviewed-on: fsfw/fsfw#215
|
2020-09-29 15:18:02 +02:00 |
|
|
gaisser
|
d3ce6d147e
|
Merge branch 'master' into mueller/VerifHotfix
|
2020-09-29 15:13:43 +02:00 |
|
|
gaisser
|
ce983953ff
|
Merge pull request 'Modes and Memory convergence' (#214) from KSat/fsfw:mueller/modes-memory into master
Reviewed-on: fsfw/fsfw#214
|
2020-09-29 15:13:34 +02:00 |
|
|
gaisser
|
e55f8f583d
|
Merge branch 'master' into gaisser_small_map_issues
|
2020-09-29 14:58:35 +02:00 |
|
|
gaisser
|
a700f6a96d
|
Merge pull request 'New StoreAccessors and separation of implementation for storagemanager classes' (#92) from KSat/fsfw:mueller_StoreAccessor into master
Reviewed-on: fsfw/fsfw#92
|
2020-09-29 14:57:06 +02:00 |
|
|
gaisser
|
dae79f30d7
|
Merge pull request 'timeslot update' (#179) from KSat/fsfw:mueller/FixedTimeslotUpdate into master
Reviewed-on: fsfw/fsfw#179
|
2020-09-29 14:30:59 +02:00 |
|
|
gaisser
|
9f7dad31eb
|
Merge branch 'master' into mueller/FixedTimeslotUpdate
|
2020-09-29 14:21:02 +02:00 |
|
|
gaisser
|
21cbb19410
|
Merge pull request 'ipc update' (#176) from KSat/fsfw:mueller/ipc-updates into master
Reviewed-on: fsfw/fsfw#176
|
2020-09-29 14:20:18 +02:00 |
|
|
gaisser
|
170217e2e8
|
Merge branch 'master' into mueller/ipc-updates
|
2020-09-29 14:15:13 +02:00 |
|
|
gaisser
|
291a62eeb9
|
Merge branch 'master' into gaisser_small_map_issues
|
2020-09-29 14:14:48 +02:00 |
|
|
gaisser
|
945f49bbe9
|
Merge pull request 'Object Id and Verif Reporter Improvements' (#213) from KSat/fsfw:mueller/objectIdImprovement into master
User have to change instantiation to the objectId of the new PUS Services
Reviewed-on: fsfw/fsfw#213
|
2020-09-29 14:14:27 +02:00 |
|
|
gaisser
|
842c21684a
|
Merge branch 'master' into gaisser_small_map_issues
|
2020-09-22 18:37:51 +02:00 |
|
|
gaisser
|
d1fb512c1f
|
Merge pull request 'Small fix with new pus services' (#210) from gaisser/fsfw:gaisser_small_fix_subsystem_id into master
Reviewed-on: fsfw/fsfw#210
|
2020-09-22 17:10:09 +02:00 |
|
|
Steffen Gaisser
|
59f72d1031
|
Small fix with new pus services
|
2020-09-22 16:59:13 +02:00 |
|
|
Steffen Gaisser
|
74a4c98ca7
|
Small format stuff
|
2020-09-22 16:23:35 +02:00 |
|
|
gaisser
|
d0f912f32b
|
Merge branch 'master' into mueller/FixedTimeslotUpdate
|
2020-09-22 16:20:07 +02:00 |
|
|
Steffen Gaisser
|
b681a76f29
|
Merge branch 'master' into gaisser_small_map_issues
|
2020-09-22 16:18:55 +02:00 |
|
|
Steffen Gaisser
|
ed80768c66
|
Fixes #194
|
2020-09-22 16:13:45 +02:00 |
|
|
gaisser
|
9faa8d3896
|
Merge branch 'master' into mueller/ipc-updates
|
2020-09-22 15:25:58 +02:00 |
|
|
gaisser
|
8f2c8c838e
|
Merge branch 'master' into mueller/FixedTimeslotUpdate
|
2020-09-22 15:24:07 +02:00 |
|
|
gaisser
|
66383f78c6
|
Merge pull request 'renormalized files' (#201) from KSat/fsfw:mueller/file_renormalization into master
Reviewed-on: fsfw/fsfw#201
|
2020-09-22 15:22:34 +02:00 |
|
|
gaisser
|
56c6f971e1
|
Merge branch 'master' into mueller/file_renormalization
|
2020-09-22 15:11:02 +02:00 |
|
|
gaisser
|
33de6851eb
|
Merge pull request 'SharedRingBuffer' (#167) from KSat/fsfw:mueller/sharedRingBufferPullRequest into master
Reviewed-on: fsfw/fsfw#167
|
2020-09-22 15:08:31 +02:00 |
|
|
gaisser
|
f575c923d7
|
Merge branch 'master' into mueller/sharedRingBufferPullRequest
|
2020-09-22 15:08:06 +02:00 |
|
|
gaisser
|
40d83fe603
|
Merge pull request 'SimpleRingBuffer Improvements' (#172) from KSat/fsfw:mueller/SimpleRingBufferUpdate2 into master
Reviewed-on: fsfw/fsfw#172
|
2020-09-22 15:07:34 +02:00 |
|
|
gaisser
|
bb896faeb4
|
Merge branch 'master' into mueller/SimpleRingBufferUpdate2
|
2020-09-22 15:07:25 +02:00 |
|
|
gaisser
|
580669d49d
|
Merge pull request 'object manager convergence' (#202) from KSat/fsfw:mueller/objectManager-convergence into master
Reviewed-on: fsfw/fsfw#202
|
2020-09-22 15:03:56 +02:00 |
|
|
gaisser
|
90b3ebd390
|
Merge branch 'master' into mueller/objectManager-convergence
|
2020-09-22 15:00:51 +02:00 |
|
|
gaisser
|
1791b5af57
|
Merge pull request 'Default Time Stamper' (#199) from KSat/fsfw:mueller/feature/timeStamper into master
Reviewed-on: fsfw/fsfw#199
|
2020-09-22 15:00:32 +02:00 |
|
|
gaisser
|
108f897102
|
Merge branch 'master' into mueller/feature/timeStamper
|
2020-09-22 14:57:56 +02:00 |
|
|
gaisser
|
9aaa5721af
|
Merge pull request 'PUS Service 9' (#198) from KSat/fsfw:mueller/pusSrv9 into master
Reviewed-on: fsfw/fsfw#198
|
2020-09-22 14:56:38 +02:00 |
|
|
gaisser
|
ade9c32ff3
|
Merge branch 'master' into mueller/pusSrv9
|
2020-09-22 14:56:21 +02:00 |
|
|
gaisser
|
da4f6cf447
|
Merge pull request 'Stopwatch-Update' (#200) from KSat/fsfw:mueller/Stopwatch-Update into master
Reviewed-on: fsfw/fsfw#200
|
2020-09-22 14:56:06 +02:00 |
|
|
gaisser
|
af53bf6643
|
Merge branch 'master' into mueller/Stopwatch-Update
|
2020-09-22 14:52:20 +02:00 |
|
|
gaisser
|
d8c5c4d85d
|
Merge branch 'master' into mueller/pusSrv9
|
2020-09-22 14:49:39 +02:00 |
|
|
gaisser
|
17583f605d
|
Merge pull request 'PUS Service 17' (#197) from KSat/fsfw:mueller/pusSrv17 into master
Reviewed-on: fsfw/fsfw#197
|
2020-09-22 14:49:30 +02:00 |
|
|
gaisser
|
447b69bf03
|
Merge branch 'master' into mueller/SimpleRingBufferUpdate2
|
2020-09-22 14:20:51 +02:00 |
|
|
gaisser
|
37cf7566f9
|
Merge branch 'master' into mueller/sharedRingBufferPullRequest
|
2020-09-22 14:20:11 +02:00 |
|
|
gaisser
|
0d8200e856
|
Merge pull request 'commanding service base hotfix' (#204) from KSat/fsfw:mueller/CSB-hotfix into master
Reviewed-on: fsfw/fsfw#204
|
2020-09-22 14:05:21 +02:00 |
|
|
gaisser
|
d38e13f9d3
|
Merge branch 'master' into mueller/FixedTimeslotUpdate
|
2020-09-15 16:53:04 +02:00 |
|
|
gaisser
|
f3d42de399
|
Merge branch 'master' into mueller/ipc-updates
|
2020-09-15 15:47:14 +02:00 |
|
|
gaisser
|
db697f16de
|
Merge branch 'master' into mueller_StoreAccessor
|
2020-09-15 15:46:11 +02:00 |
|
|
gaisser
|
42bfedd36c
|
Merge pull request 'health helper update' (#184) from KSat/fsfw:mueller/HealthHelperIdFix into master
Reviewed-on: fsfw/fsfw#184
|
2020-09-15 15:45:56 +02:00 |
|
|
gaisser
|
9061d6d67e
|
Merge branch 'master' into mueller/HealthHelperIdFix
|
2020-09-15 15:45:42 +02:00 |
|
|
gaisser
|
c375e838b8
|
Merge pull request 'Some minor serialize file changes' (#185) from KSat/fsfw:mueller/serialize-convergence into master
Reviewed-on: fsfw/fsfw#185
|
2020-09-15 15:44:40 +02:00 |
|
|
gaisser
|
d77d370c8a
|
Merge branch 'master' into mueller/serialize-convergence
|
2020-09-15 15:42:12 +02:00 |
|
|
gaisser
|
21094c4926
|
Merge pull request 'added host osal' (#165) from KSat/fsfw:mueller/hostosal into master
Reviewed-on: fsfw/fsfw#165
|
2020-09-15 15:33:51 +02:00 |
|
|
gaisser
|
bff08a69fa
|
Merge branch 'master' into mueller/hostosal
|
2020-09-15 15:08:58 +02:00 |
|
|
gaisser
|
4f5b233505
|
Merge pull request 'init after task creation moved to task functionality' (#178) from KSat/fsfw:mueller/TaskUpdates into master
Reviewed-on: fsfw/fsfw#178
|
2020-09-15 15:08:18 +02:00 |
|
|
gaisser
|
9334a705f8
|
Merge branch 'master' into mueller/TaskUpdates
|
2020-09-15 15:05:45 +02:00 |
|
|
gaisser
|
2c6a239d5e
|
Merge pull request 'added new periodic op divider' (#195) from KSat/fsfw:mueller/feature/periodicOpDivider into master
Reviewed-on: fsfw/fsfw#195
|
2020-09-15 15:04:30 +02:00 |
|
|
gaisser
|
fbd75f947a
|
Merge branch 'master' into mueller/feature/periodicOpDivider
|
2020-09-15 15:02:34 +02:00 |
|
|
gaisser
|
4c17ef7be5
|
Merge pull request 'DLE encoder doc added' (#177) from KSat/fsfw:mueller/dledoc into master
Reviewed-on: fsfw/fsfw#177
|
2020-09-15 15:01:07 +02:00 |
|
|
gaisser
|
6362de5bc0
|
Merge branch 'master' into mueller/FixedTimeslotUpdate
|
2020-09-10 18:20:17 +02:00 |
|
|
gaisser
|
2d76c744c5
|
Merge branch 'master' into mueller/HealthHelperIdFix
|
2020-09-08 14:34:33 +02:00 |
|
|
gaisser
|
d1f8040599
|
Merge branch 'master' into mueller/ipc-updates
|
2020-09-08 14:33:50 +02:00 |
|
|
gaisser
|
e24e080f31
|
Merge branch 'master' into mueller/sharedRingBufferPullRequest
|
2020-09-08 14:31:40 +02:00 |
|
|
gaisser
|
dab10d761a
|
Merge branch 'master' into mueller/serialize-convergence
|
2020-09-08 14:27:12 +02:00 |
|
|
gaisser
|
976fd54f5e
|
Merge branch 'master' into gaisser_fixes_fixedMap
|
2020-09-08 14:17:53 +02:00 |
|
|
gaisser
|
d87cf0a612
|
Merge branch 'master' into gaisser_bugs_fixedMap_FIFO
|
2020-09-08 14:14:38 +02:00 |
|
|
Steffen Gaisser
|
0258ce62f0
|
Added documentation
|
2020-09-07 18:35:25 +02:00 |
|
|
Steffen Gaisser
|
b65789824c
|
Removed old hacks and replaced by standard c++
Added overflow check in SerializeAdapter
|
2020-09-07 18:06:08 +02:00 |
|
|
Steffen Gaisser
|
278053a342
|
Another fix in DynamicFIFO
|
2020-09-07 15:49:28 +02:00 |
|
|
Steffen Gaisser
|
2a28114b49
|
Fixes for #190 and #189
|
2020-09-07 15:43:48 +02:00 |
|
|
gaisser
|
4da21d2c38
|
Merge branch 'master' into mueller/ipc-updates
|
2020-09-01 13:12:39 +02:00 |
|
|
gaisser
|
b3d08cd40b
|
Merge pull request 'FIFO is StaticFIFO now, new FIFO using vector' (#127) from KSat/fsfw:mueller_FIFO_static_normal into master
Reviewed-on: fsfw/fsfw#127
|
2020-09-01 13:08:58 +02:00 |
|
|
gaisser
|
75f6cacd10
|
Merge branch 'master' into mueller_FIFO_static_normal
|
2020-09-01 12:56:41 +02:00 |
|
|
gaisser
|
b32ea6e316
|
Merge pull request 'RingBuffer, static CTOR' (#132) from KSat/fsfw:mueller_ringBufferStatic into master
Reviewed-on: fsfw/fsfw#132
|
2020-09-01 12:56:23 +02:00 |
|
|
gaisser
|
5308cb6237
|
Merge branch 'master' into mueller_ringBufferStatic
|
2020-09-01 12:54:08 +02:00 |
|
|
gaisser
|
96c421b72c
|
Merge pull request 'parameter improvements' (#181) from KSat/fsfw:mueller/parameter-updates into master
Reviewed-on: fsfw/fsfw#181
|
2020-09-01 12:45:20 +02:00 |
|
|
gaisser
|
f85e4eb22f
|
Merge branch 'master' into mueller/parameter-updates
|
2020-09-01 12:44:14 +02:00 |
|
|
gaisser
|
f068df9028
|
Merge pull request 'event manager improvements' (#180) from KSat/fsfw:mueller/eventmanager-improvements into master
Reviewed-on: fsfw/fsfw#180
|
2020-09-01 12:39:33 +02:00 |
|
|
gaisser
|
636e5fb888
|
Merge branch 'master' into gaisser_fixes_fixedMap
|
2020-09-01 12:35:53 +02:00 |
|
|
gaisser
|
77927363ce
|
Merge branch 'master' into mueller/eventmanager-improvements
|
2020-09-01 12:29:16 +02:00 |
|
|
gaisser
|
5d87650833
|
Merge branch 'master' into mueller/parameter-updates
|
2020-09-01 12:28:53 +02:00 |
|
|
gaisser
|
e949637271
|
Merge branch 'master' into mueller_FIFO_static_normal
|
2020-09-01 12:24:41 +02:00 |
|
|
gaisser
|
4a80872c3c
|
Merge pull request 'DHB Update' (#144) from KSat/fsfw:mueller/feature/DHBupdate into master
Reviewed-on: fsfw/fsfw#144
|
2020-09-01 12:24:19 +02:00 |
|
|
gaisser
|
a9e5b54238
|
Merge branch 'master' into mueller/feature/DHBupdate
|
2020-09-01 12:22:14 +02:00 |
|
|
gaisser
|
e77c294360
|
Merge pull request 'fdir update' (#158) from KSat/fsfw:mueller/devices/FDIR into master
Reviewed-on: fsfw/fsfw#158
|
2020-09-01 12:21:48 +02:00 |
|
|
gaisser
|
7059d5f158
|
Merge branch 'master' into mueller/devices/FDIR
|
2020-09-01 12:21:28 +02:00 |
|
|
Steffen Gaisser
|
cc5c944c84
|
Merge branch 'master' into gaisser_fixes_fixedMap
|
2020-09-01 11:41:03 +02:00 |
|
|
gaisser
|
c0ed474373
|
Update 'serialize/SerializeIF.h'
|
2020-09-01 11:34:28 +02:00 |
|
|
gaisser
|
f12c56c75f
|
Merge branch 'master' into mueller/feature/DHBupdate
|
2020-09-01 11:20:21 +02:00 |
|
|
gaisser
|
478b88d7a2
|
Merge branch 'master' into gaisser_comments_serialize
|
2020-08-28 18:15:41 +02:00 |
|
|
gaisser
|
2362b1d165
|
Merge branch 'master' into gaisser_small_bugfix_subsystem
|
2020-08-28 13:25:34 +02:00 |
|
|
gaisser
|
ce4d010b5c
|
Merge pull request 'Semaphore Initialization - Linux and FreeRTOS' (#89) from KSat/fsfw:mueller_binSemaphoreInit into master
Reviewed-on: fsfw/fsfw#89
|
2020-08-28 13:25:05 +02:00 |
|