Changeset 364 for asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/src/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/app1_usb_watt_meter/src/main.c (modified) (8 diffs)

asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/src/main.c

@@ -45 +45 @@
 #include <sil.h>
 #include <setjmp.h>
+#include <stdlib.h>
 #include <string.h>
 #include "syssvc/serial.h"
@@ -80 +81 @@
 
 ID ws_api_mailboxid = MAIN_DATAQUEUE;
+#ifndef NOUSE_MPF_NET_BUF
 ID ws_mempoolid = MPF_NET_BUF_256;
-
+#endif
 #ifdef IF_ETHER_BTUSB
 extern int bt_bnep_mode;
 /* PANU向けリモートアドレス */
 bd_addr_t remote_addr = {0x00,0x1B,0xDC,0x09,0x27,0x26};
+bool_t dhcp_enable = false;
+#else
+bool_t dhcp_enable = true;
 #endif
 
 uint8_t mac_addr[6] = {0x12, 0x34, 0x56, 0x78, 0x9A, 0x01};
-bool_t dhcp_enable = true;
 PRI main_task_priority = MAIN_PRIORITY + 1;
 
@@ -112 +116 @@
 static void main_timeout();
 
+extern int ntshell_exit;
+
 int uart_read(char *buf, int cnt, void *extobj)
 {
-        return serial_rea_dat(SIO_PORTID, (char *)buf, cnt);
+        struct main_t *obj = (struct main_t *)extobj;
+        int result;
+        ER ret;
+        int timer;
+
+        obj->prev = obj->now;
+
+        /* タイマー取得 */
+        timer = main_get_timer();
+
+        /* 待ち */
+        ret = serial_trea_dat(SIO_PORTID, buf, cnt, timer);
+        if ((ret < 0) && (ret != E_OK) && (ret != E_TMOUT)) {
+                syslog(LOG_NOTICE, "tslp_tsk ret: %s %d", itron_strerror(ret), timer);
+                ntshell_exit = 1;
+                return -1;
+        }
+        result = (int)ret;
+
+        ret = get_tim(&obj->now);
+        if (ret != E_OK) {
+                syslog(LOG_NOTICE, "get_tim ret: %s", itron_strerror(ret));
+                ntshell_exit = 1;
+                return -1;
+        }
+
+                        /* 時間経過 */
+        int elapse = obj->now - obj->prev;
+        main_progress(elapse);
+
+        /* タイムアウト処理 */
+        main_timeout();
+
+        return result;
 }
 
@@ -120 +159 @@
 {
         return serial_wri_dat(SIO_PORTID, buf, cnt);
-}
-
-unsigned char ntstdio_xi(struct ntstdio_t *handle)
-{
-        char buf[1];
-        if(serial_rea_dat(SIO_PORTID, buf, 1) != 1)
-                return -EIO;
-        return buf[0];
-}
-
-void ntstdio_xo(struct ntstdio_t *handle, unsigned char c)
-{
-        char buf[1];
-        buf[0] = c;
-        serial_wri_dat(SIO_PORTID, buf, 1);
 }
 
@@ -151 +175 @@
         main_initialize();
 
-        ntshell_init(&ntshell, uart_read, uart_write, cmd_execute, NULL);
+        ntshell_init(&ntshell, uart_read, uart_write, cmd_execute, &main_obj);
         ntshell_set_prompt(&ntshell, "NTShell>");
         ntshell_execute(&ntshell);
@@ -171 +195 @@
         ER ret;
 
+#ifdef TOPPERS_OMIT_TECS
+        serial_opn_por(SIO_PORTID);
+#endif
+        serial_ctl_por(SIO_PORTID, IOCTL_FCSND | IOCTL_FCRCV);
+
         //wolfSSL_Debugging_ON();
 
-        ntshell_task_init();
+        ntshell_task_init(uart_read, uart_write, &main_obj);
 
         main_obj.timer = TMO_FEVR;
@@ -308 +337 @@
 }
 
+int cmd_creid(int argc, char **argv)
+{
+        if (argc != 2) {
+                printf("creid {client_id}\n");
+                return 0;
+        }
+
+        client_set_client_id(argv[1]);
+
+        return 0;
+}
+
+int cmd_secret(int argc, char **argv)
+{
+        if (argc != 2) {
+                printf("secret {client_secret}\n");
+                return 0;
+        }
+
+        client_set_client_secret(argv[1]);
+
+        return 0;
+}
+
 int cmd_logupload(int argc, char **argv)
 {
-        client_task(0);
-        return 0;
+        return client_upload_file(argc, argv);
 }
 
@@ -330 +382 @@
         {"dnsc", "DNS client", usrcmd_dnsc },
         {"ntpc", "NTP client", usrcmd_ntpc },
+        {"creid", "Regster device", cmd_creid},
+        {"secret", "Regster device", cmd_secret},
+        {"gdi", "get_device_id", client_get_device_id},
+        {"gat", "get_access_token", client_get_access_token},
+        {"uat", "update_access_token", client_update_access_token},
+        {"rd", "revoke device", client_revoke},
+        {"uf", "upload_file", client_upload_file},
         {"logupload", "Upload log to server", cmd_logupload},
         {"info", "This is a description text string for info command.", usrcmd_info},