Changeset 125

Timestamp:

Jul 23, 2015, 3:21:02 PM (9 years ago)

Author:

coas-nagasima

Message:

ECHONET Lite規格に準拠していない動作を修正。
WebSocketの接続先URLを/webapi.ashxから/webapiに変更。
DHCPのリトライ処理が行われていなかったのを修正。
DHCPの有効/無効設定を追加し、固定IPアドレスを設定できるよう変更。

Location:

uKadecot/trunk

Files:

• csp/flash/ukadecot_20150609205225.mot (deleted)
• csp/flash/ukadecot_20150723141338.mot (added)
• ecnl_ssp/echonet_task.c (modified) (19 diffs)
• kadecot/wamp_dealer.c (modified) (9 diffs)
• kadecot/wamp_dealer.h (modified) (2 diffs)
• src/ukadecot/main.c (modified) (6 diffs)
• tools/EcnlControllerUI/EcnlControllerUI/CtrlUI.cs (modified) (8 diffs)
• tools/EcnlControllerUI/EcnlControllerUI/EcnlControllerUI.csproj (modified) (2 diffs)
• tools/EcnlControllerUI/EcnlCtrlUI/EcnlCtrlUI.csproj (modified) (4 diffs)
• tools/EcnlControllerUI/EcnlCtrlUI/Web.config (modified) (1 diff)
• tools/EcnlControllerUI/EcnlCtrlUI/copy_httpd-fs.bat (modified) (1 diff)
• tools/EcnlControllerUI/EcnlCtrlUI/imgs/logo.gif (deleted)
• tools/EcnlControllerUI/EcnlCtrlUI/imgs/logo.png (added)
• tools/EcnlControllerUI/EcnlCtrlUI/index.html (modified) (1 diff)
• tools/EcnlControllerUI/EcnlCtrlUI/js/ctrlui.js (modified) (6 diffs)
• tools/EcnlControllerUI/EcnlCtrlUI/js/ctrlui.min.js (modified) (4 diffs)
• tools/EcnlControllerUI/EcnlCtrlUI/packages.config (modified) (1 diff)
• tools/EcnlControllerUI/NiseWebSocket/NiseWebSocket.csproj (modified) (2 diffs)
• uip/apps/dhcpc/dhcpc.c (modified) (4 diffs)
• uip/apps/webserver/httpd-fs.bin (modified) ( previous)
• uip/apps/webserver/httpd-fs/index.html (modified) (2 diffs)
• uip/task/uip_task.c (modified) (3 diffs)

uKadecot/trunk/ecnl_ssp/echonet_task.c

@@ -157 +157 @@
 static void _ecn_tsk_ecn_msg(intptr_t fa_exinf, ECN_FBS_ID fa_fbs_id);
 
-static void _ecn_tsk_eoj_set(const EOBJINIB *fp_obj, ATR fa_eobjatr, bool_t fa_update,
+static void _ecn_tsk_eoj_set(const EOBJINIB *fp_obj, ATR fa_eobjatr, bool_t fa_fromapp, bool_t fa_update,
         ECN_FBS_ID fa_fbs_id, ECN_SRV_CODE fa_res_esv, ECN_SRV_CODE fa_sna_esv,
         ECN_FBS_ID *fa_fbs_anno);
@@ -164 +164 @@
 static void _ecn_tsk_eoj_res(ECN_FBS_ID fa_fbs_id, ECN_SRV_CODE fa_res_esv,
         ECN_SRV_CODE fa_sna_esv);
-static void _ecn_tsk_eoj_set_get(const EOBJINIB *fp_obj, ATR fa_eobjatr,
+static void _ecn_tsk_eoj_set_get(const EOBJINIB *fp_obj, ATR fa_eobjatr, bool_t fa_fromapp,
         ECN_FBS_ID fa_fbs_id, ECN_SRV_CODE fa_res_esv, ECN_SRV_CODE fa_sna_esv,
         ECN_FBS_ID *fa_fbs_anno);
-static void _ecn_tsk_eoj_set_get_res(const EOBJINIB *fp_obj, ATR fa_eobjatr,
+static void _ecn_tsk_eoj_set_get_res(const EOBJINIB *fp_obj, ATR fa_eobjatr, bool_t fa_fromapp,
         ECN_FBS_ID fa_fbs_id, ECN_FBS_ID *fa_fbs_anno);
 
@@ -775 +775 @@
                 if ((p_eoj->eojx1 == EOJ_X1_PROFILE)
                         && (p_eoj->eojx2 == EOJ_X2_NODE_PROFILE)) {
-                        /* 電文処理実行 */
-                        if (_ecn_tsk_ecn_msg_main(fa_fbs_id, p_nod->profile, eobjatr, p_sobj, sobjatr) == 1)
-                                a_fwd = true;
-                        a_prc = true;
+                        if ((p_eoj->eojx3 == p_nod->profile->eojx3)
+                                || (p_eoj->eojx3 == 0)) {
+                                /* 電文処理実行 */
+                                if (_ecn_tsk_ecn_msg_main(fa_fbs_id, p_nod->profile, eobjatr, p_sobj, sobjatr) == 1)
+                                        a_fwd = true;
+                                a_prc = true;
+                        }
+                        /* 0x74 プロパティ値通知（応答要）の場合処理したことにする */
+                        else if (p_esv->edata.esv == ESV_INFC) {
+                                a_prc = true;
+                        }
                 }
                 /* 機器オブジェクトの場合 */
@@ -843 +850 @@
         T_ECN_EDT_HDR   *p_esv;
         ECN_FBS_ID              a_fbs_anno = { NULL };
+        bool_t fromapp = sobjatr == EOBJ_LOCAL_NODE;
 
         p_esv = &((T_EDATA *)fa_fbs_id.ptr)->hdr;
@@ -855 +863 @@
                         break;
                 }
-                _ecn_tsk_eoj_set(p_obj, eobjatr, false, fa_fbs_id, ESV_NOP, ESV_SET_I_SNA, &a_fbs_anno);        /* 0; 0x50 */
+                _ecn_tsk_eoj_set(p_obj, eobjatr, fromapp, false, fa_fbs_id, ESV_NOP, ESV_SET_I_SNA, &a_fbs_anno);       /* 0; 0x50 */
                 result = 0;
                 break;
@@ -867 +875 @@
                         break;
                 }
-                _ecn_tsk_eoj_set(p_obj, eobjatr, false, fa_fbs_id, ESV_SET_RES, ESV_SET_C_SNA, &a_fbs_anno); /* 0x71; 0x51 */
+                _ecn_tsk_eoj_set(p_obj, eobjatr, fromapp, false, fa_fbs_id, ESV_SET_RES, ESV_SET_C_SNA, &a_fbs_anno); /* 0x71; 0x51 */
                 result = 0;
                 break;
@@ -904 +912 @@
                         break;
                 }
-                _ecn_tsk_eoj_set_get(p_obj, eobjatr, fa_fbs_id, ESV_SET_GET_RES, ESV_SET_GET_SNA, &a_fbs_anno); /* 0x7E; 0x5E */
+                _ecn_tsk_eoj_set_get(p_obj, eobjatr, fromapp, fa_fbs_id, ESV_SET_GET_RES, ESV_SET_GET_SNA, &a_fbs_anno); /* 0x7E; 0x5E */
                 result = 0;
                 break;
@@ -912 +920 @@
                 if (!p_sobj)
                         _ecn_tsk_eoj_res(fa_fbs_id, ESV_INFC_RES, ESV_INFC_RES); /* 0x74; 0 */
-                else if (sobjatr == EOBJ_LOCAL_NODE)
+                else if (fromapp)
                         _ecn_tsk_eoj_get(p_sobj, sobjatr, true, (EPC_RULE_GET|EPC_RULE_ANNO), fa_fbs_id, ESV_INFC, ESV_NOP); /* 0x74; 0 */
                 else
-                        _ecn_tsk_eoj_set(p_sobj, sobjatr, true, fa_fbs_id, ESV_INFC_RES, ESV_INFC_RES, &a_fbs_anno); /* 0x7A; 0 */
+                        _ecn_tsk_eoj_set(p_sobj, sobjatr, fromapp, true, fa_fbs_id, ESV_INFC_RES, ESV_INFC_RES, &a_fbs_anno); /* 0x7A; 0 */
                 result = 0;
                 break;
@@ -939 +947 @@
                         break;
                 }
-                _ecn_tsk_eoj_set(p_sobj, sobjatr, true, fa_fbs_id, ESV_NOP, ESV_NOP, &a_fbs_anno); /* 0; 0 */
+                _ecn_tsk_eoj_set(p_sobj, sobjatr, fromapp, true, fa_fbs_id, ESV_NOP, ESV_NOP, &a_fbs_anno); /* 0; 0 */
                 result = 1;
                 break;
@@ -952 +960 @@
                         break;
                 }
-                _ecn_tsk_eoj_set(p_sobj, sobjatr, true, fa_fbs_id, ESV_NOP, ESV_NOP, &a_fbs_anno); /* 0; 0 */
+                _ecn_tsk_eoj_set(p_sobj, sobjatr, fromapp, true, fa_fbs_id, ESV_NOP, ESV_NOP, &a_fbs_anno); /* 0; 0 */
                 result = 1;
                 break;
@@ -965 +973 @@
                         break;
                 }
-                _ecn_tsk_eoj_set_get_res(p_sobj, sobjatr, fa_fbs_id, &a_fbs_anno); /* 0x7A; 0 */
+                _ecn_tsk_eoj_set_get_res(p_sobj, sobjatr, fromapp, fa_fbs_id, &a_fbs_anno); /* 0x7A; 0 */
                 result = 1;
                 break;
@@ -1116 +1124 @@
 }
 
