Merge remote-tracking branch 'upstram/master' into mueller_FixedTimeslotTaskImprovements

2020-07-06 12:27:12 +02:00
parent b4bc05fb12 3cd946fef8
commit 05393b900b
19 changed files with 1108 additions and 794 deletions
--- a/osal/FreeRTOS/FixedTimeslotTask.cpp
+++ b/osal/FreeRTOS/FixedTimeslotTask.cpp
@ -156,4 +156,3 @@ ReturnValue_t FixedTimeslotTask::sleepFor(uint32_t ms) {
 	vTaskDelay(pdMS_TO_TICKS(ms));
 	return HasReturnvaluesIF::RETURN_OK;
 }
-
--- a/osal/FreeRTOS/FixedTimeslotTask.h
+++ b/osal/FreeRTOS/FixedTimeslotTask.h
@ -95,4 +95,4 @@ protected:
 	void handleMissedDeadline();
 };

-#endif /* POLLINGTASK_H_ */
+#endif /* FRAMEWORK_OSAL_FREERTOS_FIXEDTIMESLOTTASK_H_ */