Changeset 342 for asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/src/echonet_main.c

Timestamp:

Apr 27, 2018, 2:26:14 PM (6 years ago)

Author:

coas-nagasima

Message:

syscallが関数呼びになるよう変更
他更新

File:

• asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/src/echonet_main.c (modified) (5 diffs)

asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/src/echonet_main.c

@@ -50 +50 @@
 #include "echonet_main.h"
 #include "echonet_cfg.h"
-#include "rx630.h"
+#include "target_kernel_impl.h"
 #include "ff.h"
 #include "diskio.h"
@@ -59 +59 @@
 #include <net/ethernet.h>
 #include <net/if_var.h>
+#include "ntshell_main.h"
 
 /* TODO: メーカーコードを設定 */
@@ -504 +505 @@
 
         /* 3ms後に7SEG表示を更新 */
-        main_led_timer = 3;
+        main_led_timer = 3 * 1000;
 
         /* 10ms後にボタン状態を確認 */
-        main_timer = 10;
+        main_timer = 10 * 1000;
 
         /* 12bitADC初期化 */
@@ -520 +521 @@
 
         /* 1秒後に表示を更新 */
-        main_adv_timer = 1000;
+        main_adv_timer = 1000 * 1000;
+
+        ER ret = act_tsk(MAIN_TASK);
+        if (ret != E_OK) {
+                syslog(LOG_ERROR, "act_tsk");
+        }
 }
 
@@ -759 +765 @@
 
                         if (electric_energy_meter_data[0].current_pos == 0) {
-                                //act_tsk(CLIENT_TASK);
+                                cmd_execute("logupload", NULL);
                         }
                 }