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

Timestamp:

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

Author:

ertl-honda

Message:

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

File:

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

rtos_arduino/trunk/examples/PIXY_Zumo_Wifi/r2ca_app.cpp

@@ -1 @@
-#include "rca.h"
+#include "r2ca.h"
 #include "ESP8266.h"
 
@@ -108 +108 @@
 void FollowBlock(int trackedBlock);
 int TrackBlock(int blockCount);
+void task1_setup();
 
 //---------------------------------------
@@ -121 +122 @@
 
     button.waitForPress();
-    buzzer.playStart();    
+    buzzer.playStart();
+
+        task1_setup();
 }
  
@@ -271 +274 @@
 
 
-bool setup_done = false;
-
 void task1_setup()
 {
@@ -350 +351 @@
 
     Serial.print("setup end\r\n");
-
-    setup_done = true;
 }
 
@@ -361 +360 @@
 uint8_t task1_mux_id = MUX_NULL;
 
-void task1_loop()
+void loop1()
 {
     char buf[128];