Changeset 260 for rtos_arduino/trunk/examples/MultiTask/r2ca_app.cpp

Timestamp:

Oct 23, 2016, 8:29:46 PM (8 years ago)

Author:

ertl-honda

Message:

マクロ名を更新．
実行モデルを変更．

File:

• rtos_arduino/trunk/examples/MultiTask/r2ca_app.cpp (moved) (moved from rtos_arduino/trunk/examples/MultiTask/rca_app.cpp ) (8 diffs)

rtos_arduino/trunk/examples/MultiTask/r2ca_app.cpp

@@ -1 @@
-#include "rca.h"
+#include "r2ca.h"
 
 /*
@@ -6 +6 @@
 void setup() {
     Serial.begin(115200);
-    Serial.println("setup() : running");
-    delay(1);        
+    Serial.println("setup() : running ");
+
+    pinMode(13, OUTPUT);
 }
 
@@ -13 +14 @@
 
 void loop() {
-    Serial.print("loop() : running");
+    Serial.print("loop() : running ");
     Serial.print(loop_cnt++);
     Serial.println(" .");
@@ -22 +23 @@
  *  For TASK1
  */
-void task1_setup() {
-    pinMode(13, OUTPUT);
-    Serial.println("task1_setup() : running");    
-}
-
-void task1_loop() {
+void loop1() {
     digitalWrite(13, HIGH);
     delay(1000);           
@@ -34 +30 @@
 }
 
-
 int task2_loop_cnt = 0;
 
@@ -40 +35 @@
  *  For TASK2
  */
-void task2_setup() {
-    Serial.println("task2_setup() : running");    
-    SerialUSB.begin(115200);
-    while(!SerialUSB){ ; }
-    SerialUSB.println("task2_setup() : running");
-}
-
-void task2_loop() {
-    Serial.print("task2_loop() : running");
-    Serial.print(task2_loop_cnt);
+void loop2() {
+    Serial.print("task2_loop() : running ");
+    Serial.print(task2_loop_cnt++);
     Serial.println(" .");
-    SerialUSB.print("task2_loop() : running");
-    SerialUSB.print(task2_loop_cnt++);
-    SerialUSB.println(" .");    
     delay(2000);
 }
@@ -62 +47 @@
  *  For TASK3
  */
-void task3_setup() {
-    Serial.println("task3_setup() : running");
-    delay(1);
-}
-
-void task3_loop() {
-    Serial.print("task3_loop() : running");
+void loop3() {
+    Serial.print("task3_loop() : running ");
     Serial.print(task3_loop_cnt++);
     Serial.println(" .");
@@ -79 +59 @@
  *  For TASK4
  */
-void task4_setup() {
-    Serial.println("task4_setup() : running");
-    delay(1);
-}
-
-void task4_loop() {
-    Serial.print("task4_loop() : running");
+void loop4() {
+    Serial.print("task4_loop() : running ");
     Serial.print(task4_loop_cnt++);
     Serial.println(" .");