Merge remote-tracking branch 'upstream/master' into mueller_MutexImprovements

2020-08-07 22:07:37 +02:00
parent a0834204da 78442a8b92
commit 9d90348175
36 changed files with 1201 additions and 732 deletions
@@ -29,11 +29,11 @@ HasHealthIF::HealthState HealthHelper::getHealth() {
 }

 ReturnValue_t HealthHelper::initialize(MessageQueueId_t parentQueue) {
-	setParentQeueue(parentQueue);
+	setParentQueue(parentQueue);
 	return initialize();
 }

-void HealthHelper::setParentQeueue(MessageQueueId_t parentQueue) {
+void HealthHelper::setParentQueue(MessageQueueId_t parentQueue) {
 	this->parentQueue = parentQueue;
 }

@@ -78,7 +78,7 @@ public:
 	/**
 	 * @param parentQueue the Queue id of the parent object. Set to 0 if no parent present
 	 */
-	void setParentQeueue(MessageQueueId_t parentQueue);
+	void setParentQueue(MessageQueueId_t parentQueue);

 	/**
 	 *