Commit Graph

278 Commits

Author SHA1 Message Date
046eec6c18 Merge branch 'mueller/MQM_IF_UpdateLinux' into mueller/MQMQ_IF_UpdateFreeRTOS 2020-09-29 15:24:12 +02:00
4010d8d960 Merge remote-tracking branch 'upstream/master' into mueller/MQM_IF_UpdateLinux 2020-09-29 15:20:32 +02:00
ea29b272bf Merge branch 'master' into mueller/feature/windowsUdpBridge 2020-09-29 14:59:50 +02:00
c01d904552 Merge branch 'mueller/FixedTimeslotUpdate' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/FixedTimeslotUpdate 2020-09-29 14:30:05 +02:00
7dbb73b7d8 removed dbeug printout 2020-09-29 14:29:57 +02:00
9f7dad31eb Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-29 14:21:02 +02:00
eec022f801 Merge remote-tracking branch 'origin/mueller/ipc-updates' into mueller/MQMQ_IF_UpdateFreeRTOS 2020-09-26 14:33:35 +02:00
13b68f10a0 added usage of new interface 2020-09-26 14:24:09 +02:00
496251bd68 Merge branch 'master' into mueller/ipc-updates 2020-09-26 14:21:05 +02:00
d0f912f32b Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-22 16:20:07 +02:00
de840dcf8d last fixes for linux 2020-09-22 16:10:43 +02:00
98333b92ef srv17 id added, include fix for linux 2020-09-22 15:57:26 +02:00
87fb17f39a IF replacements 2020-09-22 15:52:26 +02:00
cea748676e linux message queue update 2020-09-22 15:47:29 +02:00
74b9aef36b freeRTOS update 2020-09-22 15:33:28 +02:00
7dc3a7ecbd fix so it compiles 2020-09-22 15:31:15 +02:00
4248e4000c Merge branch 'mueller/ipc-updates' of https://egit.irs.uni-stuttgart.de/KSat/fsfw into mueller/ipc-updates 2020-09-22 15:29:38 +02:00
b2777faf66 queueue factory update 2020-09-22 15:29:28 +02:00
9faa8d3896 Merge branch 'master' into mueller/ipc-updates 2020-09-22 15:25:58 +02:00
8f2c8c838e Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-22 15:24:07 +02:00
156f44c268 Merge remote-tracking branch 'upstream/master' into mueller/file_renormalization 2020-09-22 15:21:12 +02:00
3aa9ab2048 Merge branch 'master' into mueller/feature/windowsUdpBridge 2020-09-22 15:06:14 +02:00
386f347574 renormalized files 2020-09-18 13:15:14 +02:00
ad8c6f3528 commented out code added back 2020-09-18 12:58:38 +02:00
0f0ddfc375 stopwatch update 2020-09-18 12:27:40 +02:00
21346e40a5 some improvements 2020-09-15 16:58:38 +02:00
589b95d28b Merge branch 'master' into mueller/feature/windowsUdpBridge 2020-09-15 16:56:55 +02:00
d38e13f9d3 Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-15 16:53:04 +02:00
bff08a69fa Merge branch 'master' into mueller/hostosal 2020-09-15 15:08:58 +02:00
9334a705f8 Merge branch 'master' into mueller/TaskUpdates 2020-09-15 15:05:45 +02:00
6362de5bc0 Merge branch 'master' into mueller/FixedTimeslotUpdate 2020-09-10 18:20:17 +02:00
b3af2b5fbc Merge branch 'master' into mueller/feature/windowsUdpBridge 2020-09-08 14:14:03 +02:00
6c42189371 some minor improvements 2020-09-06 15:49:32 +02:00
a9975f5aef added new windows udp bridge 2020-09-06 15:46:49 +02:00
ba01b4578c Merge branch 'master' into mueller/TaskUpdates 2020-09-06 15:41:40 +02:00
234fbcbf41 small bugfix in error checking 2020-09-06 09:34:06 +02:00
902cd4d210 host osal update 2020-09-05 21:19:53 +02:00
a1155686c5 updated host osal 2020-09-05 20:18:52 +02:00
c6dbce7446 Merge remote-tracking branch 'upstream/master' into mueller/hostosal 2020-09-05 20:18:18 +02:00
4bdac1e017 changed from mueller/master taken over 2020-09-04 14:49:59 +02:00
381914886d initAfterTaskCreation added for linux 2020-09-04 14:43:53 +02:00
0eb4c3817e added initialize after taks creation for linux 2020-09-04 14:31:39 +02:00
92c7369276 include guard fix 2020-09-04 13:56:12 +02:00
5eaf6cfd1f renormalizing pull request step1 2020-09-04 13:52:02 +02:00
7ad5274803 Merge remote-tracking branch 'upstream/master' into mueller/FixedTimeslotUpdate 2020-09-04 13:51:09 +02:00
aec557a8c0 updated unix udp bridge 2020-08-28 17:14:20 +02:00
6c0defed5e Merge remote-tracking branch 'upstream/master' into mueller/feature/TmTcUnixBridge 2020-08-28 17:08:54 +02:00
df4fb17a45 Merge remote-tracking branch 'upstream/master' into mueller/feature/TmTcUnixBridge 2020-08-27 17:31:16 +02:00
0fedad6da0 semaphore factory update 2020-08-27 17:14:49 +02:00
73db79a3fe updated linux implementation 2020-08-27 17:06:10 +02:00
7723ee13b3 Merge remote-tracking branch 'upstream/master' into mueller_binSemaphoreInit 2020-08-27 16:28:50 +02:00
073f168b95 task management function taken over from master 2020-08-27 16:27:54 +02:00
aacda3afc2 interface adapted 2020-08-27 16:26:00 +02:00
4530b19548 header update 2020-08-27 16:13:36 +02:00
89d3fe5095 integrated change manually 2020-08-27 16:11:40 +02:00
66cf2d3559 timeslot update for FreeRTOS 2020-08-27 16:05:31 +02:00
02be87aa03 init after task creation moved to task functionality 2020-08-27 15:57:47 +02:00
561becf6aa Merge remote-tracking branch 'upstream/master' into mueller/hostosal 2020-08-25 18:31:17 +02:00
f13e7b4255 include replacements 2020-08-25 18:30:11 +02:00
d9ee6d0d90 include fix 2020-08-25 18:15:02 +02:00
9245b14569 Merge pull request 'FreeRTOS Stack Size Correction' (#156) from KSat/fsfw:mueller/FreeRTOSstackSizeCorrection into master 2020-08-25 13:00:38 +02:00
6ebe523e50 Merge remote-tracking branch 'upstream/master' into mueller/FreeRTOSstackSizeCorrection 2020-08-25 12:51:57 +02:00
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
c0332a80a7 task management update 2020-08-25 12:40:06 +02:00
043710ee56 Merge remote-tracking branch 'upstream/master' into mueller/FreeRTOS/TaskManagement 2020-08-25 12:38:23 +02:00
7e0cf49723 author tag 2020-08-25 12:24:37 +02:00
d0419467a7 include guard fix 2020-08-25 12:23:46 +02:00
1235e38556 rtems adaption 2020-08-25 12:20:56 +02:00
8c150fd40d Merge remote-tracking branch 'upstream/master' into mueller/Linux-SetTaskIF-Fix 2020-08-25 12:19:52 +02:00
74dea921e0 made fixes 2020-08-25 12:10:28 +02:00
ab4c65c87a added header file changes 2020-08-25 12:08:12 +02:00
49a36d6fdc removed definitions 2020-08-25 12:06:39 +02:00
a4626aeac0 made rtems adaption 2020-08-25 12:04:59 +02:00
1b8f134029 Merge remote-tracking branch 'upstream/master' into mueller_MutexImprovements 2020-08-19 17:30:08 +02:00
180d997b03 Merge remote-tracking branch 'upstream/master' into mueller/Linux-SetTaskIF-Fix 2020-08-19 17:25:01 +02:00
a2c8b3f75b Merge remote-tracking branch 'upstream/master' into mueller/FreeRTOSstackSizeCorrection 2020-08-19 17:20:44 +02:00
111f9dce7d added host osal 2020-08-16 23:06:32 +02:00
d5dedce294 Relative Paths 2020-08-13 20:53:35 +02:00
e61fdd0d5e freeRTOS task management init 2020-08-08 13:15:41 +02:00
a0f41d3238 stack size is bytes now 2020-08-08 12:46:06 +02:00
20f7217501 Merge remote-tracking branch 'upstream/master' into mueller_MutexImprovements 2020-08-07 22:32:19 +02:00
11e23420f2 Merge remote-tracking branch 'upstream/master' into mueller/Linux-SetTaskIF-Fix 2020-08-07 22:31:11 +02:00
90a3e2b8c5 linux hotfix 2020-08-07 22:26:01 +02:00
54825dca6b periodic posix task hotfix 2020-08-07 22:19:13 +02:00
caeb2f9dd6 mutex api changes 2020-08-07 22:16:10 +02:00
7b3fddfd42 implemented mutex if changes 2020-08-07 22:10:58 +02:00
9d90348175 Merge remote-tracking branch 'upstream/master' into mueller_MutexImprovements 2020-08-07 22:07:37 +02:00
9102eec4ab interface change for freeRTOS 2020-08-04 15:20:43 +02:00
c42b5283af periodic task IF: setting task if boolean removed 2020-08-04 15:19:31 +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
b74fbbddb9 Merge pull request 'FreeRTOS PeriodicTask improvement' (#116) from KSat/fsfw:mueller_PeriodicTaskImprovements into master 2020-07-28 12:45:27 +02:00
a9c8bea857 Merge remote-tracking branch 'upstream/master' into mueller_binSemaphoreInit 2020-07-28 12:26:56 +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
a0834204da Merge remote-tracking branch 'upstream/master' into mueller_MutexImprovements 2020-07-13 22:18:08 +02:00
3a2dc5eeb6 new tmtc unix udp bridge 2020-07-13 13:33:12 +02:00
26b5ef6dac Merge branch 'master' into mohr_serialize 2020-07-10 12:19:51 +02:00
6f40a8c622 Merge pull request 'mueller_stopwatch' (#30) from KSat/fsfw:mueller_stopwatch into master 2020-07-07 12:05:04 +02:00
856f1efd6b Merge remote-tracking branch 'upstram/master' into mueller_PeriodicTaskImprovements 2020-07-06 12:40:27 +02:00
6a0a2675b1 typedef instead of auto used now 2020-07-06 12:36:01 +02:00
05393b900b Merge remote-tracking branch 'upstram/master' into mueller_FixedTimeslotTaskImprovements 2020-07-06 12:27:12 +02:00
8c68895c06 Merge remote-tracking branch 'origin/master' into mohr_serialize 2020-07-03 11:59:15 +02:00
3cd946fef8 Merge pull request 'DeviceHandlerBase: All Refactoring' (#44) from KSat/fsfw:mueller_DeviceHandlerBase_AllRefactoring into master 2020-07-03 11:48:55 +02:00
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
19cbac923f typo fix 2020-06-24 12:06:08 +02:00
df418ae1b4 typedef in class declaration now 2020-06-24 12:02:01 +02:00
b4bc05fb12 Merge remote-tracking branch 'upstream/master' into mueller_FixedTimeslotTaskImprovements 2020-06-24 11:31:35 +02:00
93d57c0784 Merge remote-tracking branch 'upstream/master' into mueller_PeriodicTaskImprovements 2020-06-24 11:31:21 +02:00
918329163f removed empty line 2020-06-23 10:31:53 +02:00
4507bdfb69 added setting task IF 2020-06-23 01:14:28 +02:00
1cc50639c7 improvements integrated 2020-06-22 23:49:31 +02:00
0c9c9c581b minor formatting 2020-06-22 23:31:27 +02:00
bf63ba15fe finished overflow checking (hopefully) 2020-06-22 23:30:17 +02:00
3c7ac60dbe added overflow checking 2020-06-22 20:39:36 +02:00
2cada2df4a some fixes and improvements 2020-06-22 20:21:11 +02:00
ffe2a7bffe fix for fixed timeslot task improvement 2020-06-22 19:00:02 +02:00
56aaa29985 added deadline missed check 2020-06-19 14:47:01 +02:00
31e5577763 added deadline missed check 2020-06-19 14:45:29 +02:00
b412ef587a Merge remote-tracking branch 'upstream/master' into mueller_DeviceHandlerBase_AllRefactoring 2020-06-19 00:45:02 +02:00
92074c7fa2 Merge remote-tracking branch 'upstream/master' into mueller_FixedSequenceImprovements 2020-06-10 16:45:22 +02:00
dc43222db8 Merge remote-tracking branch 'upstream/master' into mueller_stopwatch 2020-06-10 16:43:05 +02:00
4dd0375507 0 replaced by MQIF:NO_QUEUE 2020-06-10 01:10:40 +02:00
ea2cd7c1a0 some fixes, doc improvements 2020-06-10 01:07:08 +02:00
b5567e8aae rtems mutex update 2020-06-09 13:26:27 +02:00
20abb810f2 i hope this is correct 2020-06-08 14:11:38 +02:00
bf1b86e809 small form stuff 2020-06-06 18:48:28 +02:00
c602e30a63 std:: added 2020-06-06 18:45:55 +02:00
92f493f13a name correction 2020-06-06 16:48:21 +02:00
be066755c0 even safer and more efficient alternative 2020-06-06 14:39:08 +02:00
6ad36ceb24 variable for max name len 2020-06-06 16:24:33 +02:00
1965a0e33b linux important bugfix and general improvements 2020-06-06 15:47:33 +02:00
fbf804cdca linux changes for mutex 2020-06-04 20:25:15 +02:00
9bcc4c0e3c Merge remote-tracking branch 'upstream/master' into mueller_MutexImprovements 2020-06-04 20:21:52 +02:00
869700e6f5 added mutex IF timeout name 2020-06-04 20:20:38 +02:00
56340bb8b6 free rtos mutex improvements 2020-06-04 20:12:37 +02:00
d4f69633f0 renamed timeout values 2020-06-02 22:36:42 +02:00
a9a23d7623 include improvements 2020-05-29 17:51:15 +02:00
c5bb18a788 include improvements, nullptr used 2020-05-29 17:49:39 +02:00
f15424be4f implemented missing static function 2020-05-29 17:47:55 +02:00
896e7f15dc addd new timeout value 2020-05-29 14:16:44 +02:00
8f563b7b21 added retvals for mutex 2020-05-29 14:02:14 +02:00
73183b39ef added new casts
otherwise i cant compile with new freertos version
2020-05-29 13:37:13 +02:00
b4c6a04d4a added linux implementations 2020-05-29 13:33:44 +02:00
adb80a68fc addd freertos semaphore factory 2020-05-29 13:32:38 +02:00
f829d063ce added task management functions
required for freeRTOS
2020-05-29 13:31:55 +02:00
d909fcb6a1 added semaphore implementations 2020-05-29 13:31:19 +02:00
35b9346c2b include improvements for clock, sif fixes 2020-05-25 15:25:17 +02:00
4f278b610d Merge remote-tracking branch 'upstram/master' into mueller_stopwatch 2020-05-25 15:08:47 +02:00
7eb250a90a include testing 2020-05-25 15:06:54 +02:00
a0cb3a9b6b changed cast to be comptaible with newer freeRTOS 2020-05-17 17:13:43 +02:00
e8a1912fda Merge remote-tracking branch 'upstram/master' into mueller_DeviceHandlerBase_AllRefactoring 2020-05-17 15:50:40 +02:00