Changeset 364 for asp3_tinet_ecnl_rx/trunk/app6_hot_water_pot/src/echonet_main.c

Timestamp:

Feb 1, 2019, 9:57:09 PM (5 years ago)

Author:

coas-nagasima

Message:

TINETとSocket APIなどを更新

File:

• asp3_tinet_ecnl_rx/trunk/app6_hot_water_pot/src/echonet_main.c (modified) (8 diffs)

asp3_tinet_ecnl_rx/trunk/app6_hot_water_pot/src/echonet_main.c

@@ -318 +318 @@
 }
 
-bool_t started = false;
-
 void echonet_change_netif_link(uint8_t link_up, uint8_t up)
 {
@@ -327 +325 @@
                 return;
 
-        if (up && !started) {
-                started = true;
-
-                /* ECHONETミドルウェアを起動 */
-                ret = ecn_sta_svc();
-                if (ret != E_OK)
-                        return;
-
-                /* ECHONETミドルウェアを起動するのを待つ */
-                dly_tsk(100);
+        if (up) {
+                /* インスタンスリスト通知の送信 */
+                ret = ecn_ntf_inl();
+                if (ret != E_OK) {
+                        syslog(LOG_ERROR, "ecn_ntf_inl");
+                }
         }
 
@@ -342 +336 @@
         uint8_t data[2];
         data[0] = 0x01;
-        data[1] = up ? 0x01 : 0x02;
         ret = ecn_brk_wai(data, sizeof(data));
         if (ret != E_OK) {
@@ -351 +344 @@
 
 enum main_state_t{
+        main_state_start,
         main_state_idle,
         main_state_search,
@@ -357 +351 @@
 
 int main_timer = TMO_FEVR;
-enum main_state_t main_state = main_state_idle;
+enum main_state_t main_state = main_state_start;
 int main_retry;
 
@@ -377 +371 @@
         sil_wrb_mem((uint8_t *)0x0008C02A, 0x7F);
 
-        /* １秒後にブザーを検索 */
-        main_state = main_state_search;
+        /* ECHONETミドルウェアを起動するのを待つ */
+        main_state = main_state_start;
         main_timer = 1000 * 1000;
 
@@ -390 +384 @@
         main_btn2_state = (btn2 & 0x80) != 0;
 
+        /* メインタスクを起動 */
         ER ret = act_tsk(MAIN_TASK);
         if (ret != E_OK) {
@@ -557 +552 @@
 
         switch(main_state){
+        case main_state_start:
+                /* ECHONETミドルウェアを起動 */
+                ret = ecn_sta_svc();
+                if (ret != E_OK) {
+                        syslog(LOG_ERROR, "ecn_sta_svc");
+                }
+
+                /* １秒後にブザーを検索 */
+                main_state = main_state_search;
+                main_timer = 1000 * 1000;
+                break;
         case main_state_idle:
                 syslog(LOG_ERROR, "timeout faild on main_state_idle");