 gaisser
|
708a47840b
|
Merge pull request 'Defaultcfg folder update' (#274) from KSat/fsfw:mueller/defaultcfg-update into development
Reviewed-on: fsfw/fsfw#274
|
2020-12-01 14:46:36 +01:00 |
|
|
gaisser
|
ea8f73120d
|
Merge pull request 'Merge current release of FSFW development' (#278) from master into development
Reviewed-on: fsfw/fsfw#278
|
2020-12-01 14:20:15 +01:00 |
|
|
gaisser
|
da9658e2a1
|
Merge branch 'development' into master
|
2020-12-01 14:19:30 +01:00 |
|
|
gaisser
|
64b6edab6f
|
Update 'README.md'
|
2020-12-01 13:32:50 +01:00 |
|
|
gaisser
|
3bd144e6f4
|
Merge pull request 'Added the new logos, colors are WIP at the moment' (#270) from gaisser/fsfw:gaisser_logo into master
Reviewed-on: fsfw/fsfw#270
|
2020-12-01 13:32:13 +01:00 |
|
|
gaisser
|
4764f6ba54
|
Merge branch 'master' into gaisser_logo
|
2020-12-01 13:31:48 +01:00 |
|
|
Steffen Gaisser
|
4241c00448
|
Added the new logos, colors are WIP at the moment
|
2020-11-30 18:30:58 +01:00 |
|
|
gaisser
|
4406c6eb86
|
Merge pull request 'meier/gaisser_readme_update' (#267) from gaisser/fsfw:meier/gaisser_readme_update into master
Reviewed-on: fsfw/fsfw#267
|
2020-11-30 16:28:09 +01:00 |
|
|
gaisser
|
ce629dfd83
|
Merge branch 'master' into meier/gaisser_readme_update
|
2020-11-30 16:27:53 +01:00 |
|
|
gaisser
|
293d34147e
|
Merge pull request 'Readme Update' (#260) from gaisser/fsfw:gaisser_readme_update into master
Reviewed-on: fsfw/fsfw#260
|
2020-11-30 16:27:24 +01:00 |
|
|
gaisser
|
5a20ec583b
|
Merge branch 'master' into gaisser_readme_update
|
2020-11-27 20:21:23 +01:00 |
|
|
gaisser
|
d3a7f86ea2
|
Merge pull request 'Fixes for RTEMS #173' (#262) from gaisser_rtems_fixes into master
Reviewed-on: fsfw/fsfw#262
|
2020-11-27 20:21:08 +01:00 |
|
|
Steffen Gaisser
|
6489246c4b
|
Updated include guards
|
2020-11-17 19:35:37 +01:00 |
|
|
Steffen Gaisser
|
273ddf9061
|
Rtems compiles again fixes #176
|
2020-11-17 19:25:57 +01:00 |
|
|
Steffen Gaisser
|
5b5f2f3e1d
|
Added hardware recommendations
|
2020-11-17 09:42:38 +01:00 |
|
|
Steffen Gaisser
|
51443d7a68
|
Version number
|
2020-11-13 15:09:00 +01:00 |
|
|
Steffen Gaisser
|
8aef4b9b99
|
Updated formatting
|
2020-11-13 14:36:32 +01:00 |
|
|
Steffen Gaisser
|
752601e85f
|
WIP readme
|
2020-11-13 14:31:30 +01:00 |
|
|
gaisser
|
0075ae53b3
|
Merge pull request 'meier/udp_bridge_embedded_linux' (#259) from eive/fsfw:meier/udp_bridge_embedded_linux into master
Reviewed-on: fsfw/fsfw#259
|
2020-11-10 15:10:47 +01:00 |
|
|
gaisser
|
030f1beb93
|
Merge branch 'master' into meier/udp_bridge_embedded_linux
|
2020-11-10 14:53:15 +01:00 |
|
|
gaisser
|
2a4b4f2114
|
Merge pull request 'config folder renamed and improved' (#255) from KSat/fsfw:mueller/fsfwconfig-better into master
Reviewed-on: fsfw/fsfw#255
|
2020-11-10 14:46:55 +01:00 |
|
|
gaisser
|
bb7709fea1
|
Merge branch 'master' into mueller/fsfwconfig-better
|
2020-11-10 14:46:04 +01:00 |
|
|
gaisser
|
bc58213482
|
Merge pull request 'Action folder: some minor form stuff' (#256) from KSat/fsfw:mueller/action-yet-another-update into master
Reviewed-on: fsfw/fsfw#256
|
2020-11-10 14:45:55 +01:00 |
|
|
gaisser
|
6bedc9b805
|
Merge pull request 'added new windows udp bridge' (#188) from KSat/fsfw:mueller/feature/windowsUdpBridge into master
Reviewed-on: fsfw/fsfw#188
|
2020-11-02 15:29:08 +01:00 |
|
|
gaisser
|
719aab2a26
|
Merge pull request 'health update' (#246) from KSat/fsfw:mueller/health-convergence into master
Reviewed-on: fsfw/fsfw#246
|
2020-11-02 15:26:51 +01:00 |
|
|
gaisser
|
470196a044
|
Merge branch 'master' into mueller/health-convergence
|
2020-11-02 15:22:58 +01:00 |
|
|
gaisser
|
9c9facf4a1
|
Merge pull request 'host osal fixes' (#247) from eive/fsfw:development into master
Reviewed-on: fsfw/fsfw#247
|
2020-11-02 15:22:37 +01:00 |
|
|
gaisser
|
cf46aebf32
|
Merge branch 'master' into development
|
2020-11-02 15:16:10 +01:00 |
|
|
gaisser
|
449a08c92c
|
Merge pull request 'testcfg fix' (#248) from fsfwtest/testcfg-fix into master
Reviewed-on: fsfw/fsfw#248
|
2020-11-02 15:15:59 +01:00 |
|
|
gaisser
|
0c15a90399
|
Merge pull request 'Default Configuration' (#243) from KSat/fsfw:mueller/defaultcfg into master
Reviewed-on: fsfw/fsfw#243
|
2020-11-02 15:09:55 +01:00 |
|
|
gaisser
|
093d3562b6
|
Merge branch 'master' into mueller/health-convergence
|
2020-11-02 14:53:20 +01:00 |
|
|
gaisser
|
2761ee8109
|
Merge branch 'master' into mueller/defaultcfg
|
2020-11-02 14:48:23 +01:00 |
|
|
gaisser
|
52d3dbfd20
|
Merge pull request 'HasReturnvaluesIF small improvements' (#245) from KSat/fsfw:mueller/returnvalue-convergence into master
Reviewed-on: fsfw/fsfw#245
|
2020-11-02 14:48:10 +01:00 |
|
|
gaisser
|
0b855c5b55
|
Merge branch 'master' into mueller/defaultcfg
|
2020-10-29 20:09:31 +01:00 |
|
|
gaisser
|
38830dfc17
|
Merge branch 'master' into mueller/health-convergence
|
2020-10-29 20:06:03 +01:00 |
|
|
gaisser
|
11a351a202
|
Merge pull request 'Unittest integrated in FSFW now' (#242) from KSat/fsfw:mueller/unittest-integration-from-master into master
Reviewed-on: fsfw/fsfw#242
|
2020-10-29 20:05:30 +01:00 |
|
|
gaisser
|
51c5b05f03
|
Merge branch 'master' into mueller/unittest-integration-from-master
|
2020-10-29 19:59:23 +01:00 |
|
|
gaisser
|
de5e62a9c8
|
Merge pull request 'Action folder: minor form improvements, include guards' (#235) from KSat/fsfw:mueller/action-update into master
Reviewed-on: fsfw/fsfw#235
|
2020-10-29 19:59:05 +01:00 |
|
|
gaisser
|
096643971b
|
Merge pull request 'TMTC Packet Base improvements' (#80) from KSat/fsfw:mueller_tcPacketBase into master
Reviewed-on: fsfw/fsfw#80
|
2020-10-29 13:17:35 +01:00 |
|
|
gaisser
|
744d3a2346
|
Merge branch 'master' into mueller/defaultcfg
|
2020-10-27 15:18:53 +01:00 |
|
|
gaisser
|
c89a24a248
|
Merge pull request 'Fixes #161' (#244) from gaisser/fsfw:gaisser_fix_dhb_stream_reset into master
Reviewed-on: fsfw/fsfw#244
|
2020-10-27 15:17:18 +01:00 |
|
|
gaisser
|
6651622a16
|
Merge branch 'master' into gaisser_fix_dhb_stream_reset
|
2020-10-27 15:16:58 +01:00 |
|
|
Steffen Gaisser
|
410094ed28
|
Fixes #161
|
2020-10-27 15:16:14 +01:00 |
|
|
gaisser
|
8b21324815
|
Merge branch 'master' into mueller/action-update
|
2020-10-27 14:30:12 +01:00 |
|
|
gaisser
|
f40b432e43
|
Merge pull request 'added FIFO to SharedRingBuffer' (#208) from KSat/fsfw:mueller/sharedRingBufferFIFO into master
Reviewed-on: fsfw/fsfw#208
|
2020-10-27 14:29:48 +01:00 |
|
|
gaisser
|
67dd153511
|
Merge branch 'master' into mueller/sharedRingBufferFIFO
|
2020-10-27 13:36:59 +01:00 |
|
|
gaisser
|
342a70d109
|
Merge branch 'master' into mueller_tcPacketBase
|
2020-10-27 12:24:12 +01:00 |
|
|
gaisser
|
756df4f37f
|
Merge branch 'master' into mueller/action-update
|
2020-10-20 16:04:29 +02:00 |
|
|
gaisser
|
0b1b9c11eb
|
Merge pull request 'TC Distribution convergence' (#229) from KSat/fsfw:mueller/tcDistribution into master
Reviewed-on: fsfw/fsfw#229
|
2020-10-20 15:11:27 +02:00 |
|
|
gaisser
|
407df913d3
|
Merge branch 'master' into mueller/tcDistribution
|
2020-10-20 14:56:53 +02:00 |
|
|
gaisser
|
3580ec0e09
|
Merge pull request 'MQM IF used by FreeRTOS' (#212) from KSat/fsfw:mueller/MQMQ_IF_UpdateFreeRTOS into master
Reviewed-on: fsfw/fsfw#212
|
2020-10-20 14:52:58 +02:00 |
|
|
gaisser
|
6b2df54204
|
Merge pull request 'Message QueueMessage IF used in Linux' (#207) from KSat/fsfw:mueller/MQM_IF_UpdateLinux into master
Reviewed-on: fsfw/fsfw#207
|
2020-10-20 14:50:47 +02:00 |
|
|
gaisser
|
17548605ec
|
Merge branch 'master' into mueller/MQMQ_IF_UpdateFreeRTOS
|
2020-10-20 14:37:22 +02:00 |
|
|
gaisser
|
54af54927b
|
Merge branch 'master' into mueller/tcDistribution
|
2020-10-01 19:05:09 +02:00 |
|
|
gaisser
|
9bf0026b8a
|
Merge branch 'master' into mueller/MQM_IF_UpdateLinux
|
2020-10-01 19:04:53 +02:00 |
|
|
gaisser
|
335e146735
|
Merge pull request 'Made tpp file less cluttered and added inline qualifier' (#234) from gaisser/fsfw:master into master
Reviewed-on: fsfw/fsfw#234
|
2020-10-01 17:45:11 +02:00 |
|
|
Steffen Gaisser
|
6776ca86eb
|
Made tpp file less cluttered and added inline qualifier
|
2020-10-01 17:44:23 +02:00 |
|
|
gaisser
|
f172c07876
|
Merge pull request 'Fixed issue with tpp File' (#233) from gaisser/fsfw:gaisser_fix_multimap3 into master
Reviewed-on: fsfw/fsfw#233
|
2020-10-01 17:37:52 +02:00 |
|
|
gaisser
|
0a9a8cf867
|
Merge branch 'master' into gaisser_fix_multimap3
|
2020-10-01 17:37:34 +02:00 |
|
|
Steffen Gaisser
|
f1bc9972f3
|
Fixed bugs
|
2020-10-01 17:36:46 +02:00 |
|
|
gaisser
|
7c7b3de14f
|
Merge pull request 'Fixes and comments in FixedOrderedMultimap' (#231) from gaisser/fsfw:gaisser_fix_multimap2 into master
Reviewed-on: fsfw/fsfw#231
|
2020-10-01 17:32:44 +02:00 |
|
|
Steffen Gaisser
|
587f87d270
|
Feedback from Robin
|
2020-10-01 17:27:24 +02:00 |
|
|
Steffen Gaisser
|
cd2cb410e4
|
Merge branch 'master' of https://egit.irs.uni-stuttgart.de/fsfw/fsfw.git
into gaisser_fix_multimap2
Conflicts:
container/FixedOrderedMultimap.h
|
2020-10-01 14:59:26 +02:00 |
|
|
gaisser
|
b292c5c927
|
Merge pull request 'FixedOrderedMultimap Implementation moved to TPP file' (#232) from KSat/fsfw:mueller/FixedOrdMultimapTpp into master
Reviewed-on: fsfw/fsfw#232
|
2020-10-01 14:02:41 +02:00 |
|
|
Steffen Gaisser
|
1f3a10b375
|
Fixes and comments in FixedOrderedMultimap
|
2020-10-01 13:30:28 +02:00 |
|
|
gaisser
|
1f994d9933
|
Merge pull request 'ArrayList and FixedMap improvements' (#218) from KSat/fsfw:mueller/ArrayList into master
Reviewed-on: fsfw/fsfw#218
|
2020-10-01 12:31:24 +02:00 |
|
|
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 |
|
|
Steffen Gaisser
|
8d8e918aeb
|
Fixed copying of FixedArrayList
|
2020-09-30 13:05:55 +02:00 |
|
|
Steffen Gaisser
|
ecc4bdf11a
|
Added a compile time check for MAX_SIZE
Compiler may warn if MAX_SIZE value overflows by itself but this checks
gives a more verbose warning
|
2020-09-30 12:50:52 +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
|
8ade9e33c1
|
Merge branch 'master' into mueller/feature/windowsUdpBridge
|
2020-09-29 15:00:07 +02:00 |
|
|
gaisser
|
ea29b272bf
|
Merge branch 'master' into mueller/feature/windowsUdpBridge
|
2020-09-29 14:59:50 +02:00 |
|
|
gaisser
|
e55f8f583d
|
Merge branch 'master' into gaisser_small_map_issues
|
2020-09-29 14:58:35 +02:00 |
|
|
gaisser
|
d6e82f64e7
|
Merge branch 'master' into mueller_tcPacketBase
|
2020-09-29 14:58:19 +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
|
b2677ae040
|
Merge branch 'master' into mueller_tcPacketBase
|
2020-09-29 14:34:16 +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
|
bf5e7241b6
|
Merge branch 'master' into mueller/MQM_IF_UpdateLinux
|
2020-09-29 14:14:56 +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 |
|