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

Timestamp:

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

Author:

ertl-honda

Message:

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

File:

• rtos_arduino/trunk/examples/RRScheduling/r2ca_app.cpp (moved) (moved from rtos_arduino/trunk/examples/RRScheduling/rca_app.cpp ) (6 diffs)

rtos_arduino/trunk/examples/RRScheduling/r2ca_app.cpp

@@ -1 @@
-#include "rca.h"
+#include "r2ca.h"
 
 
@@ -19 +19 @@
 
 void loop() {
+    dis_dsp();
     Serial.println("loop() : running");
+    ena_dsp();
     loop_wait(10000);
 }
@@ -26 +28 @@
  *  For TASK1
  */
-void task1_setup() {
-    pinMode(13, OUTPUT);
+void loop1() {
     dis_dsp();
-    Serial.println("task1_setup() : running");
+    Serial.println("task1loop() : running");
     ena_dsp();
-}
-
-void task1_loop() {
     digitalWrite(13, HIGH);
     loop_wait(10000);
+    dis_dsp();
+    Serial.println("task1loop() : running");
+    ena_dsp();
     digitalWrite(13, LOW); 
     loop_wait(10000);
@@ -43 +44 @@
  *  For TASK2
  */
-void task2_setup() {
+void loop2() {
     dis_dsp();
-    Serial.println("task2_setup() : running");
+    Serial.println("task2loop() : running");
     ena_dsp();
-    SerialUSB.begin(115200);
-    while(!SerialUSB){ ; }
-    SerialUSB.println("task2_setup() : running");
-}
-
-void task2_loop() {
-    SerialUSB.println("task2loop() : running");
     loop_wait(10000);
 }
@@ -60 +54 @@
  *  For TASK3
  */
-void task3_setup() {
+void loop3() {
     dis_dsp();
-    Serial.println("task3_setup() : running");
-    ena_dsp();    
-}
-
-void task3_loop() {
     Serial.println("task3loop() : running");
+    ena_dsp();
     loop_wait(20000);
 }
@@ -74 +64 @@
  *  For TASK4
  */
-void task4_setup() {
+void loop4() {
     dis_dsp();
-    Serial.println("task4_setup() : running");
+    Serial.println("task4loop() : running");
     ena_dsp();
-}
-
-void task4_loop() {
-    Serial.println("task4loop() : running");
     loop_wait(40000);
 }