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
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
Steffen Gaisser
1ae79ab99d
Improvements of comments
2020-08-25 15:06:53 +02:00
Steffen Gaisser
6903a761ff
Some corrections
2020-08-25 14:23:59 +02:00
Steffen Gaisser
af52d1ffda
Added some documentation in SerializeIF
2020-08-25 14:14:58 +02:00
gaisser
7571bc3728
Merge pull request 'renamed MESSAGE_TYPE to messagetypes' ( #110 ) from KSat/fsfw:mueller_MessageNamespaceRenamed into master
2020-08-25 14:08:32 +02:00
gaisser
e0a2d09716
Merge pull request 'getter/setter functions for serial buffer adapter' ( #170 ) from KSat/fsfw:mueller/SerialBufferAdapter into master
2020-08-25 13:51:30 +02:00
gaisser
9245b14569
Merge pull request 'FreeRTOS Stack Size Correction' ( #156 ) from KSat/fsfw:mueller/FreeRTOSstackSizeCorrection into master
2020-08-25 13:00:38 +02:00
gaisser
b5d6d5a178
Merge pull request 'freeRTOS task management init' ( #157 ) from KSat/fsfw:mueller/FreeRTOS/TaskManagement into master
2020-08-25 12:42:42 +02:00
gaisser
fddf31121d
Merge pull request 'setTaskIF in periodic task' ( #154 ) from KSat/fsfw:mueller/Linux-SetTaskIF-Fix into master
2020-08-25 12:29:02 +02:00
gaisser
a1d1d42e88
Merge pull request 'singly linked list improvements' ( #108 ) from KSat/fsfw:mueller_SinglyLinkedListImprovements into master
2020-08-25 12:18:23 +02:00
gaisser
a414be23bf
Merge pull request 'renamed framework.mk to fsfw.mk' ( #169 ) from KSat/fsfw:mueller/submakefile-renamed into master
2020-08-25 12:16:48 +02:00
gaisser
02de6c41ec
Merge pull request 'Mutex improvements' ( #90 ) from KSat/fsfw:mueller_MutexImprovements into master
2020-08-25 12:13:30 +02:00
Steffen Gaisser
9e0a905096
Two paths gone wrong
2020-08-13 20:58:49 +02:00
Steffen Gaisser
d5dedce294
Relative Paths
2020-08-13 20:53:35 +02:00
Steffen Gaisser
287a83c54c
Another shadowing error
2020-08-13 19:11:23 +02:00
Steffen Gaisser
3d89bc83e5
Another shadowing, altough again no problem
2020-08-13 18:08:17 +02:00
Steffen Gaisser
4a2ef6d97f
Fixed a shadowing issue of with moving to inner scope
2020-08-13 17:58:42 +02:00
Steffen Gaisser
b484e4d5ad
Removed unused function
2020-08-13 10:27:16 +02:00
Steffen Gaisser
7dbab61ab7
Merge remote-tracking branch 'origin/master' into gaisser_fixes_fixedMap
2020-08-12 10:10:39 +02:00
gaisser
e535bc1427
Merge pull request 'PUS: PUS Services' ( #139 ) from KSat/fsfw:mueller_PusServices into master
2020-08-12 10:07:36 +02:00
gaisser
18105e2d16
Merge pull request 'CSB improvements' ( #143 ) from KSat/fsfw:mueller/feature/CSBupdate into master
2020-08-12 10:05:43 +02:00
gaisser
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
Steffen Gaisser
3d4daa51d5
Corrected warning to fit name of setting
2020-08-11 17:17:50 +02:00
Steffen Gaisser
e963aca02a
Fixed an issue with memmove in FixedOrderedMultimap
2020-08-11 17:02:19 +02:00
Steffen Gaisser
8c722feafb
Fixes #47 and #36
2020-08-11 16:21:59 +02:00
gaisser
e188e65897
Merge pull request 'important bugfix' ( #152 ) from KSat/fsfw:hotfix/PeriodicTaskOverflowChecking into master
2020-07-30 11:22:47 +02:00
gaisser
c16675f69a
Merge pull request 'SerialArrayListAdapter' ( #151 ) from KSat/fsfw:bugfix/SerialArrayListAdapter into master
2020-07-28 13:08:10 +02:00
gaisser
b74fbbddb9
Merge pull request 'FreeRTOS PeriodicTask improvement' ( #116 ) from KSat/fsfw:mueller_PeriodicTaskImprovements into master
2020-07-28 12:45:27 +02:00
gaisser
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
gaisser
32f22dd974
Merge pull request 'CommandingServiceBase improvements' ( #105 ) from KSat/fsfw:mueller_CSB_improvements into master
2020-07-28 12:12:07 +02:00
gaisser
40d0568062
Merge pull request 'PusServiceBase enhancements' ( #103 ) from KSat/fsfw:mueller_PSB_improvement into master
2020-07-28 12:10:18 +02:00
gaisser
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
Steffen Gaisser
be9d0a61f4
Fixes #149
2020-07-21 15:15:53 +02:00
gaisser
e1c17409d9
Merge pull request 'service interface stream enhancements' ( #93 ) from KSat/fsfw:mueller_ServiceStreamEnhancement into master
2020-07-21 12:18:20 +02:00
Steffen Gaisser and muellerr
dc4db6e031
Fixed spelling mistake in HealthHelper
2020-07-16 13:32:08 +02:00
gaisser
52f56ca798
Merge pull request 'tmtc bridge improvements' ( #136 ) from KSat/fsfw:mueller_TmTcBridgeImprovements into master
2020-07-14 11:58:38 +02:00
gaisser
639e61cebf
Merge pull request 'FixedTimeslotTask FreeRTOS improvements' ( #117 ) from KSat/fsfw:mueller_FixedTimeslotTaskImprovements into master
2020-07-14 11:45:41 +02:00
gaisser
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
gaisser
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
Steffen Gaisser
053b472157
Fixed spelling mistake in HealthHelper
2020-06-25 18:09:32 +02:00
gaisser
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
gaisser
514ff4f420
Merge pull request 'renamed printer to arrayprinter' ( #98 ) from KSat/fsfw:mueller_globPrinterRenaming into master
2020-06-08 12:09:17 +02:00
gaisser
29b051f288
Merge pull request 'ObjectManagerIF improvements' ( #73 ) from KSat/fsfw:mueller_objectManagerIF into master
...
* Removed include does make a include of the mission object list necessary in the user code. But this is the clean way to include mission code.
* Personally, I'm not a fan of "auto" but I can see, that this is useful here.
2020-06-08 12:08:26 +02:00
gaisser
d75e471668
Merge pull request 'Storagemanager Refactoring' ( #66 ) from KSat/fsfw:mueller_localPoolNeat into master
...
Changes of size_t will force any user to update their code. Therefore API_Change
2020-06-04 14:30:15 +02:00
gaisser
95aac66dc1
Merge pull request 'Global Printer functions' ( #78 ) from KSat/fsfw:mueller_globalPrinter into master
...
Helpers to print arrays. Implements #79
2020-06-04 14:04:42 +02:00
gaisser
2499715ccf
Merge pull request 'changed cast to be comptaible with newer freeRTOS' ( #85 ) from KSat/fsfw:mueller_mq_newCast into master
...
QueueHandle_t is used in the receiveMessage but not in send message. Seems to be the right way to handle both calls in the same way.
As MessageQueueId_t is still a uint32_t. Someday this will get us in trouble.
2020-06-04 13:20:00 +02:00
gaisser
cb14ec15b5
Merge pull request 'additional access function for mode message' ( #70 ) from KSat/fsfw:mueller_ModeMessageAddition into master
...
Getter for Can't reach mode reason. Should have been there from the beginning.
2020-05-25 15:05:00 +02:00
gaisser
d235bb5c06
Merge pull request 'added comparison operator for store_address_t' ( #77 ) from KSat/fsfw:mueller_store_address_compOperator into master
...
Adds a comparison operator for store_address_t. Small enhancement which should not break anything.
2020-05-25 14:54:29 +02:00
gaisser
5e91363d2d
Merge pull request 'fifo enhancement' ( #57 ) from KSat/fsfw:mueller_fifo_enhancement into master
...
Implements #57
2020-05-25 14:48:29 +02:00
gaisser
6dc05e4951
Merge pull request 'it is done :-) (osstreams in namespace)' ( #58 ) from KSat/fsfw:mueller_sifRenaming_soooMany into master
2020-05-08 12:35:38 +02:00
gaisser
77c21fc2c7
Merge pull request 'FixedTimeslotTask object check' ( #10 ) from KSat/fsfw:luz_FixedTimeslotTask_ExistenceCheck into master
...
Now I think we are done here.
2020-05-05 20:12:40 +02:00
gaisser
a6ecc60370
Merge pull request 'uninitialized variable' ( #59 ) from KSat/fsfw:mueller_uninitVariable_paramWrapper into master
...
Fixes Bug in ParameterWrapper.cpp
2020-05-05 19:02:56 +02:00
gaisser and Gitea
9d5a30a1f6
Merge branch 'mueller_OSAL_littleBugfix_smallChanges' of KSat/fsfw into master
...
Fixes a untracked issue with setting the last partner if when the message was not received properly.
2020-02-19 20:02:24 +01:00
gaisser and Gitea
75106e7317
Merge branch 'mueller_CSB_AbstractFunctionsAtTop' of KSat/fsfw into master
...
Added some comments in Commanding Service Base and moved abstract functions to the top for better visibility.
2020-02-11 16:10:26 +01:00
gaisser
3f2f76b8cf
Update 'tmtcservices/CommandingServiceBase.h'
...
Added a few comments
2020-02-11 15:38:12 +01:00
gaisser and Gitea
51e9cafc16
Merge branch 'mueller_PusServiceBase_Doc_And_Bugfix' of KSat/fsfw into master
...
Updated a few comments in PusServiceBase and fixed an issue with a wrong type of the additional errorParameters.
2020-02-11 15:22:59 +01:00
gaisser
c98f19b4c0
Update 'tmtcservices/PusServiceBase.h'
...
Removed comment.
2020-02-11 15:17:03 +01:00
gaisser and Gitea
543df94d84
Merge branch 'mueller_FIFO_typo' of KSat/fsfw into master
...
Fixes a typo in container/FIFO empty function name.
2020-02-11 15:13:41 +01:00
Steffen Gaisser
cd7e47ccbb
Updated FreeRTOS Osal
...
CommandingServiceBase is no longer a template
2019-08-28 14:50:24 +02:00
Steffen Gaisser
fd782b20c0
Adding Code for Linux
2018-12-19 19:42:00 +01:00
Steffen Gaisser
d1bc3a71a1
Added .gitignore for eclipse project files
2018-07-12 17:13:04 +02:00