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

Timestamp:

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

Author:

ertl-honda

Message:

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

File:

• rtos_arduino/trunk/examples/CompositeExample/r2ca_app.cpp (moved) (moved from rtos_arduino/trunk/examples/CompositeExample/rca_app.cpp ) (11 diffs)

rtos_arduino/trunk/examples/CompositeExample/r2ca_app.cpp

@@ -1 @@
-#include "rca.h"
+#include "r2ca.h"
 #include "i2c_lcd.h"
 
@@ -36 +36 @@
 ";
 
+extern void task1_setup();
+extern void task2_setup();
+extern void task3_setup();
+extern void task4_setup();
+extern void task5_setup();
+
 void setup(){
     Serial.begin(115200);    
@@ -43 +49 @@
     Serial.println("Main Task : setup start!");
     Serial.println(usage);
+
+    task1_setup();
+    task2_setup();
+    task3_setup();
+    task4_setup();
+    task5_setup();
 }
 
@@ -59 +71 @@
 #define SVC_PERROR(expr)        svc_perror(__FILE__, __LINE__, #expr, (expr))
 
-ID              tskid = RCA_TASK1;
+ID              tskid = R2CA_TASK1;
 int_t   tskno = 1;
 
@@ -77 +89 @@
         case '1':
             tskno = 1;
-            tskid = RCA_TASK1;
+            tskid = R2CA_TASK1;
             syslog(LOG_INFO, "Select Sensor Task.");
             break;
         case '2':
             tskno = 2;
-            tskid = RCA_TASK2;
+            tskid = R2CA_TASK2;
             syslog(LOG_INFO, "Select Web Task.");
             break;
         case '3':
             tskno = 3;
-            tskid = RCA_TASK3;
+            tskid = R2CA_TASK3;
             syslog(LOG_INFO, "Select LED Task.");
             break;
         case '4':
             tskno = 4;
-            tskid = RCA_TASK4;
+            tskid = R2CA_TASK4;
             syslog(LOG_INFO, "Select TFT Task.");
             break;
         case '5':
             tskno = 5;
-            tskid = RCA_TASK5;
+            tskid = R2CA_TASK5;
             syslog(LOG_INFO, "Select Processing Task.");
             break;
@@ -346 +358 @@
 }
 
-void task1_loop() {
+void loop1() {
     static uint32_t sensor_cyc_tim = 0;
 
@@ -554 +566 @@
 
 
-void task2_loop()
+void loop2()
 {
     uint8_t buffer[128] = {0};
@@ -622 +634 @@
 }
 
-void task3_loop() {
+void loop3() {
     static bool gled1_blink_state = false;
     static bool gled2_blink_state = false;
@@ -772 +784 @@
 int loop_cnt = 0;;
 
-void task4_loop() {    
+void loop4() {    
   // don't do anything if the image wasn't loaded correctly.
   if (logo.isValid() == false) {
@@ -833 +845 @@
 #define TIMEOUT_MS  3000
 
-void task5_loop()
+void loop5()
 {
     if(!processing_connected){
@@ -848 +860 @@
     uint16_t dispatch_cnt;
 
-    load = 100 - map(rca_idle_result, 0, IDLE_TASK_IDLE_LOOP_10MS/10, 0, 100);
-    isr_cnt = (rca_isr_result > 0xffff)? 0xffff : rca_isr_result;
-    dispatch_cnt = (rca_dispatch_result > 0xffff)? 0xffff : rca_dispatch_result;
+    load = 100 - map(r2ca_idle_result, 0, IDLE_TASK_IDLE_LOOP_10MS/10, 0, 100);
+    isr_cnt = (r2ca_isr_result > 0xffff)? 0xffff : r2ca_isr_result;
+    dispatch_cnt = (r2ca_dispatch_result > 0xffff)? 0xffff : r2ca_dispatch_result;
     
     if (PSERIAL.available()){