PR review #162

JanStaschulat · JanStaschulat · commit 918e6b9fc716 · 2020-06-02T13:07:25.000+02:00
Signed-off-by: Staschulat Jan &lt;jan.staschulat@de.bosch.com&gt;
diff --git a/_docs/tutorials/core/programming_rcl_rclc/index.md b/_docs/tutorials/core/programming_rcl_rclc/index.md
@@ -539,11 +539,7 @@ bool pub_trigger(rclc_executor_handle_t * handles, unsigned int size, void * obj
       }
     }
   }
-  if (timer1 || timer2) {
-    return true;
-  } else {
-    return false;
-  }
+  return (timer1 || timer2);
 }
 ```
 The trigger condition for the subscription `sub_trigger`shall implement an AND-logic. That is, only if both subscriptions have received a new message, then the executor shall start processing the callbacks.
@@ -577,11 +573,7 @@ bool sub_trigger(rclc_executor_handle_t * handles, unsigned int size, void * obj
       }
     }
   }
-  if (sub1 && sub2) {
-    return true;
-  } else {
-    return false;
-  }
+  return (sub1 && sub2);
 }
 ```
 Like in the Hello-World example, the subscription callbacks just prints out the received message.
@@ -619,6 +611,7 @@ In the `my_timer_string_callback`, the message `pub_msg` is created and filled w
 The macro `UNUSED` is a workaround for the linter warning, that the second parameter `last_call_time` is not used.
 ```C
 #define UNUSED(x) (void)x;
+
 void my_timer_string_callback(rcl_timer_t * timer, int64_t last_call_time)
 {
   rcl_ret_t rc;

Original file line number	Diff line number	Diff line change
`@@ -539,11 +539,7 @@ bool pub_trigger(rclc_executor_handle_t * handles, unsigned int size, void * obj`
`539`	`539`	`}`
`540`	`540`	`}`
`541`	`541`	`}`
`542`		`- if (timer1 \|\| timer2) {`
`543`		`- return true;`
`544`		`- } else {`
`545`		`- return false;`
`546`		`- }`
	`542`	`+ return (timer1 \|\| timer2);`
`547`	`543`	`}`
`548`	`544`	```
`549`	`545`	The trigger condition for the subscription `sub_trigger`shall implement an AND-logic. That is, only if both subscriptions have received a new message, then the executor shall start processing the callbacks.
`@@ -577,11 +573,7 @@ bool sub_trigger(rclc_executor_handle_t * handles, unsigned int size, void * obj`
`577`	`573`	`}`
`578`	`574`	`}`
`579`	`575`	`}`
`580`		`- if (sub1 && sub2) {`
`581`		`- return true;`
`582`		`- } else {`
`583`		`- return false;`
`584`		`- }`
	`576`	`+ return (sub1 && sub2);`
`585`	`577`	`}`
`586`	`578`	```
`587`	`579`	`Like in the Hello-World example, the subscription callbacks just prints out the received message.`
@@ -619,6 +611,7 @@ In the `my_timer_string_callback`, the message `pub_msg` is created and filled w
`619`	`611`	The macro `UNUSED` is a workaround for the linter warning, that the second parameter `last_call_time` is not used.
`620`	`612`	```C
`621`	`613`	`#define UNUSED(x) (void)x;`
	`614`	`+`
`622`	`615`	`void my_timer_string_callback(rcl_timer_t * timer, int64_t last_call_time)`
`623`	`616`	`{`
`624`	`617`	`rcl_ret_t rc;`