Commit Graph
100 Commits
Author SHA1 Message Date
muellerr 902cd4d210 host osal update 2020-09-05 21:19:53 +02:00
muellerr a1155686c5 updated host osal 2020-09-05 20:18:52 +02:00
muellerr c6dbce7446 Merge remote-tracking branch 'upstream/master' into mueller/hostosal 2020-09-05 20:18:18 +02:00
muellerr d5accd16ba Merge branch 'mueller_FIFO_static_normal' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller_FIFO_static_normal 2020-09-01 12:58:38 +02:00
muellerr 03b2ca679d include guard correction 2020-09-01 12:58:29 +02:00
muellerr 4f3869de8d Merge branch 'mueller_FIFO_static_normal' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller_FIFO_static_normal 2020-09-01 12:54:02 +02:00
muellerr b522b3c29c fifo updates 2020-09-01 12:53:53 +02:00
muellerr 02cfa8bcd5 Merge branch 'master' into mueller_FIFO_static_normal 2020-09-01 12:45:25 +02:00
muellerr 66bc60f176 Merge branch 'mueller/parameter-updates' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/parameter-updates 2020-09-01 12:43:02 +02:00
muellerr 695a4e7842 offset is size_t now 2020-09-01 12:42:52 +02:00
muellerr b07b19327c renormalize CHB 2020-09-01 11:52:18 +02:00
muellerr 4abdc436fb Revert "renormalize CHB"
This reverts commit a4d9c761a7.
2020-09-01 11:51:43 +02:00
muellerr d644a40e14 Merge branch 'mueller/feature/DHBupdate' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/feature/DHBupdate 2020-09-01 11:49:53 +02:00
muellerr a4d9c761a7 renormalize CHB 2020-09-01 11:49:43 +02:00
muellerr f645fe6607 Merge pull request 'Comments in serializeIF' (#174) from gaisser/fsfw:gaisser_comments_serialize into master
Reviewed-on: #174
2020-09-01 11:37:21 +02:00
muellerr 7a5c70e753 typo fixes 2020-08-28 18:46:47 +02:00
muellerr b54d63edcb event manager improvements 2020-08-28 18:10:02 +02:00
muellerr 3ec7162832 Merge branch 'master' into mueller_FIFO_static_normal 2020-08-28 17:08:06 +02:00
muellerr b4978e7df3 Merge pull request 'Fixed a shadowing issue with moving a declaration to inner scope' (#163) from gaisser/fsfw:gaisser_small_bugfix_subsystem into master
Reviewed-on: #163
2020-08-28 17:01:16 +02:00
muellerr eb503ae030 include guard fix 2020-08-27 20:19:27 +02:00
muellerr 795b1e5245 Merge remote-tracking branch 'upstream/master' into mueller_FIFO_static_normal 2020-08-27 20:18:06 +02:00
muellerr 54112acf62 chb update 2020-08-27 20:11:36 +02:00
muellerr c4c607776c important fix, 0 init removed 2020-08-27 20:07:03 +02:00
muellerr 8f2d5a5528 DH fdir improvements 2020-08-27 19:58:35 +02:00
muellerr 2a74c8d150 Merge remote-tracking branch 'upstream/master' into mueller/devices/FDIR 2020-08-27 19:55:22 +02:00
muellerr dfe3658a85 removed hk stuff 2020-08-27 19:52:25 +02:00
muellerr 386b153ede Merge remote-tracking branch 'upstream/master' into mueller/feature/DHBupdate 2020-08-27 19:50:02 +02:00
muellerr 0fedad6da0 semaphore factory update 2020-08-27 17:14:49 +02:00
muellerr 3be253efd6 include fix 2020-08-27 17:07:42 +02:00
muellerr 73db79a3fe updated linux implementation 2020-08-27 17:06:10 +02:00
muellerr 7723ee13b3 Merge remote-tracking branch 'upstream/master' into mueller_binSemaphoreInit 2020-08-27 16:28:50 +02:00
muellerr 073f168b95 task management function taken over from master 2020-08-27 16:27:54 +02:00
muellerr aacda3afc2 interface adapted 2020-08-27 16:26:00 +02:00
muellerr 561becf6aa Merge remote-tracking branch 'upstream/master' into mueller/hostosal 2020-08-25 18:31:17 +02:00
muellerr f13e7b4255 include replacements 2020-08-25 18:30:11 +02:00
muellerr 9465c8f2b2 Merge pull request 'include fix FreeRTOS' (#175) from KSat/fsfw:mueller/hotfix/MutexFreeRTOS into master 2020-08-25 18:16:50 +02:00
muellerr d9ee6d0d90 include fix 2020-08-25 18:15:02 +02:00
muellerr 9fbf0d1d94 Merge remote-tracking branch 'upstream/master' into mueller_MessageNamespaceRenamed 2020-08-25 14:02:48 +02:00
muellerr 9c29253337 removed forward decl 2020-08-25 13:42:36 +02:00
muellerr de98dd0871 optimization 2020-08-25 13:37:42 +02:00
muellerr fb0a3d22db linker forward decl added 2020-08-25 13:34:52 +02:00
muellerr ba4eac65cc count t replacements 2020-08-25 13:33:31 +02:00
muellerr 7d2c48fb33 serializhe improved 2020-08-25 13:32:17 +02:00
muellerr c8595c3442 deSerialize fixed/improved 2020-08-25 13:29:36 +02:00
muellerr 857d61ea13 member pointer now checked 2020-08-25 13:16:17 +02:00
muellerr 825bf62d79 fixed deSerialize 2020-08-25 13:14:13 +02:00
muellerr 6ebe523e50 Merge remote-tracking branch 'upstream/master' into mueller/FreeRTOSstackSizeCorrection 2020-08-25 12:51:57 +02:00
muellerr c0332a80a7 task management update 2020-08-25 12:40:06 +02:00
muellerr 043710ee56 Merge remote-tracking branch 'upstream/master' into mueller/FreeRTOS/TaskManagement 2020-08-25 12:38:23 +02:00
muellerr 7e0cf49723 author tag 2020-08-25 12:24:37 +02:00
muellerr d0419467a7 include guard fix 2020-08-25 12:23:46 +02:00
muellerr 1235e38556 rtems adaption 2020-08-25 12:20:56 +02:00
muellerr 8c150fd40d Merge remote-tracking branch 'upstream/master' into mueller/Linux-SetTaskIF-Fix 2020-08-25 12:19:52 +02:00
muellerr 74dea921e0 made fixes 2020-08-25 12:10:28 +02:00
muellerr ab4c65c87a added header file changes 2020-08-25 12:08:12 +02:00
muellerr 49a36d6fdc removed definitions 2020-08-25 12:06:39 +02:00
muellerr a4626aeac0 made rtems adaption 2020-08-25 12:04:59 +02:00
muellerr 5210bce64d Merge remote-tracking branch 'upstream/master' into mueller_ringBufferStatic 2020-08-24 14:51:13 +02:00
muellerr 26b63d63b9 small fix 2020-08-24 14:47:53 +02:00
muellerr 1b4c4de3fa getter/setter functions for serial buffer adapter 2020-08-24 14:38:59 +02:00
muellerr 1b8f134029 Merge remote-tracking branch 'upstream/master' into mueller_MutexImprovements 2020-08-19 17:30:08 +02:00
muellerr 5b4e49e966 Merge remote-tracking branch 'upstream/master' into mueller/devices/FDIR 2020-08-19 17:26:50 +02:00
muellerr 180d997b03 Merge remote-tracking branch 'upstream/master' into mueller/Linux-SetTaskIF-Fix 2020-08-19 17:25:01 +02:00
muellerr a2c8b3f75b Merge remote-tracking branch 'upstream/master' into mueller/FreeRTOSstackSizeCorrection 2020-08-19 17:20:44 +02:00
muellerr 31f398cec9 small fix 2020-08-19 13:16:08 +02:00
muellerr e59022dd43 old .mk file removed 2020-08-19 13:15:14 +02:00
muellerr c63665c257 renamed framework.mk to fsfw.mk 2020-08-19 13:13:57 +02:00
muellerr 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
muellerr 111f9dce7d added host osal 2020-08-16 23:06:32 +02:00
muellerr 6b4fa0cc04 fdir update 2020-08-08 13:28:59 +02:00
muellerr e61fdd0d5e freeRTOS task management init 2020-08-08 13:15:41 +02:00
muellerr 944226c2ed periodic task if fix 2020-08-08 12:47:14 +02:00
muellerr a0f41d3238 stack size is bytes now 2020-08-08 12:46:06 +02:00
muellerr 20f7217501 Merge remote-tracking branch 'upstream/master' into mueller_MutexImprovements 2020-08-07 22:32:19 +02:00
muellerr 11e23420f2 Merge remote-tracking branch 'upstream/master' into mueller/Linux-SetTaskIF-Fix 2020-08-07 22:31:11 +02:00
muellerr 3905b72b08 Merge pull request 'linux hotfix' (#155) from KSat/fsfw:mueller/LinuxHotfix into master 2020-08-07 22:29:29 +02:00
muellerr 90a3e2b8c5 linux hotfix 2020-08-07 22:26:01 +02:00
muellerr 54825dca6b periodic posix task hotfix 2020-08-07 22:19:13 +02:00
muellerr caeb2f9dd6 mutex api changes 2020-08-07 22:16:10 +02:00
muellerr 7b3fddfd42 implemented mutex if changes 2020-08-07 22:10:58 +02:00
muellerr 9d90348175 Merge remote-tracking branch 'upstream/master' into mueller_MutexImprovements 2020-08-07 22:07:37 +02:00
muellerr 9102eec4ab interface change for freeRTOS 2020-08-04 15:20:43 +02:00
muellerr c42b5283af periodic task IF: setting task if boolean removed 2020-08-04 15:19:31 +02:00
muellerr ea9288d848 updated subsystem ID range 2020-08-04 15:17:40 +02:00
muellerr 6ac36cec15 removed other include in framework.mk 2020-08-02 15:56:38 +02:00
muellerr d58fc5c6f7 removed includes in framework.mk 2020-08-02 15:55:56 +02:00
muellerr be6060ec94 Merge remote-tracking branch 'upstream/master' into mueller_PusServices 2020-08-02 15:55:22 +02:00
muellerr f36da8a79c Merge remote-tracking branch 'upstream/master' into mueller/feature/DHBupdate 2020-08-02 15:49:11 +02:00
muellerr 2e08037e75 revertiing pool changes 2020-08-02 15:48:09 +02:00
muellerr a0ff1e0019 reverted datapool changes 2020-08-02 15:46:25 +02:00
muellerr d8bf1931cc doc correction 2020-08-01 16:55:20 +02:00
muellerr 2198406714 csb update 2020-08-01 16:53:17 +02:00
muellerr 4213e2e081 Merge remote-tracking branch 'upstram/master' into mueller/feature/CSBupdate 2020-08-01 16:46:27 +02:00
muellerr 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
muellerr 0449c63225 bugfixes 2020-07-28 13:13:40 +02:00
muellerr 35fe41361b Merge remote-tracking branch 'upstream/master' into mueller_FIFO_static_normal 2020-07-28 13:08:04 +02:00
muellerr 802004107b Merge remote-tracking branch 'upstream/master' into mueller_FIFO_static_normal 2020-07-28 13:07:35 +02:00
muellerr 4bffcf17fb some formatting stuff 2020-07-28 13:04:58 +02:00
muellerr 036a887ea3 bugfix 2020-07-28 13:02:43 +02:00
muellerr a87a8f527f Merge pull request 'ServiceInterfaceBuffer Bugfix #149' (#150) from gaisser_fix_service_interface_149 into master 2020-07-28 12:51:28 +02:00