-static ER _ecn_tsk_eoj_set_main(const EOBJINIB *fp_obj, ATR fa_eobjatr, bool_t fa_update,
+static ER _ecn_tsk_eoj_set_main(const EOBJINIB *fp_obj, ATR fa_eobjatr, bool_t fa_fromapp, bool_t fa_update,
         ECN_FBS_ID fa_fbs_id, ECN_FBS_ID a_fbs_res, ECN_FBS_ID *fa_fbs_anno, int a_count,
         int *p_sw_ok);
 /* プロパティ値書き込み実行 */
-static ER _ecn_tsk_eoj_set_main(const EOBJINIB *fp_obj, ATR fa_eobjatr, bool_t fa_update,
+static ER _ecn_tsk_eoj_set_main(const EOBJINIB *fp_obj, ATR fa_eobjatr, bool_t fa_fromapp, bool_t fa_update,
         ECN_FBS_ID fa_fbs_id, ECN_FBS_ID a_fbs_res, ECN_FBS_ID *fa_fbs_anno, int a_count,
         int *p_sw_ok)
@@ -1147 +1155 @@
                 a_eprp = _ecn_tsk_eoj_get_property(fp_obj, a_prp.epc);
                 if ((a_eprp != NULL)
-                        && (fa_update || (((a_eprp->eprpatr & EPC_RULE_SET) != 0) || (fa_eobjatr == EOBJ_LOCAL_NODE)))) {
+                        && (fa_update || (((a_eprp->eprpatr & EPC_RULE_SET) != 0) || fa_fromapp))) {
                         a_anno = (fa_eobjatr == EOBJ_LOCAL_NODE) && ((a_eprp->eprpatr & EPC_ANNOUNCE) != 0);
                         a_update = a_anno;
@@ -1426 +1434 @@
 
 /* プロパティ値書き込み要求 */
-static void _ecn_tsk_eoj_set(const EOBJINIB *fp_obj, ATR fa_eobjatr, bool_t fa_update,
+static void _ecn_tsk_eoj_set(const EOBJINIB *fp_obj, ATR fa_eobjatr, bool_t fa_fromapp, bool_t fa_update,
         ECN_FBS_ID fa_fbs_id, ECN_SRV_CODE fa_res_esv, ECN_SRV_CODE fa_sna_esv,
         ECN_FBS_ID *fa_fbs_anno)
@@ -1479 +1487 @@
 
         /* プロパティ値書き込み実行 */
-        a_ret = _ecn_tsk_eoj_set_main(fp_obj, fa_eobjatr, fa_update, fa_fbs_id, a_fbs_res,
+        a_ret = _ecn_tsk_eoj_set_main(fp_obj, fa_eobjatr, fa_fromapp, fa_update, fa_fbs_id, a_fbs_res,
                 fa_fbs_anno, p_req_esv->edata.opc, &a_sw_ok);
         if (a_ret)
@@ -1695 +1703 @@
 }
 
-static void _ecn_tsk_eoj_set_get(const EOBJINIB *fp_obj, ATR fa_eobjatr,
+static void _ecn_tsk_eoj_set_get(const EOBJINIB *fp_obj, ATR fa_eobjatr, bool_t fa_fromapp,
         ECN_FBS_ID fa_fbs_id, ECN_SRV_CODE fa_res_esv, ECN_SRV_CODE fa_sna_esv,
         ECN_FBS_ID *fa_fbs_anno)
@@ -1745 +1753 @@
 
         /* プロパティ値書き込み実行 */
-        a_ret = _ecn_tsk_eoj_set_main(fp_obj, fa_eobjatr, false, fa_fbs_id, a_fbs_res,
+        a_ret = _ecn_tsk_eoj_set_main(fp_obj, fa_eobjatr, fa_fromapp, false, fa_fbs_id, a_fbs_res,
                 fa_fbs_anno, a_count, &a_sw_ok);
         if (a_ret) {
@@ -1819 +1827 @@
 
 static void _ecn_tsk_eoj_set_get_res(const EOBJINIB *fp_obj, ATR fa_eobjatr,
-        ECN_FBS_ID fa_fbs_id, ECN_FBS_ID *fa_fbs_anno)
+        bool_t fa_fromapp, ECN_FBS_ID fa_fbs_id, ECN_FBS_ID *fa_fbs_anno)
 {
         T_ECN_EDT_HDR   const *p_req_esv = &((T_EDATA *)fa_fbs_id.ptr)->hdr;
@@ -1872 +1880 @@
 
         /* プロパティ値読み出し応答の書き込み実行 */
-        a_ret = _ecn_tsk_eoj_set_main(fp_obj, fa_eobjatr, true, fa_fbs_id, a_fbs_dmy,
+        a_ret = _ecn_tsk_eoj_set_main(fp_obj, fa_eobjatr, fa_fromapp, true, fa_fbs_id, a_fbs_dmy,
                                                                   fa_fbs_anno, a_count, &a_sw_ok);
         if (a_ret) {

uKadecot/trunk/kadecot/wamp_dealer.c

@@ -569 +569 @@
 {
         static const char macAddr[] = "macAddr";
+        static const char dhcpEnable[] = "dhcpEnable";
+        static const char ipAddr[] = "ipAddr";
+        static const char netmask[] = "netmask";
+        static const char gateway[] = "gateway";
 
         switch (state->level) {
@@ -579 +583 @@
                                 if(strcmp(macAddr, dealer->s->jsn_buf) == 0){
                                         dealer->state = WAMP_DEALER_STATE_MAC_ADDR_VALUE;
-                                        memset(&dealer->init_params, 0, sizeof(dealer->init_params));
+                                        dealer->init_params.pos = 0;
+                                        memset(&dealer->init_params.mac_addr, 0, sizeof(dealer->init_params.mac_addr));
+                                }
+                                if(strcmp(dhcpEnable, dealer->s->jsn_buf) == 0){
+                                        dealer->state = WAMP_DEALER_STATE_DHCP_ENABLE_VALUE;
+                                        dealer->init_params.dhcp_enable = false;
+                                }
+                                if(strcmp(ipAddr, dealer->s->jsn_buf) == 0){
+                                        dealer->state = WAMP_DEALER_STATE_IP_ADDR_VALUE;
+                                        dealer->init_params.pos = 0;
+                                        memset(&dealer->init_params.ip_addr, 0, sizeof(dealer->init_params.ip_addr));
+                                }
+                                if(strcmp(netmask, dealer->s->jsn_buf) == 0){
+                                        dealer->state = WAMP_DEALER_STATE_NETMASK_VALUE;
+                                        dealer->init_params.pos = 0;
+                                        memset(&dealer->init_params.netmask, 0, sizeof(dealer->init_params.netmask));
+                                }
+                                if(strcmp(gateway, dealer->s->jsn_buf) == 0){
+                                        dealer->state = WAMP_DEALER_STATE_GATEWAY_VALUE;
+                                        dealer->init_params.pos = 0;
+                                        memset(&dealer->init_params.gateway, 0, sizeof(dealer->init_params.gateway));
+                                }
+                                break;
+                        case JSONSL_T_SPECIAL:
+                                switch(dealer->state){
+                                case WAMP_DEALER_STATE_DHCP_ENABLE_VALUE:
+                                        dealer->init_params.dhcp_enable = strcmp("true", dealer->s->jsn_buf) == 0;
+                                        break;
                                 }
                                 break;
@@ -597 +628 @@
                                 case WAMP_DEALER_STATE_MAC_ADDR_VALUE:
                                         dealer->init_params.mac_addr[dealer->init_params.pos++] = atoi(dealer->s->jsn_buf);
+                                        break;
+                                case WAMP_DEALER_STATE_IP_ADDR_VALUE:
+                                        dealer->init_params.ip_addr[dealer->init_params.pos++] = atoi(dealer->s->jsn_buf);
+                                        break;
+                                case WAMP_DEALER_STATE_NETMASK_VALUE:
+                                        dealer->init_params.netmask[dealer->init_params.pos++] = atoi(dealer->s->jsn_buf);
+                                        break;
+                                case WAMP_DEALER_STATE_GATEWAY_VALUE:
+                                        dealer->init_params.gateway[dealer->init_params.pos++] = atoi(dealer->s->jsn_buf);
                                         break;
                                 }
@@ -1777 +1817 @@
         ECN_FBS_SSIZE_T pos = 0;
         ER ret;
-
-        ret = data_flash_write(0, dealer->init_params.mac_addr);
+        uint8_t data[32];
+
+        memset(data, 0, sizeof(data));
+        memcpy(&data[0], dealer->init_params.mac_addr, sizeof(dealer->init_params.mac_addr));
+        data[6] = dealer->init_params.dhcp_enable ? 1 : 0;
+        memcpy(&data[7], dealer->init_params.ip_addr, sizeof(dealer->init_params.ip_addr));
+        memcpy(&data[11], dealer->init_params.netmask, sizeof(dealer->init_params.netmask));
+        memcpy(&data[15], dealer->init_params.gateway, sizeof(dealer->init_params.gateway));
+
+        ret = data_flash_write(0, data);
         if (ret != E_OK) {
                 syslog(LOG_WARNING, "data_flash_write() result = %d", ret);
@@ -1804 +1852 @@
 
         dealer->error = NULL;
+}
+
+static ER wamp_dealer_write_ip_addr(struct wamp_dealer *dealer, ECN_FBS_ID buf,
+        ECN_FBS_SSIZE_T *pos, uint8_t *ip_addr, char *name)
+{
+        ER ret;
+        int i;
+
+        /* IPアドレス */
+        ret = fbs_printf(buf, pos, "\"%s\":[", name);
+        if (ret != E_OK) {
+                return ret;
+        }
+
+        for (i = 0; i < 4; i++) {
+                ret = fbs_printf(buf, pos, "%d,", ip_addr[i]);
+                if (ret != E_OK) {
+                        return ret;
+                }
+        }
+
+        /* 最後の","を消す */
+        *pos = *pos - 1;
+
+        ret = fbs_printf(buf, pos, "],");
+        if (ret != E_OK) {
+                return ret;
+        }
+
+        return E_OK;
 }
 
@@ -1813 +1891 @@
         ER ret;
         int i;
-
-        ret = data_flash_read(0, dealer->init_params.mac_addr);
+        uint8_t data[32];
+
+        ret = data_flash_read(0, data);
         if (ret != E_OK) {
                 syslog(LOG_WARNING, "data_flash_read() result = %d", ret);
@@ -1820 +1899 @@
         }
 
+        memcpy(dealer->init_params.mac_addr, &data[0], sizeof(dealer->init_params.mac_addr));
+        dealer->init_params.dhcp_enable = data[6] != 0;
+        memcpy(dealer->init_params.ip_addr, &data[7], sizeof(dealer->init_params.ip_addr));
+        memcpy(dealer->init_params.netmask, &data[11], sizeof(dealer->init_params.netmask));
+        memcpy(dealer->init_params.gateway, &data[15], sizeof(dealer->init_params.gateway));
+
         ret = _ecn_fbs_cre(1, &buf);
         if (ret != E_OK) {
@@ -1826 +1911 @@
         }
 
-        ret = fbs_printf(buf, &pos, "[50,%d,{},[],{\"macAddr\":[", dealer->requestId);
+        ret = fbs_printf(buf, &pos, "[50,%d,{},[],{", dealer->requestId);
+        if (ret != E_OK) {
+                syslog(LOG_WARNING, "fbs_printf() result = %d", ret);
+                _ecn_fbs_del(buf);
+                return;
+        }
+
+        /* MACアドレス */
+        ret = fbs_printf(buf, &pos, "\"macAddr\":[");
         if (ret != E_OK) {
                 syslog(LOG_WARNING, "fbs_printf() result = %d", ret);
@@ -1845 +1938 @@
         pos--;
 
-        ret = fbs_printf(buf, &pos, "]}]");
+        ret = fbs_printf(buf, &pos, "],");
+        if (ret != E_OK) {
+                syslog(LOG_WARNING, "fbs_printf() result = %d", ret);
+                _ecn_fbs_del(buf);
+                return;
+        }
+
+        /* DHCP有効／無効 */
+        ret = fbs_printf(buf, &pos, "\"dhcpEnable\":%s,", dealer->init_params.dhcp_enable ? "true" : "false");
+        if (ret != E_OK) {
+                syslog(LOG_WARNING, "fbs_printf() result = %d", ret);
+                _ecn_fbs_del(buf);
+                return;
+        }
+
+        /* IPアドレス */
+        ret = wamp_dealer_write_ip_addr(dealer, buf, &pos, dealer->init_params.ip_addr, "ipAddr");
+        if (ret != E_OK) {
+                syslog(LOG_WARNING, "wamp_dealer_write_ip_addr() result = %d", ret);
+                _ecn_fbs_del(buf);
+                return;
+        }
+
+        /* サブネットマスク */
+        ret = wamp_dealer_write_ip_addr(dealer, buf, &pos, dealer->init_params.netmask, "netmask");
+        if (ret != E_OK) {
+                syslog(LOG_WARNING, "wamp_dealer_write_ip_addr() result = %d", ret);
+                _ecn_fbs_del(buf);
+                return;
+        }
+
+        /* デフォルトゲートウェイ */
+        ret = wamp_dealer_write_ip_addr(dealer, buf, &pos, dealer->init_params.gateway, "gateway");
+        if (ret != E_OK) {
+                syslog(LOG_WARNING, "wamp_dealer_write_ip_addr() result = %d", ret);
+                _ecn_fbs_del(buf);
+                return;
+        }
+
+        /* 最後の","を消す */
+        pos--;
+
+        ret = fbs_printf(buf, &pos, "}]");
         if (ret != E_OK) {
                 syslog(LOG_WARNING, "fbs_printf() result = %d", ret);

uKadecot/trunk/kadecot/wamp_dealer.h

@@ -53 +53 @@
         WAMP_DEALER_STATE_ANALOG_VALUE,
         WAMP_DEALER_STATE_MAC_ADDR_VALUE,
+        WAMP_DEALER_STATE_DHCP_ENABLE_VALUE,
+        WAMP_DEALER_STATE_IP_ADDR_VALUE,
+        WAMP_DEALER_STATE_NETMASK_VALUE,
+        WAMP_DEALER_STATE_GATEWAY_VALUE,
 } wamp_dealer_state_t;
 
@@ -110 +114 @@
 typedef struct wamp_dealer_init_params{
         int pos;
-        uint8_t mac_addr[32]; /* DATA FLASHのサイズ分 */
+        uint8_t mac_addr[6];
+        bool_t dhcp_enable;
+        uint8_t ip_addr[4];
+        uint8_t netmask[4];
+        uint8_t gateway[4];
 } wamp_dealer_init_params_t;
 

uKadecot/trunk/src/ukadecot/main.c

@@ -65 +65 @@
 
 uint8_t mac_addr[6] = { 0x12, 0x34, 0x56, 0x78, 0x9A, 0xB8 };
+bool_t dhcp_enable = true;
 
 #define MAKER_CODE      0x00, 0x00, 0xB3        /* TOPPERSプロジェクト */
@@ -339 +340 @@
                 /* 応答電文待ちの割り込みの場合 */
                 else if (ret == E_BRK) {
-                        ECN_FBS_ID msg = { (T_ECN_FST_BLK       *)esv };
+                        ECN_FBS_ID msg = { (T_ECN_FST_BLK *)esv };
                         bool_t rel_msg = true;
                         switch (msg.ptr->hdr.type) {
@@ -433 +434 @@
 static void main_initialize()
 {
+        extern u8_t my_ip[4];
+        extern u8_t my_netmask[4];
+        extern u8_t my_default_router[4];
         uint8_t btn1, btn2;
         uint8_t data[32], c;
@@ -443 +447 @@
 
         ret = data_flash_init();
-
         while(ret == E_OK){
                 ret = data_flash_read(0, data);
@@ -452 +455 @@
                 dflt_addr = false;
                 memcpy(mac_addr, data, sizeof(mac_addr));
+                dhcp_enable = data[sizeof(mac_addr)] != 0;
+                memcpy(my_ip, &data[sizeof(mac_addr) + 1], sizeof(my_ip));
+                memcpy(my_netmask, &data[sizeof(mac_addr) + 5], sizeof(my_netmask));
+                memcpy(my_default_router, &data[sizeof(mac_addr) + 9], sizeof(my_default_router));
                 break;
         }
@@ -464 +471 @@
         data[--j] = '\0';
 
-        syslog(LOG_INFO, "mac_addr %s %s", data, dflt_addr ? "default" : "flash-rom");
+        syslog(LOG_INFO, "mac_addr %s %s %s", data, dflt_addr ? "default" : "flash-rom", dhcp_enable ? "dhcp" : "static");
 
         /* uIPを開始 */

uKadecot/trunk/tools/EcnlControllerUI/EcnlControllerUI/CtrlUI.cs

@@ -99 +99 @@
         DeviceController.DeviceInfo m_CurrentNode
         {
-                get             {                       return _m_CurrentNode;          }
+                get { return _m_CurrentNode; }
                 set
                 {
@@ -118 +118 @@
                 m_WampClient.addOpenCallback(WampClientConnected);
                 m_WampClient.addCloseCallback(WampClientDisconnected);
-                m_WampClient.connect("ws://" + Window.Location.Host + "/webapi.ashx");
+                m_WampClient.connect("ws://" + Window.Location.Host + "/webapi");
         }
 
@@ -160 +160 @@
                 PropertyList.Change(PropertyChange);
                 SetInitParamsBtn.Click(SetInitParams);
+                GetInitParamsBtn.Click(GetInitParams);
         }
 
@@ -506 +507 @@
                 if (connect && !m_WampClient.isConnecting()) {
                         Debug.WriteLine("m_WampClient.isConnecting():" + m_WampClient.isConnecting().ToString());
-                        m_WampClient.connect("ws://" + Window.Location.Host + "/webapi.ashx");
+                        m_WampClient.connect("ws://" + Window.Location.Host + "/webapi");
                 }
                 //接続スイッチがOff && m_WampClient.isConnecting() ==true
@@ -911 +912 @@
         {
                 var macaddrfrm = new Regex("([0-9A-Fa-f]{2}):([0-9A-Fa-f]{2}):([0-9A-Fa-f]{2}):([0-9A-Fa-f]{2}):([0-9A-Fa-f]{2}):([0-9A-Fa-f]{2})");
+                var ipaddrfrm = new Regex("([0-9]{1,3}).([0-9]{1,3}).([0-9]{1,3}).([0-9]{1,3})");
 
                 var m = macaddrfrm.Exec(MacAddrTxt.GetValue());
@@ -916 +918 @@
                         return;
 
-                var ma1 = Byte.Parse(m[1], 16);
-                var ma2 = Byte.Parse(m[2], 16);
-                var ma3 = Byte.Parse(m[3], 16);
-                var ma4 = Byte.Parse(m[4], 16);
-                var ma5 = Byte.Parse(m[5], 16);
-                var ma6 = Byte.Parse(m[6], 16);
+                var macAddr = "\"macAddr\":["
+                        + Byte.Parse(m[1], 16) + ","
+                        + Byte.Parse(m[2], 16) + ","
+                        + Byte.Parse(m[3], 16) + ","
+                        + Byte.Parse(m[4], 16) + ","
+                        + Byte.Parse(m[5], 16) + ","
+                        + Byte.Parse(m[6], 16) + "]";
+
+                var dhcpEnable = "\"dhcpEnable\":" + DhcpEnableCb.Prop("checked").ToString();
+
+                m = ipaddrfrm.Exec(IpAddrTxt.GetValue());
+                if (m == null)
+                        return;
+
+                var ipAddr = "\"ipAddr\":["
+                        + Byte.Parse(m[1]) + ","
+                        + Byte.Parse(m[2]) + ","
+                        + Byte.Parse(m[3]) + ","
+                        + Byte.Parse(m[4]) + "]";
+
+
+                m = ipaddrfrm.Exec(NetmaskTxt.GetValue());
+                if (m == null)
+                        return;
+
+                var netmask = "\"netmask\":["
+                        + Byte.Parse(m[1]) + ","
+                        + Byte.Parse(m[2]) + ","
+                        + Byte.Parse(m[3]) + ","
+                        + Byte.Parse(m[4]) + "]";
+
+
+                m = ipaddrfrm.Exec(GatewayTxt.GetValue());
+                if (m == null)
+                        return;
+
+                var gateway = "\"gateway\":["
+                        + Byte.Parse(m[1]) + ","
+                        + Byte.Parse(m[2]) + ","
+                        + Byte.Parse(m[3]) + ","
+                        + Byte.Parse(m[4]) + "]";
 
                 m_WampClient.sendCall("{}", "jp.toppers.ecnl.procedure.setInitParams", "[]",
-                        "{\"macAddr\":[" + ma1 + "," + ma2 + "," + ma3 + "," + ma4 + "," + ma5 + "," + ma6 + "]}", SetInitParamsRes);
+                        "{" + macAddr + "," + dhcpEnable + "," + ipAddr + "," + netmask + "," + gateway + "}", SetInitParamsRes);
         }
 
@@ -965 +1002 @@
                 }
 
-                var macaddr = (byte[])(((dynamic[])args)[4].macAddr);
+                dynamic param = ((dynamic[])args)[4];
+                var macaddr = (byte[])(param.macAddr);
                 MacAddrTxt.Value(String.Format("{0:X02}:{1:X02}:{2:X02}:{3:X02}:{4:X02}:{5:X02}",
                         macaddr[0], macaddr[1], macaddr[2], macaddr[3], macaddr[4], macaddr[5]));
+
+                var dhcpEnable = (bool)(param.dhcpEnable);
+                DhcpEnableCb.Prop("checked", dhcpEnable).CheckboxRadio("refresh");
+
+                var ipaddr = (byte[])(param.ipAddr);
+                IpAddrTxt.Value(String.Format("{0}:{1}:{2}:{3}",
+                        ipaddr[0], ipaddr[1], ipaddr[2], ipaddr[3]));
+
+                var netmask = (byte[])(param.netmask);
+                NetmaskTxt.Value(String.Format("{0}:{1}:{2}:{3}",
+                        netmask[0], netmask[1], netmask[2], netmask[3]));
+
+                var gateway = (byte[])(param.gateway);
+                GatewayTxt.Value(String.Format("{0}:{1}:{2}:{3}",
+                        gateway[0], gateway[1], gateway[2], gateway[3]));
         }
 
@@ -1005 +1058 @@
         /// <summary>MACアドレス入力</summary>
         public jQueryObject MacAddrTxt { get { return jQuery.Select("#txt_mac_addr", page); } }
+
+        /// <summary>DHCP有効／無効</summary>
+        public jQueryObject DhcpEnableCb { get { return jQuery.Select("#cb_dhcp_enable", page); } }
+
+        /// <summary>IPアドレス入力</summary>
+        public jQueryObject IpAddrTxt { get { return jQuery.Select("#txt_ip_addr", page); } }
+
+        /// <summary>サブネットマスク入力</summary>
+        public jQueryObject NetmaskTxt { get { return jQuery.Select("#txt_netmask", page); } }
+
+        /// <summary>デフォルトゲートウェイ入力</summary>
+        public jQueryObject GatewayTxt { get { return jQuery.Select("#txt_gateway", page); } }
 
         public void pinMode_Change(UIFieldSet fieldset, int pin)

uKadecot/trunk/tools/EcnlControllerUI/EcnlControllerUI/EcnlControllerUI.csproj

@@ -21 +21 @@
     <IISExpressUseClassicPipelineMode />
     <NoStdLib>True</NoStdLib>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -110 +112 @@
 $(SolutionDir)tools\jsmin &lt; "$(ProjectDir)$(OutDir)$(TargetName).js" &gt; "$(SolutionDir)EcnlCtrlUI\js\ctrlui.min.js" "Copyright (C) 2015 by TOPPERS Project, Inc., JAPAN"</PostBuildEvent>
   </PropertyGroup>
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

uKadecot/trunk/tools/EcnlControllerUI/EcnlCtrlUI/EcnlCtrlUI.csproj

@@ -20 +20 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -39 +41 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Intelligencia.UrlRewriter">
+      <HintPath>..\packages\Intelligencia.UrlRewriter.2.0.0.9\lib\net40\Intelligencia.UrlRewriter.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Runtime.Serialization" />
@@ -61 +66 @@
     <Content Include="css\ecn_gen.css" />
     <Content Include="imgs\core-s.svg" />
-    <Content Include="imgs\logo.gif" />
+    <Content Include="imgs\logo.png" />
     <Content Include="js\ctrlui.js" />
     <Content Include="js\ctrlui.min.js" />
@@ -529 +534 @@
     </VisualStudio>
   </ProjectExtensions>
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

uKadecot/trunk/tools/EcnlControllerUI/EcnlCtrlUI/Web.config

@@ -5 +5 @@
   -->
 <configuration>
-  <system.web>
-    <compilation debug="true" targetFramework="4.5" />
-    <httpRuntime targetFramework="4.5" />
-  </system.web>
-  <system.webServer>
-    <defaultDocument enabled="true">
-       <files>
-           <clear/>
-           <add value="index.html"/>
-       </files>
-    </defaultDocument>
-    <staticContent>
-      <mimeMap fileExtension=".json" mimeType="application/json"/>
-      <mimeMap fileExtension=".cfg" mimeType="text/plain"/>
-    </staticContent>
-  </system.webServer>
+        <configSections>
+                <section name="rewriter" requirePermission="false" type="Intelligencia.UrlRewriter.Configuration.RewriterConfigurationSectionHandler, Intelligencia.UrlRewriter" />
+        </configSections>
+        <system.web>
+                <compilation debug="true" targetFramework="4.5" />
+                <httpRuntime targetFramework="4.5" />
+                <httpModules>
+                        <add type="Intelligencia.UrlRewriter.RewriterHttpModule, Intelligencia.UrlRewriter" name="UrlRewriter" />
+                </httpModules>
+        </system.web>
+        <system.webServer>
+                <defaultDocument enabled="true">
+                        <files>
+                                <clear />
+                                <add value="index.html" />
+                        </files>
+                </defaultDocument>
+                <staticContent>
+                        <mimeMap fileExtension=".json" mimeType="application/json" />
+                        <mimeMap fileExtension=".cfg" mimeType="text/plain" />
+                </staticContent>
+                <modules runAllManagedModulesForAllRequests="true">
+                        <add name="UrlRewriter" type="Intelligencia.UrlRewriter.RewriterHttpModule, Intelligencia.UrlRewriter" />
+                </modules>
+                <validation validateIntegratedModeConfiguration="false" />
+        </system.webServer>
+        <rewriter>
+                <rewrite url="~/webapi$" to="~/webapi.ashx" />
+        </rewriter>
 </configuration>

uKadecot/trunk/tools/EcnlControllerUI/EcnlCtrlUI/copy_httpd-fs.bat

@@ -110 +110 @@
 mkdir ..\..\..\uip\apps\webserver\httpd-fs\imgs
 copy /Y imgs\core-s.svg ..\..\..\uip\apps\webserver\httpd-fs\imgs\core-s.svg
-copy /Y imgs\logo.gif ..\..\..\uip\apps\webserver\httpd-fs\imgs\logo.gif
+copy /Y imgs\logo.png ..\..\..\uip\apps\webserver\httpd-fs\imgs\logo.png
 
 mkdir ..\..\..\uip\apps\webserver\httpd-fs\js

uKadecot/trunk/tools/EcnlControllerUI/EcnlCtrlUI/index.html

@@ -2 +2 @@
 <html>
 <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>コントローラWebアプリケーション</title>
-    <link rel="shortcut icon" href="favicon.ico">
+        <meta charset="utf-8">
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+        <title>コントローラWebアプリケーション</title>
+        <link rel="shortcut icon" href="favicon.ico">
         <link rel="stylesheet" href="https://code.jquery.com/mobile/1.4.5/jquery.mobile.icons-1.4.5.min.css">
-    <link rel="stylesheet" href="themes/ecn-theme.min.css">
+        <link rel="stylesheet" href="themes/ecn-theme.min.css">
         <link rel="stylesheet" href="https://code.jquery.com/mobile/1.4.5/jquery.mobile.structure-1.4.5.min.css">
         <link rel="stylesheet" href="http://cdn.jtsage.com/datebox/1.4.5/jqm-datebox-1.4.5.css" />
-    <link rel="stylesheet" href="css/ecn_gen.css">
+        <link rel="stylesheet" href="css/ecn_gen.css">
         <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
         <script src="https://code.jquery.com/mobile/1.4.5/jquery.mobile-1.4.5.min.js"></script>
-    <script src="js/mscorlib.min.js"></script>
-    <script src="js/linq.min.js"></script>
+        <script src="js/mscorlib.min.js"></script>
+        <script src="js/linq.min.js"></script>
         <script src="http://cdn.jtsage.com/datebox/1.4.5/jqm-datebox-1.4.5.core.min.js"></script>
         <script src="http://cdn.jtsage.com/datebox/1.4.5/jqm-datebox-1.4.5.mode.calbox.min.js"></script>
         <script src="http://cdn.jtsage.com/datebox/1.4.5/jqm-datebox-1.4.5.mode.datebox.min.js"></script>
         <script src="http://cdn.jtsage.com/datebox/i18n/jqm-datebox.lang.utf8.js"></script>
-    <script src="js/nisews.js"></script>
-    <script src="js/ctrlui.js"></script>
-    <script type="text/javascript">
-        if (typeof window.external.CreateXMLHttpRequest != "undefined") {
-            window.XMLHttpRequest = function () {
-                return window.external.CreateXMLHttpRequest();
-            }
-            global.WebSocket = function (url, protocol) {
-                return window.external.CreateWebSocket(url, protocol);
-            }
-            window.onerror = function (msg, src, line, column, _exc) {
-                var exc = window.external.new_object();
-                for (m in _exc) {
-                    window.external.object_add(exc, m, _exc[m]);
-                }
-                window.external.onerror(msg, src, line, column, exc);
-            }
-            window.external.Error = window.Error;
-            window.Error = function () {
-                var nullPtr = null;
-                nullPtr(); // スタックトレースを表示するためnull参照
-                return window.external.new_error();
-            }
-            ss.Debug.writeln = function (text) {
-                window.external.output_debug_string(text);
-            }
-            console.log = function (text) {
-                window.external.output_debug_string(text);
-            }
-        }
-        else {
-            global.WebSocket = function (url, protocol) {
-                return new NiseWebSocket(url, protocol);
-            }
-        }
-        CtrlUI.main();
-    </script>
+        <script src="js/nisews.js"></script>
+        <script src="js/ctrlui.js"></script>
+        <script type="text/javascript">
+                if (typeof window.external.CreateXMLHttpRequest != "undefined") {
+                        window.XMLHttpRequest = function () {
+                                return window.external.CreateXMLHttpRequest();
+                        }
+                        global.WebSocket = function (url, protocol) {
+                                return window.external.CreateWebSocket(url, protocol);
+                        }
+                        window.onerror = function (msg, src, line, column, _exc) {
+                                var exc = window.external.new_object();
+                                for (m in _exc) {
+                                        window.external.object_add(exc, m, _exc[m]);
+                                }
+                                window.external.onerror(msg, src, line, column, exc);
+                        }
+                        window.external.Error = window.Error;
+                        window.Error = function () {
+                                var nullPtr = null;
+                                nullPtr(); // スタックトレースを表示するためnull参照
+                                return window.external.new_error();
+                        }
+                        ss.Debug.writeln = function (text) {
+                                window.external.output_debug_string(text);
+                        }
+                        console.log = function (text) {
+                                window.external.output_debug_string(text);
+                        }
+                }
+                else {
+                        global.WebSocket = function (url, protocol) {
+                                return new NiseWebSocket(url, protocol);
+                        }
+                }
+                CtrlUI.main();
+        </script>
 </head>
 <body>
-    <div data-role="page" id="index">
-        <div data-role="header">
-            <h1 id="header_logo" style="margin: 0px; text-align: left; background-color: white;">
-                <a target='_blank' href="http://www.toppers.jp/index.html">
-                    <img src="./imgs/logo.gif" width="353" height="74" border="0" alt="TOPPERS LOGO">
-                </a>
-            </h1>
-            <a data-role="button" href="#information" data-rel="popup" data-icon="info" class="ui-btn-right"
-               style="-webkit-border-radius: 6em; border-radius: 6em;"
-               onclick="CtrlUI.info.update(this, 'information');">情報
-            </a>
-        </div>
-        <h2><strong>TOPPERS/ECNL</strong>コントローラWebアプリケーション</h2>
-        <div data-role="panel" class="ecn-navmenu-panel" data-position="left" data-display="overlay" style="background-color: #f9f9f9;">
-            <div class="ui-field-contain" id="fs_connection_ctn">
-                <label for="fs_connection">接続</label>
-                <input type="checkbox" name="fs_connection" id="fs_connection" data-role="flipswitch" data-on-text="On" data-off-text="Off">
-            </div>
-            <button id="bt_search" class="ui-btn ui-shadow ui-corner-all ui-btn-icon-left ui-icon-alert ui-btn-c"
-                    onclick="CtrlUI.page.search(this);">
-                機器検索
-            </button>
-            <h2>インスタンス</h2>
-            <div id="node_list" data-role="collapsibleset" data-inset="true" data-collapsed-icon="carat-r" data-expanded-icon="carat-d">
-            </div>
-            <button id="bt_set_property" class="ui-btn ui-shadow ui-corner-all ui-btn-icon-left ui-icon-star ui-btn-c">
-                設定
-            </button>
-            <button id="bt_get_property" class="ui-btn ui-shadow ui-corner-all ui-btn-icon-left ui-icon-eye ui-btn-c">
-                取得
-            </button>
-            <button id="bt_set_get_property" class="ui-btn ui-shadow ui-corner-all ui-btn-icon-left ui-icon-recycle ui-btn-c">
-                設定と取得
-            </button>
-            <button id="bt_kadecot" class="ui-btn ui-shadow ui-corner-all ui-btn-icon-left ui-icon-action ui-btn-b">
-                Kadecot App list
-            </button>
-        </div>
-        <div role="main" class="ui-content ecn-content">
-            <ul id="lv_property_list" data-role="listview" data-inset="true"></ul>
-        </div>
-        <div data-role="footer" data-position="fixed">
-            <p style="padding-left: 1em">
-                Copyright &copy; 2015 by TOPPERS Project, Inc. All Rights Reserved.
-            </p>
-            <a data-role="button" href="#setting_panel" data-icon="gear" class="ui-btn-right"
-               style="-webkit-border-radius: 6em; border-radius: 6em;">設定
-            </a>
-        </div>
-        <div data-role="popup" id="popup_dialog" data-overlay-theme="b" data-theme="b" data-dismissible="false" style="max-width: 400px;">
-            <div data-role="header" data-theme="a">
-                <h1 id="popup_dialog_caption">エラー</h1>
-            </div>
-            <div role="main" class="ui-content">
-                <h3 id="popup_dialog_title" class="ui-title">エラー</h3>
-                <p id="popup_dialog_text">エラー</p>
-                <a href="#" class="ui-btn ui-corner-all ui-shadow ui-btn-b" data-rel="back">OK</a>
-            </div>
-        </div>
-        <div id="information-screen"></div>
-        <div id="information-popup">
-            <div data-role="popup" id="information" data-theme="b">
-                <img src="js/images/ajax-loader.gif" />
-            </div>
-        </div>
-        <div data-role="panel" id="setting_panel" data-position="right" data-display="overlay" data-theme="b">
-            <h3>設定</h3>
+        <div data-role="page" id="index">
+                <div data-role="header">
+                        <h1 id="header_logo" style="margin: 0px; text-align: left; background-color: white;">
+                                <a target='_blank' href="http://www.toppers.jp/index.html">
+                                        <img src="./imgs/logo.png" width="353" height="74" border="0" alt="TOPPERS LOGO">
+                                </a>
+                        </h1>
+                        <a data-role="button" href="#information" data-rel="popup" data-icon="info" class="ui-btn-right"
+                                style="-webkit-border-radius: 6em; border-radius: 6em;"
+                                onclick="CtrlUI.info.update(this, 'information');">情報
+                        </a>
+                </div>
+                <h2><strong>TOPPERS/ECNL</strong>コントローラWebアプリケーション</h2>
+                <div data-role="panel" class="ecn-navmenu-panel" data-position="left" data-display="overlay" style="background-color: #f9f9f9;">
+                        <div class="ui-field-contain" id="fs_connection_ctn">
+                                <label for="fs_connection">接続</label>
+                                <input type="checkbox" name="fs_connection" id="fs_connection" data-role="flipswitch" data-on-text="On" data-off-text="Off">
+                        </div>
+                        <button id="bt_search" class="ui-btn ui-shadow ui-corner-all ui-btn-icon-left ui-icon-alert ui-btn-c"
+                                onclick="CtrlUI.page.search(this);">
+                                機器検索
+                        </button>
+                        <h2>インスタンス</h2>
+                        <div id="node_list" data-role="collapsibleset" data-inset="true" data-collapsed-icon="carat-r" data-expanded-icon="carat-d">
+                        </div>
+                        <button id="bt_set_property" class="ui-btn ui-shadow ui-corner-all ui-btn-icon-left ui-icon-star ui-btn-c">
+                                設定
+                        </button>
+                        <button id="bt_get_property" class="ui-btn ui-shadow ui-corner-all ui-btn-icon-left ui-icon-eye ui-btn-c">
+                                取得
+                        </button>
+                        <button id="bt_set_get_property" class="ui-btn ui-shadow ui-corner-all ui-btn-icon-left ui-icon-recycle ui-btn-c">
+                                設定と取得
+                        </button>
+                        <button id="bt_kadecot" class="ui-btn ui-shadow ui-corner-all ui-btn-icon-left ui-icon-action ui-btn-b">
+                                Kadecot App list
+                        </button>
+                </div>
+                <div role="main" class="ui-content ecn-content">
+                        <ul id="lv_property_list" data-role="listview" data-inset="true"></ul>
+                </div>
+                <div data-role="footer" data-position="fixed">
+                        <p style="padding-left: 1em">
+                                Copyright &copy; 2015 by TOPPERS Project, Inc. All Rights Reserved.
+                        </p>
+                        <a data-role="button" href="#setting_panel" data-icon="gear" class="ui-btn-right"
+                                style="-webkit-border-radius: 6em; border-radius: 6em;">設定
+                        </a>
+                </div>
+                <div data-role="popup" id="popup_dialog" data-overlay-theme="b" data-theme="b" data-dismissible="false" style="max-width: 400px;">
+                        <div data-role="header" data-theme="a">
+                                <h1 id="popup_dialog_caption">エラー</h1>
+                        </div>
+                        <div role="main" class="ui-content">
+                                <h3 id="popup_dialog_title" class="ui-title">エラー</h3>
+                                <p id="popup_dialog_text">エラー</p>
+                                <a href="#" class="ui-btn ui-corner-all ui-shadow ui-btn-b" data-rel="back">OK</a>
+                        </div>
+                </div>
+                <div id="information-screen"></div>
+                <div id="information-popup">
+                        <div data-role="popup" id="information" data-theme="b">
+                                <img src="js/images/ajax-loader.gif" />
+                        </div>
+                </div>
+                <div data-role="panel" id="setting_panel" data-position="right" data-display="overlay" data-theme="b">
+                        <h3>設定</h3>
                         <label for="txt_mac_addr">MACアドレス</label>
-            <input name="txt_mac_addr" id="txt_mac_addr" value="12:34:56:78:9A:BC" type="text">
-            <button id="bt_set_init_params" class="ui-btn ui-shadow ui-corner-all ui-btn-icon-left ui-icon-check ui-btn-c">
-                設定
-            </button>
+                        <input name="txt_mac_addr" id="txt_mac_addr" value="12:34:56:78:9A:BC" type="text">
+                        <label for="cb_dhcp_enable">DHCP有効</label>
+                        <input name="cb_dhcp_enable" id="cb_dhcp_enable" type="checkbox">
+                        <label for="txt_ip_addr">IPアドレス</label>
+                        <input name="txt_ip_addr" id="txt_ip_addr" value="192.168.2.103" type="text">
+                        <label for="txt_netmask">サブネットマスク</label>
+                        <input name="txt_netmask" id="txt_netmask" value="255.255.255.0" type="text">
+                        <label for="txt_gateway">デフォルトゲートウェイ</label>
+                        <input name="txt_gateway" id="txt_gateway" value="192.168.2.1" type="text">
+                        <button id="bt_set_init_params" class="ui-btn ui-shadow ui-corner-all ui-btn-icon-left ui-icon-check ui-btn-c">
+                                設定
+                        </button>
                         <button id="bt_get_init_params" class="ui-btn ui-shadow ui-corner-all ui-btn-icon-left ui-icon-check ui-btn-c">
                                 取得
                         </button>
-            <h3>ライセンス</h3>
-            <p>
-                このサイトは<a target='_blank' href="http://www.toppers.jp/license.html">TOPPERSライセンス</a>で公開しています。<br>
-                このサイトは、いくつかのJavaScriptライブラリを使用しています。サイト右上のソフトウェア情報をご覧ください。
-            </p>
-            <a href="#" data-rel="close" class="ui-btn ui-shadow ui-corner-all ui-btn-a ui-icon-delete ui-btn-icon-left ui-btn-inline">閉じる</a>
-        </div>
-    </div>
+                        <h3>ライセンス</h3>
+                        <p>
+                                このサイトは<a target='_blank' href="http://www.toppers.jp/license.html">TOPPERSライセンス</a>で公開しています。<br>
+                                このサイトは、いくつかのJavaScriptライブラリを使用しています。サイト右上のソフトウェア情報をご覧ください。
+                        </p>
+                        <a href="#" data-rel="close" class="ui-btn ui-shadow ui-corner-all ui-btn-a ui-icon-delete ui-btn-icon-left ui-btn-inline">閉じる</a>
+                </div>
+        </div>
 </body>
 </html>

uKadecot/trunk/tools/EcnlControllerUI/EcnlCtrlUI/js/ctrlui.js

@@ -18 +18 @@
                 this.$m_WampClient.addOpenCallback(ss.mkdel(this, this.$wampClientConnected));
                 this.$m_WampClient.addCloseCallback(ss.mkdel(this, this.$wampClientDisconnected));
-                this.$m_WampClient.connect('ws://' + window.location.host + '/webapi.ashx');
+                this.$m_WampClient.connect('ws://' + window.location.host + '/webapi');
         };
         $CtrlUI.__typeName = 'CtrlUI';
@@ -2617 +2617 @@
                         this.get_propertyList().change(ss.thisFix(ss.mkdel(this, this.propertyChange)));
                         this.get_setInitParamsBtn().click(ss.thisFix(ss.mkdel(this, this.$setInitParams)));
+                        this.get_getInitParamsBtn().click(ss.thisFix(ss.mkdel(this, this.$getInitParams)));
                 },
                 $initClassGroups: function(data) {
@@ -2808 +2809 @@
                         //接続スイッチがOn && m_WampClient.isConnecting() == false
                         if (connect && !this.$m_WampClient.isConnecting()) {
-                                this.$m_WampClient.connect('ws://' + window.location.host + '/webapi.ashx');
+                                this.$m_WampClient.connect('ws://' + window.location.host + '/webapi');
                         }
                         else if (!connect && this.$m_WampClient.isConnecting()) {
@@ -3041 +3042 @@
                 $setInitParams: function(elem, e) {
                         var macaddrfrm = new RegExp('([0-9A-Fa-f]{2}):([0-9A-Fa-f]{2}):([0-9A-Fa-f]{2}):([0-9A-Fa-f]{2}):([0-9A-Fa-f]{2}):([0-9A-Fa-f]{2})');
+                        var ipaddrfrm = new RegExp('([0-9]{1,3}).([0-9]{1,3}).([0-9]{1,3}).([0-9]{1,3})');
                         var m = macaddrfrm.exec(this.get_macAddrTxt().val());
                         if (ss.isNullOrUndefined(m)) {
                                 return;
                         }
-                        var ma1 = parseInt(m[1], 16);
-                        var ma2 = parseInt(m[2], 16);
-                        var ma3 = parseInt(m[3], 16);
-                        var ma4 = parseInt(m[4], 16);
-                        var ma5 = parseInt(m[5], 16);
-                        var ma6 = parseInt(m[6], 16);
-                        this.$m_WampClient.sendCall('{}', 'jp.toppers.ecnl.procedure.setInitParams', '[]', '{"macAddr":[' + ma1 + ',' + ma2 + ',' + ma3 + ',' + ma4 + ',' + ma5 + ',' + ma6 + ']}', ss.mkdel(this, this.setInitParamsRes));
+                        var macAddr = '"macAddr":[' + parseInt(m[1], 16) + ',' + parseInt(m[2], 16) + ',' + parseInt(m[3], 16) + ',' + parseInt(m[4], 16) + ',' + parseInt(m[5], 16) + ',' + parseInt(m[6], 16) + ']';
+                        var dhcpEnable = '"dhcpEnable":' + this.get_dhcpEnableCb().prop('checked').toString();
+                        m = ipaddrfrm.exec(this.get_ipAddrTxt().val());
+                        if (ss.isNullOrUndefined(m)) {
+                                return;
+                        }
+                        var ipAddr = '"ipAddr":[' + parseInt(m[1]) + ',' + parseInt(m[2]) + ',' + parseInt(m[3]) + ',' + parseInt(m[4]) + ']';
+                        m = ipaddrfrm.exec(this.get_netmaskTxt().val());
+                        if (ss.isNullOrUndefined(m)) {
+                                return;
+                        }
+                        var netmask = '"netmask":[' + parseInt(m[1]) + ',' + parseInt(m[2]) + ',' + parseInt(m[3]) + ',' + parseInt(m[4]) + ']';
+                        m = ipaddrfrm.exec(this.get_gatewayTxt().val());
+                        if (ss.isNullOrUndefined(m)) {
+                                return;
+                        }
+                        var gateway = '"gateway":[' + parseInt(m[1]) + ',' + parseInt(m[2]) + ',' + parseInt(m[3]) + ',' + parseInt(m[4]) + ']';
+                        this.$m_WampClient.sendCall('{}', 'jp.toppers.ecnl.procedure.setInitParams', '[]', '{' + macAddr + ',' + dhcpEnable + ',' + ipAddr + ',' + netmask + ',' + gateway + '}', ss.mkdel(this, this.setInitParamsRes));
                 },
                 setInitParamsRes: function(args) {
@@ -3079 +3092 @@
                                 return;
                         }
-                        var macaddr = ss.cast(ss.cast(args, Array)[4].macAddr, Array);
+                        var param = ss.cast(args, Array)[4];
+                        var macaddr = ss.cast(param.macAddr, Array);
                         this.get_macAddrTxt().val(ss.formatString('{0:X02}:{1:X02}:{2:X02}:{3:X02}:{4:X02}:{5:X02}', macaddr[0], macaddr[1], macaddr[2], macaddr[3], macaddr[4], macaddr[5]));
+                        var dhcpEnable = !!param.dhcpEnable;
+                        this.get_dhcpEnableCb().prop('checked', dhcpEnable).checkboxradio('refresh');
+                        var ipaddr = ss.cast(param.ipAddr, Array);
+                        this.get_ipAddrTxt().val(ss.formatString('{0}:{1}:{2}:{3}', ipaddr[0], ipaddr[1], ipaddr[2], ipaddr[3]));
+                        var netmask = ss.cast(param.netmask, Array);
+                        this.get_netmaskTxt().val(ss.formatString('{0}:{1}:{2}:{3}', netmask[0], netmask[1], netmask[2], netmask[3]));
+                        var gateway = ss.cast(param.gateway, Array);
+                        this.get_gatewayTxt().val(ss.formatString('{0}:{1}:{2}:{3}', gateway[0], gateway[1], gateway[2], gateway[3]));
                 },
                 get_setPropertyBtn: function() {
@@ -3117 +3139 @@
                 get_macAddrTxt: function() {
                         return $('#txt_mac_addr', $CtrlUI.$page);
+                },
+                get_dhcpEnableCb: function() {
+                        return $('#cb_dhcp_enable', $CtrlUI.$page);
+                },
+                get_ipAddrTxt: function() {
+                        return $('#txt_ip_addr', $CtrlUI.$page);
+                },
+                get_netmaskTxt: function() {
+                        return $('#txt_netmask', $CtrlUI.$page);
+                },
+                get_gatewayTxt: function() {
+                        return $('#txt_gateway', $CtrlUI.$page);
                 },
                 pinMode_Change: function(fieldset, pin) {

uKadecot/trunk/tools/EcnlControllerUI/EcnlCtrlUI/js/ctrlui.min.js

@@ -1 +1 @@
 // Copyright (C) 2015 by TOPPERS Project, Inc., JAPAN
 
-(function(){'use strict';var $asm={};global.control=global.control||{};global.ctrlui=global.ctrlui||{};global.Kadecot=global.Kadecot||{};ss.initAssembly($asm,'EcnlControllerUI');var $CtrlUI=function(){this.$read=new(ss.makeGenericType(ss.Dictionary$2,[$ctrlui_DeviceController$DeviceInfo,$ctrlui_DeviceController$DeviceInfo]))();this.$m_WampClient=null;this.$m_DeviceController=null;this.$_m_CurrentNode=null;this.$timerId=0;this.$dpi=null;this.$m_WampClient=new $Kadecot_WampClient();this.$m_WampClient.addOpenCallback(ss.mkdel(this,this.$wampClientConnected));this.$m_WampClient.addCloseCallback(ss.mkdel(this,this.$wampClientDisconnected));this.$m_WampClient.connect('ws://'+window.location.host+'/webapi.ashx');};$CtrlUI.__typeName='CtrlUI';$CtrlUI.main=function(){if(ss.isNullOrUndefined($CtrlUI.page)){$CtrlUI.page=new $CtrlUI();$CtrlUI.info=new $ctrlui_Information();}
+(function(){'use strict';var $asm={};global.control=global.control||{};global.ctrlui=global.ctrlui||{};global.Kadecot=global.Kadecot||{};ss.initAssembly($asm,'EcnlControllerUI');var $CtrlUI=function(){this.$read=new(ss.makeGenericType(ss.Dictionary$2,[$ctrlui_DeviceController$DeviceInfo,$ctrlui_DeviceController$DeviceInfo]))();this.$m_WampClient=null;this.$m_DeviceController=null;this.$_m_CurrentNode=null;this.$timerId=0;this.$dpi=null;this.$m_WampClient=new $Kadecot_WampClient();this.$m_WampClient.addOpenCallback(ss.mkdel(this,this.$wampClientConnected));this.$m_WampClient.addCloseCallback(ss.mkdel(this,this.$wampClientDisconnected));this.$m_WampClient.connect('ws://'+window.location.host+'/webapi');};$CtrlUI.__typeName='CtrlUI';$CtrlUI.main=function(){if(ss.isNullOrUndefined($CtrlUI.page)){$CtrlUI.page=new $CtrlUI();$CtrlUI.info=new $ctrlui_Information();}
 $(document).on('pageinit','#index',ss.mkdel($CtrlUI.page,$CtrlUI.page.$initClassGroups$1));};$CtrlUI.getPage=function(ele){var page=ele;if($(page).is('[data-role="page"]')){return page;}
 if($(page).parents('[data-role="page"]').length===1){return $(page).parents('[data-role="page"]').get(0);}
@@ -233 +233 @@
 else if(ss.isValue(arguments1)&&ss.isValue(argumentsKw)){ss.add(list,argsJson);ss.add(list,argsKwJson);}
 data=JSON.stringify(list);return data;};global.Kadecot.WampSerializer=$Kadecot_WampSerializer;ss.initClass($CtrlUI,$asm,{get_$m_CurrentNode:function(){return this.$_m_CurrentNode;},set_$m_CurrentNode:function(value){var flag=!ss.referenceEquals(this.$_m_CurrentNode,value)||ss.isNullOrUndefined(this.$_m_CurrentNode)&&ss.isNullOrUndefined(value);this.$_m_CurrentNode=value;if(flag){$(document).trigger($control_UIEventNames.currentNodeChange);}},$initClassGroups$1:function(eve){$CtrlUI.$page=eve.target;this.$setEvent();if(ss.isValue($CtrlUI.$m_ClassGroups)){return;}
-$ctrlui_DeviceController.getClassInfo=ss.mkdel(this,this.$getClassInfoHandler);this.set_$m_CurrentNode(null);var ClassGroupListUrl='devices/ClassGroupList.json';$.ajax(ClassGroupListUrl).success(ss.mkdel(this,this.$initClassGroups)).error(function(request,textStatus,error){$CtrlUI.$ajaxError(request,textStatus,error,ClassGroupListUrl);});},$setEvent:function(){$(document).on($control_UIEventNames.loadingShow,$control_UIEventHandler.loadingShow);$(document).on($control_UIEventNames.loadingHide,$control_UIEventHandler.loadingHide);$(document).on($control_UIEventNames.currentNodeChange,ss.thisFix(ss.mkdel(this,this.$currentNodeChange)));$(document).on($control_UIEventNames.searchStart,ss.mkdel(this,this.searchStart));$(document).on($control_UIEventNames.searchEnd,ss.mkdel(this,this.searchEnd));$(document).on($control_UIEventNames.searchError,ss.mkdel(this,this.searchError));$(document).on($control_UIEventNames.propertyWriteStart,ss.mkdel(this,this.propertyWriteStart));$(document).on($control_UIEventNames.propertyWriteEnd,ss.mkdel(this,this.propertyWriteEnd));this.get_connectionSwt().change(ss.thisFix(ss.mkdel(this,this.connect)));this.get_setPropertyBtn().click(ss.thisFix(ss.mkdel(this,this.setProperty)));this.get_getPropertyBtn().click(ss.mkdel(this,this.getProperty));this.get_setGetPropertyBtn().click(ss.thisFix(ss.mkdel(this,this.setGetProperty)));this.get_kadecotBtn().click(ss.thisFix(ss.mkdel(this,this.kadecotClick)));this.get_propertyList().change(ss.thisFix(ss.mkdel(this,this.propertyChange)));this.get_setInitParamsBtn().click(ss.thisFix(ss.mkdel(this,this.$setInitParams)));},$initClassGroups:function(data){var classGroups=$control_UI.toJSClassGroupInfoList(data);$CtrlUI.$m_Classes=[];$CtrlUI.$m_ClassGroups=Array.prototype.slice.call(classGroups);this.$getClassInfoHandler($ctrlui_T_ECN_EOJ.x1_PROFILE,$ctrlui_T_ECN_EOJ.x2_NODE_PROFILE,ss.mkdel(this,this.$getClassInfoCallback));},$getClassInfoCallback:function(di){$CtrlUI.$m_ProfileClassInfo=di;},$getClassInfoHandler:function(x1,x2,cb){var eclass=Enumerable.from($CtrlUI.$m_Classes).firstOrDefault(function(p){return p.classGroup.classGroupCode===x1&&p.classCode===x2;},ss.getDefaultValue($ctrlui_JsonClassInfo));if(ss.isValue(eclass)){if(ss.isNullOrUndefined(eclass.properties)){this.$getPropertyList(eclass,cb);}
+$ctrlui_DeviceController.getClassInfo=ss.mkdel(this,this.$getClassInfoHandler);this.set_$m_CurrentNode(null);var ClassGroupListUrl='devices/ClassGroupList.json';$.ajax(ClassGroupListUrl).success(ss.mkdel(this,this.$initClassGroups)).error(function(request,textStatus,error){$CtrlUI.$ajaxError(request,textStatus,error,ClassGroupListUrl);});},$setEvent:function(){$(document).on($control_UIEventNames.loadingShow,$control_UIEventHandler.loadingShow);$(document).on($control_UIEventNames.loadingHide,$control_UIEventHandler.loadingHide);$(document).on($control_UIEventNames.currentNodeChange,ss.thisFix(ss.mkdel(this,this.$currentNodeChange)));$(document).on($control_UIEventNames.searchStart,ss.mkdel(this,this.searchStart));$(document).on($control_UIEventNames.searchEnd,ss.mkdel(this,this.searchEnd));$(document).on($control_UIEventNames.searchError,ss.mkdel(this,this.searchError));$(document).on($control_UIEventNames.propertyWriteStart,ss.mkdel(this,this.propertyWriteStart));$(document).on($control_UIEventNames.propertyWriteEnd,ss.mkdel(this,this.propertyWriteEnd));this.get_connectionSwt().change(ss.thisFix(ss.mkdel(this,this.connect)));this.get_setPropertyBtn().click(ss.thisFix(ss.mkdel(this,this.setProperty)));this.get_getPropertyBtn().click(ss.mkdel(this,this.getProperty));this.get_setGetPropertyBtn().click(ss.thisFix(ss.mkdel(this,this.setGetProperty)));this.get_kadecotBtn().click(ss.thisFix(ss.mkdel(this,this.kadecotClick)));this.get_propertyList().change(ss.thisFix(ss.mkdel(this,this.propertyChange)));this.get_setInitParamsBtn().click(ss.thisFix(ss.mkdel(this,this.$setInitParams)));this.get_getInitParamsBtn().click(ss.thisFix(ss.mkdel(this,this.$getInitParams)));},$initClassGroups:function(data){var classGroups=$control_UI.toJSClassGroupInfoList(data);$CtrlUI.$m_Classes=[];$CtrlUI.$m_ClassGroups=Array.prototype.slice.call(classGroups);this.$getClassInfoHandler($ctrlui_T_ECN_EOJ.x1_PROFILE,$ctrlui_T_ECN_EOJ.x2_NODE_PROFILE,ss.mkdel(this,this.$getClassInfoCallback));},$getClassInfoCallback:function(di){$CtrlUI.$m_ProfileClassInfo=di;},$getClassInfoHandler:function(x1,x2,cb){var eclass=Enumerable.from($CtrlUI.$m_Classes).firstOrDefault(function(p){return p.classGroup.classGroupCode===x1&&p.classCode===x2;},ss.getDefaultValue($ctrlui_JsonClassInfo));if(ss.isValue(eclass)){if(ss.isNullOrUndefined(eclass.properties)){this.$getPropertyList(eclass,cb);}
 else{cb(eclass);}
 return;}
@@ -249 +249 @@
 $control_UI.disable(this.get_setPropertyBtn(),true);},$listitem_Click:function(elem,ev,di){if(ss.isNullOrUndefined(this.get_propertyList())){return;}
 this.set_$m_CurrentNode(di);},$wampClientConnected:function(){var flag=this.get_connectionSwt().prop('checked');if(!flag){this.get_connectionSwt().prop('checked',true).flipswitch('refresh');}
-$control_UI.toggleClass(this.get_searchBtn(),'ui-icon-alert','ui-icon-refresh');this.$sendHello();},$wampClientDisconnected:function(){$control_UI.toggleClass(this.get_searchBtn(),'ui-icon-refresh','ui-icon-alert');},connect:function(ele,eve){var connect=$(ele).prop('checked');if(connect&&!this.$m_WampClient.isConnecting()){this.$m_WampClient.connect('ws://'+window.location.host+'/webapi.ashx');}
+$control_UI.toggleClass(this.get_searchBtn(),'ui-icon-alert','ui-icon-refresh');this.$sendHello();},$wampClientDisconnected:function(){$control_UI.toggleClass(this.get_searchBtn(),'ui-icon-refresh','ui-icon-alert');},connect:function(ele,eve){var connect=$(ele).prop('checked');if(connect&&!this.$m_WampClient.isConnecting()){this.$m_WampClient.connect('ws://'+window.location.host+'/webapi');}
 else if(!connect&&this.$m_WampClient.isConnecting()){this.$m_WampClient.disconnect();}},disconnect:function(args){this.$m_WampClient.disconnect();},search:function(ele,ev){$(document).trigger($control_UIEventNames.searchStart);var data=this.$m_WampClient.sendCall('{}','com.sonycsl.kadecot.provider.procedure.getDeviceList',null,null,ss.mkdel(this,this.$onDevListed));if(ss.isNullOrUndefined(data)){$(document).trigger($control_UIEventNames.searchError);return;}
 this.$timerId=window.setInterval(function(){$(document).trigger($control_UIEventNames.searchError);},20000);},searchStart:function(ev){$.mobile.loading('show',new $LoadingOption.$ctor1('機器検索中...',true));$control_UI.disable(this.get_searchBtn(),true);},searchEnd:function(ev){if(this.$timerId!==0){window.clearInterval(this.$timerId);this.$timerId=0;}
@@ -274 +274 @@
 this.$propertyCreate(this.get_$m_CurrentNode());this.getProperty(ev);return;},$buttonDisabled:function(di){if(ss.isNullOrUndefined(di)){$control_UI.disable(this.get_setGetPropertyBtn(),true);$control_UI.disable(this.get_getPropertyBtn(),true);$control_UI.disable(this.get_setPropertyBtn(),true);return;}
 var ctrls=this.get_propertyList();$control_UI.disable(this.get_setGetPropertyBtn(),ss.isNullOrUndefined(ctrls));$control_UI.disable(this.get_getPropertyBtn(),ss.isNullOrUndefined(ctrls));$control_UI.disable(this.get_setPropertyBtn(),ss.isNullOrUndefined(ctrls));},$propertyCreate:function(di){if(ss.isNullOrUndefined(di)){return;}
-$(document).trigger($control_UIEventNames.propertyWriteStart);di.setUIDevice(this);this.get_propertyList().html('');this.get_propertyList().append(di.getPropertys());this.get_propertyList().listview().listview('refresh');this.get_propertyList().listview().trigger('create');$(document).trigger($control_UIEventNames.propertyWriteEnd);},$setInitParams:function(elem,e){var macaddrfrm=new RegExp('([0-9A-Fa-f]{2}):([0-9A-Fa-f]{2}):([0-9A-Fa-f]{2}):([0-9A-Fa-f]{2}):([0-9A-Fa-f]{2}):([0-9A-Fa-f]{2})');var m=macaddrfrm.exec(this.get_macAddrTxt().val());if(ss.isNullOrUndefined(m)){return;}
-var ma1=parseInt(m[1],16);var ma2=parseInt(m[2],16);var ma3=parseInt(m[3],16);var ma4=parseInt(m[4],16);var ma5=parseInt(m[5],16);var ma6=parseInt(m[6],16);this.$m_WampClient.sendCall('{}','jp.toppers.ecnl.procedure.setInitParams','[]','{"macAddr":['+ma1+','+ma2+','+ma3+','+ma4+','+ma5+','+ma6+']}',ss.mkdel(this,this.setInitParamsRes));},setInitParamsRes:function(args){var cmd=ss.unbox(ss.cast(ss.cast(args,Array)[0],ss.Int32));if(cmd!==50){$('#popup_dialog_caption').text('エラー');$('#popup_dialog_title').text('エラーが発生しました');$('#popup_dialog_text').text('初期データの書き込みに失敗しました。');$('#popup_dialog').popup('open',{transition:'slidedown'});return;}
+$(document).trigger($control_UIEventNames.propertyWriteStart);di.setUIDevice(this);this.get_propertyList().html('');this.get_propertyList().append(di.getPropertys());this.get_propertyList().listview().listview('refresh');this.get_propertyList().listview().trigger('create');$(document).trigger($control_UIEventNames.propertyWriteEnd);},$setInitParams:function(elem,e){var macaddrfrm=new RegExp('([0-9A-Fa-f]{2}):([0-9A-Fa-f]{2}):([0-9A-Fa-f]{2}):([0-9A-Fa-f]{2}):([0-9A-Fa-f]{2}):([0-9A-Fa-f]{2})');var ipaddrfrm=new RegExp('([0-9]{1,3}).([0-9]{1,3}).([0-9]{1,3}).([0-9]{1,3})');var m=macaddrfrm.exec(this.get_macAddrTxt().val());if(ss.isNullOrUndefined(m)){return;}
+var macAddr='"macAddr":['+parseInt(m[1],16)+','+parseInt(m[2],16)+','+parseInt(m[3],16)+','+parseInt(m[4],16)+','+parseInt(m[5],16)+','+parseInt(m[6],16)+']';var dhcpEnable='"dhcpEnable":'+this.get_dhcpEnableCb().prop('checked').toString();m=ipaddrfrm.exec(this.get_ipAddrTxt().val());if(ss.isNullOrUndefined(m)){return;}
+var ipAddr='"ipAddr":['+parseInt(m[1])+','+parseInt(m[2])+','+parseInt(m[3])+','+parseInt(m[4])+']';m=ipaddrfrm.exec(this.get_netmaskTxt().val());if(ss.isNullOrUndefined(m)){return;}
+var netmask='"netmask":['+parseInt(m[1])+','+parseInt(m[2])+','+parseInt(m[3])+','+parseInt(m[4])+']';m=ipaddrfrm.exec(this.get_gatewayTxt().val());if(ss.isNullOrUndefined(m)){return;}
+var gateway='"gateway":['+parseInt(m[1])+','+parseInt(m[2])+','+parseInt(m[3])+','+parseInt(m[4])+']';this.$m_WampClient.sendCall('{}','jp.toppers.ecnl.procedure.setInitParams','[]','{'+macAddr+','+dhcpEnable+','+ipAddr+','+netmask+','+gateway+'}',ss.mkdel(this,this.setInitParamsRes));},setInitParamsRes:function(args){var cmd=ss.unbox(ss.cast(ss.cast(args,Array)[0],ss.Int32));if(cmd!==50){$('#popup_dialog_caption').text('エラー');$('#popup_dialog_title').text('エラーが発生しました');$('#popup_dialog_text').text('初期データの書き込みに失敗しました。');$('#popup_dialog').popup('open',{transition:'slidedown'});return;}
 $('#popup_dialog_caption').text('初期データ');$('#popup_dialog_title').text('初期データを書き込みました');$('#popup_dialog_text').text('初期データの書き込みに成功しました。');$('#popup_dialog').popup('open',{transition:'slidedown'});},$getInitParams:function(elem,e){this.$m_WampClient.sendCall('{}','jp.toppers.ecnl.procedure.getInitParams','[]','{}',ss.mkdel(this,this.getInitParamsRes));},getInitParamsRes:function(args){var cmd=ss.unbox(ss.cast(ss.cast(args,Array)[0],ss.Int32));if(cmd!==50){$('#popup_dialog_caption').text('エラー');$('#popup_dialog_title').text('エラーが発生しました');$('#popup_dialog_text').text('初期データの読み込みに失敗しました。');$('#popup_dialog').popup('open',{transition:'slidedown'});return;}
-var macaddr=ss.cast(ss.cast(args,Array)[4].macAddr,Array);this.get_macAddrTxt().val(ss.formatString('{0:X02}:{1:X02}:{2:X02}:{3:X02}:{4:X02}:{5:X02}',macaddr[0],macaddr[1],macaddr[2],macaddr[3],macaddr[4],macaddr[5]));},get_setPropertyBtn:function(){return $('#bt_set_property',$CtrlUI.$page);},get_getPropertyBtn:function(){return $('#bt_get_property',$CtrlUI.$page);},get_setGetPropertyBtn:function(){return $('#bt_set_get_property',$CtrlUI.$page);},get_kadecotBtn:function(){return $('#bt_kadecot',$CtrlUI.$page);},get_connectionSwt:function(){return $('#fs_connection',$CtrlUI.$page);},get_propertyList:function(){return $('#lv_property_list',$CtrlUI.$page);},get_searchBtn:function(){return $('#bt_search',$CtrlUI.$page);},get_nodeList:function(){return $('#node_list',$CtrlUI.$page);},get_propertyGroupBox:function(){return $('#lv_property_list',$CtrlUI.$page).find('li');},get_setInitParamsBtn:function(){return $('#bt_set_init_params',$CtrlUI.$page);},get_getInitParamsBtn:function(){return $('#bt_get_init_params',$CtrlUI.$page);},get_macAddrTxt:function(){return $('#txt_mac_addr',$CtrlUI.$page);},pinMode_Change:function(fieldset,pin){var value=fieldset.checkdValue();var dic=ss.mkdict(['pin',pin,'mode',value]);this.$m_WampClient.sendCall('{"deviceId":'+1+'}','com.sonycsl.kadecot.arduino.pinMode','[]',JSON.stringify(dic),ss.mkdel(this,this.pinMode));},digital_Change:function(button,flipswitch,pin){var msg=new $ctrlui_WampApiKadecotSet(1,'2',new Array(2));var dic=ss.mkdict(['pin',pin,'value',flipswitch.get_value()]);this.$m_WampClient.sendCall('{"deviceId":'+1+'}','com.sonycsl.kadecot.arduino.digitalWrite','[]',JSON.stringify(dic),ss.mkdel(this,this.digitalWrite));},analogWrite_Change:function(range,pin){var msg=new $ctrlui_WampApiKadecotSet(1,'2',new Array(2));var dic=ss.mkdict(['pin',pin,'value',range.get_value$1()]);this.$m_WampClient.sendCall('{"deviceId":'+1+'}','com.sonycsl.kadecot.arduino.analogWrite','[]',JSON.stringify(dic),ss.mkdel(this,this.pinMode));},analogRead:function(range,pin){var dic=ss.mkdict(['pin',pin]);this.$m_WampClient.sendCall('{"deviceId":'+1+'}','com.sonycsl.kadecot.arduino.analogRead','[]',JSON.stringify(dic),ss.mkdel(this,function(args){this.digitalRead$1(args,range);}));},pinMode:function(args){var switchData=ss.unbox(ss.cast(ss.cast(args,Array)[0],ss.Int32));if(switchData!==50){return;}
+var param=ss.cast(args,Array)[4];var macaddr=ss.cast(param.macAddr,Array);this.get_macAddrTxt().val(ss.formatString('{0:X02}:{1:X02}:{2:X02}:{3:X02}:{4:X02}:{5:X02}',macaddr[0],macaddr[1],macaddr[2],macaddr[3],macaddr[4],macaddr[5]));var dhcpEnable=!!param.dhcpEnable;this.get_dhcpEnableCb().prop('checked',dhcpEnable).checkboxradio('refresh');var ipaddr=ss.cast(param.ipAddr,Array);this.get_ipAddrTxt().val(ss.formatString('{0}:{1}:{2}:{3}',ipaddr[0],ipaddr[1],ipaddr[2],ipaddr[3]));var netmask=ss.cast(param.netmask,Array);this.get_netmaskTxt().val(ss.formatString('{0}:{1}:{2}:{3}',netmask[0],netmask[1],netmask[2],netmask[3]));var gateway=ss.cast(param.gateway,Array);this.get_gatewayTxt().val(ss.formatString('{0}:{1}:{2}:{3}',gateway[0],gateway[1],gateway[2],gateway[3]));},get_setPropertyBtn:function(){return $('#bt_set_property',$CtrlUI.$page);},get_getPropertyBtn:function(){return $('#bt_get_property',$CtrlUI.$page);},get_setGetPropertyBtn:function(){return $('#bt_set_get_property',$CtrlUI.$page);},get_kadecotBtn:function(){return $('#bt_kadecot',$CtrlUI.$page);},get_connectionSwt:function(){return $('#fs_connection',$CtrlUI.$page);},get_propertyList:function(){return $('#lv_property_list',$CtrlUI.$page);},get_searchBtn:function(){return $('#bt_search',$CtrlUI.$page);},get_nodeList:function(){return $('#node_list',$CtrlUI.$page);},get_propertyGroupBox:function(){return $('#lv_property_list',$CtrlUI.$page).find('li');},get_setInitParamsBtn:function(){return $('#bt_set_init_params',$CtrlUI.$page);},get_getInitParamsBtn:function(){return $('#bt_get_init_params',$CtrlUI.$page);},get_macAddrTxt:function(){return $('#txt_mac_addr',$CtrlUI.$page);},get_dhcpEnableCb:function(){return $('#cb_dhcp_enable',$CtrlUI.$page);},get_ipAddrTxt:function(){return $('#txt_ip_addr',$CtrlUI.$page);},get_netmaskTxt:function(){return $('#txt_netmask',$CtrlUI.$page);},get_gatewayTxt:function(){return $('#txt_gateway',$CtrlUI.$page);},pinMode_Change:function(fieldset,pin){var value=fieldset.checkdValue();var dic=ss.mkdict(['pin',pin,'mode',value]);this.$m_WampClient.sendCall('{"deviceId":'+1+'}','com.sonycsl.kadecot.arduino.pinMode','[]',JSON.stringify(dic),ss.mkdel(this,this.pinMode));},digital_Change:function(button,flipswitch,pin){var msg=new $ctrlui_WampApiKadecotSet(1,'2',new Array(2));var dic=ss.mkdict(['pin',pin,'value',flipswitch.get_value()]);this.$m_WampClient.sendCall('{"deviceId":'+1+'}','com.sonycsl.kadecot.arduino.digitalWrite','[]',JSON.stringify(dic),ss.mkdel(this,this.digitalWrite));},analogWrite_Change:function(range,pin){var msg=new $ctrlui_WampApiKadecotSet(1,'2',new Array(2));var dic=ss.mkdict(['pin',pin,'value',range.get_value$1()]);this.$m_WampClient.sendCall('{"deviceId":'+1+'}','com.sonycsl.kadecot.arduino.analogWrite','[]',JSON.stringify(dic),ss.mkdel(this,this.pinMode));},analogRead:function(range,pin){var dic=ss.mkdict(['pin',pin]);this.$m_WampClient.sendCall('{"deviceId":'+1+'}','com.sonycsl.kadecot.arduino.analogRead','[]',JSON.stringify(dic),ss.mkdel(this,function(args){this.digitalRead$1(args,range);}));},pinMode:function(args){var switchData=ss.unbox(ss.cast(ss.cast(args,Array)[0],ss.Int32));if(switchData!==50){return;}
 var doc=ss.cast(args,Array)[4];if(ss.isValue(this.$m_DeviceController)){if(ss.isNullOrUndefined(this.get_propertyList())){return;}}},digitalWrite:function(args){var switchData=ss.unbox(ss.cast(ss.cast(args,Array)[0],ss.Int32));if(switchData!==50){return;}
 var doc=ss.cast(args,Array)[4];if(ss.isValue(this.$m_DeviceController)){if(ss.isNullOrUndefined(this.get_propertyList())){return;}}},digitalRead:function(button,flip,i){var dic=ss.mkdict(['pin',i]);var str=this.$m_WampClient.sendCall('{"deviceId":'+1+'}','com.sonycsl.kadecot.arduino.digitalRead','[]',JSON.stringify(dic),ss.mkdel(this,function(arg){this.digitalRead$1(arg,flip);}));if(ss.isNullOrUndefined(str)){button.toggleClass$1('ui-icon-refresh','ui-icon-alert');}

uKadecot/trunk/tools/EcnlControllerUI/EcnlCtrlUI/packages.config

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="Intelligencia.UrlRewriter" version="2.0.0.9" targetFramework="net45" />
   <package id="Saltarelle.Compiler" version="2.6.2" targetFramework="net45" />
   <package id="Saltarelle.jQuery" version="1.10.1" targetFramework="net45" />

uKadecot/trunk/tools/EcnlControllerUI/NiseWebSocket/NiseWebSocket.csproj

@@ -21 +21 @@
     <IISExpressUseClassicPipelineMode />
     <NoStdLib>True</NoStdLib>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -99 +101 @@
 $(SolutionDir)tools\jsmin &lt; "$(ProjectDir)$(OutDir)$(TargetName).js" &gt; "$(SolutionDir)EcnlCtrlUI\js\nisews.min.js" "Copyright (C) 2015 by TOPPERS Project, Inc., JAPAN"</PostBuildEvent>
   </PropertyGroup>
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

uKadecot/trunk/uip/apps/dhcpc/dhcpc.c

@@ -41 +41 @@
 
 #define STATE_INITIAL         0
-#define STATE_SENDING         1
-#define STATE_OFFER_RECEIVED  2
-#define STATE_CONFIG_RECEIVED 3
+#define STATE_REQUEST         1
+#define STATE_SENDING         2
+#define STATE_OFFER_RECEIVED  3
+#define STATE_CONFIG_RECEIVED 4
 
 #ifdef __RX
@@ -261 +262 @@
   PT_BEGIN(&s->pt);
 
+  if(s->state != STATE_REQUEST)
+    PT_YIELD(&s->pt);
+
   /* try_again:*/
   s->state = STATE_SENDING;
   s->ticks = 5 * CLOCK_SECOND;
 
-  send_discover(s);
-  timer_set(&s->timer, s->ticks);
-
   do {
+    printf("send_discover(%d)\n", s->timer);
+    send_discover(s);
+    timer_set(&s->timer, s->ticks);
+
     PT_WAIT_UNTIL(&s->pt, (ret = uip_newdata() ? 1 : (timer_expired(&s->timer) ? 2 : 0)) != 0);
 
@@ -288 +293 @@
   PT_YIELD(&s->pt);
 
-  send_request(s);
-  timer_set(&s->timer, s->ticks);
-
   do {
+    printf("send_request(%d)\n", s->timer);
+    send_request(s);
+    timer_set(&s->timer, s->ticks);
+
     PT_WAIT_UNTIL(&s->pt, (ret = uip_newdata() ? 1 : (timer_expired(&s->timer) ? 2 : 0)) != 0);
 
@@ -382 +388 @@
   u16_t ipaddr[2];
 
-  s->state = STATE_INITIAL;
+  s->state = STATE_REQUEST;
   uip_ipaddr(ipaddr, 0,0,0,0);
   uip_sethostaddr(ipaddr);

uKadecot/trunk/uip/apps/webserver/httpd-fs/index.html

@@ -30 +30 @@
                         <h1 id="header_logo" style="margin: 0px; text-align: left; background-color: white;">
                                 <a target='_blank' href="http://www.toppers.jp/index.html">
-                                        <img src="./imgs/logo.gif" width="353" height="74" border="0" alt="TOPPERS LOGO">
+                                        <img src="./imgs/logo.png" width="353" height="74" border="0" alt="TOPPERS LOGO">
                                 </a>
                         </h1>
@@ -95 +95 @@
                         <label for="txt_mac_addr">MACアドレス</label>
                         <input name="txt_mac_addr" id="txt_mac_addr" value="12:34:56:78:9A:BC" type="text">
+                        <label for="cb_dhcp_enable">DHCP有効</label>
+                        <input name="cb_dhcp_enable" id="cb_dhcp_enable" type="checkbox">
+                        <label for="txt_ip_addr">IPアドレス</label>
+                        <input name="txt_ip_addr" id="txt_ip_addr" value="192.168.2.103" type="text">
+                        <label for="txt_netmask">サブネットマスク</label>
+                        <input name="txt_netmask" id="txt_netmask" value="255.255.255.0" type="text">
+                        <label for="txt_gateway">デフォルトゲートウェイ</label>
+                        <input name="txt_gateway" id="txt_gateway" value="192.168.2.1" type="text">
                         <button id="bt_set_init_params" class="ui-btn ui-shadow ui-corner-all ui-btn-icon-left ui-icon-check ui-btn-c">
                                 設定

uKadecot/trunk/uip/task/uip_task.c

@@ -82 +82 @@
 int uip_out_wpos = 0;
 int uip_out_rpos = 0;
-const u8_t my_ip[4] = { IPV4_ADDR_LOCAL };
-const u8_t my_netmask[4] = { IPV4_ADDR_LOCAL_MASK };
-const u8_t my_default_router[4] = { IPV4_ADDR_DEFAULT_GW };
+u8_t my_ip[4] = { IPV4_ADDR_LOCAL };
+u8_t my_netmask[4] = { IPV4_ADDR_LOCAL_MASK };
+u8_t my_default_router[4] = { IPV4_ADDR_DEFAULT_GW };
 int ws_out_req;
 int ws_out_res;
 #ifdef __DHCPC_H__
 struct dhcpc_state *dhcpc;
+extern bool_t dhcp_enable;
 #endif
 
@@ -113 +114 @@
         uip_init();
 #ifdef __DHCPC_H__
-        dhcpc = dhcpc_init(uip_ethaddr.addr, sizeof(uip_ethaddr.addr));
+        if(dhcp_enable){
+                dhcpc = dhcpc_init(uip_ethaddr.addr, sizeof(uip_ethaddr.addr));
+        }
 #endif
         uip_task_init((intptr_t)uiptsk);
@@ -132 +135 @@
                                 ic->link_pre = ic->link_now;
                                 if(cng && ic->link_pre){
-                                        sil_wrb_mem((uint8_t *)0x0008C02A, sil_reb_mem((uint8_t *)0x0008C02A) | 0x04);
 #ifdef __DHCPC_H__
-                                        uip_buf = uiptsk->uip_buf;
-                                        uip_len = 0;
-                                        dhcpc_request(dhcpc);
-                                        /* If the above function invocation resulted in data that
-                                                should be sent out on the network, the global variable
-                                                uip_len is set to a value > 0. */
-                                        if (uip_len > 0) {
-                                                uip_arp_out();
-                                                IF_ETHER_NIC_START(ic, uip_buf, uip_len);
+                                        if(dhcp_enable){
+                                                sil_wrb_mem((uint8_t *)0x0008C02A, sil_reb_mem((uint8_t *)0x0008C02A) | 0x04);
+                                                uip_buf = uiptsk->uip_buf;
+                                                uip_len = 0;
+                                                dhcpc_request(dhcpc);
+                                                /* If the above function invocation resulted in data that
+                                                        should be sent out on the network, the global variable
+                                                        uip_len is set to a value > 0. */
+                                                if (uip_len > 0) {
+                                                        uip_arp_out();
+                                                        IF_ETHER_NIC_START(ic, uip_buf, uip_len);
+                                                }
+                                        }
+                                        else{
+                                                DHCP4_CLI_SET_ADDR_CALLBACK();
                                         }
 #else