Changeset 340 for asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter

Timestamp:

Apr 13, 2018, 1:00:30 PM (6 years ago)

Author:

coas-nagasima

Message:

NTPクライアント処理を追加

Location:

asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter

Files:

• Debug/Makefile (modified) (2 diffs)
• DebugCitrus/Makefile (modified) (2 diffs)
• DebugEther/Makefile (modified) (2 diffs)
• src/echonet_main.c (modified) (1 diff)
• src/main.c (modified) (4 diffs)
• src/main.cfg (modified) (2 diffs)

asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/Debug/Makefile

@@ -188 +188 @@
 CFLAGS = $(COPTS) $(CDEFS) $(INCLUDES)
 
+APPLDIRS := $(APPLDIRS) ../../ntshell/echonet
 APPL_COBJS := echonet.o echonet_agent.o echonet_dbg.o echonet_fbs.o echonet_task.o echonet_udp_task.o echonet_udp6_task.o fbs_string.o
-APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o 
+APPLDIRS := $(APPLDIRS) $(SRCDIR)/$(TINETDIR)/netapp
+APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o ntp_cli.o net_misc.o
+APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
 APPL_COBJS := $(APPL_COBJS) mbed_api.o netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.o ccsbcs.o ntshell.o text_editor.o text_history.o usrcmd.o vtrecv.o vtsend.o ntlibc.o ntstdio.o ntopt.o syscall.o tlsf.o
 
@@ -196 +199 @@
 #
 APPLNAME = app1_usb_watt_meter
-APPLDIRS = ../src ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/echonet ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src $(SRCDIR)/$(TINETDIR)/netapp
+APPLDIRS := $(APPLDIRS) ../src
 APPL_CFG = main.cfg
 APPL_CDL = main.cdl

asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/DebugCitrus/Makefile

@@ -188 +188 @@
 CFLAGS = $(COPTS) $(CDEFS) $(INCLUDES)
 
+APPLDIRS := $(APPLDIRS) ../../ntshell/echonet
 APPL_COBJS := echonet.o echonet_agent.o echonet_dbg.o echonet_fbs.o echonet_task.o echonet_udp_task.o echonet_udp6_task.o fbs_string.o
-APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o 
+APPLDIRS := $(APPLDIRS) $(SRCDIR)/$(TINETDIR)/netapp
+APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o ntp_cli.o net_misc.o
+APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
 APPL_COBJS := $(APPL_COBJS) mbed_api.o netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.o ccsbcs.o ntshell.o text_editor.o text_history.o usrcmd.o vtrecv.o vtsend.o ntlibc.o ntstdio.o ntopt.o syscall.o tlsf.o
 
@@ -196 +199 @@
 #
 APPLNAME = app1_usb_watt_meter
-APPLDIRS = ../src ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/echonet ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src $(SRCDIR)/$(TINETDIR)/netapp
+APPLDIRS := $(APPLDIRS) ../src
 APPL_CFG = main.cfg
 APPL_CDL = main.cdl

asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/DebugEther/Makefile

@@ -188 +188 @@
 CFLAGS = $(COPTS) $(CDEFS) $(INCLUDES)
 
+APPLDIRS := $(APPLDIRS) ../../ntshell/echonet
 APPL_COBJS := echonet.o echonet_agent.o echonet_dbg.o echonet_fbs.o echonet_task.o echonet_udp_task.o echonet_udp6_task.o fbs_string.o
-APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o 
+APPLDIRS := $(APPLDIRS) $(SRCDIR)/$(TINETDIR)/netapp
+APPL_COBJS := $(APPL_COBJS) ping.o ping6.o resolver.o dhcp4_cli.o netapp_subr.o ntp_cli.o net_misc.o
+APPLDIRS := $(APPLDIRS) ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src
 APPL_COBJS := $(APPL_COBJS) mbed_api.o netcmd.o fdtable.o io_stub.o socket_stub.o ffarch.o diskio.o ff.o mmc_rspi.o ccsbcs.o ntshell.o text_editor.o text_history.o usrcmd.o vtrecv.o vtsend.o ntlibc.o ntstdio.o ntopt.o syscall.o tlsf.o
 
@@ -196 +199 @@
 #
 APPLNAME = app1_usb_watt_meter
-APPLDIRS = ../src ../../ntshell/tlsf ../../ntshell/fatfs ../../ntshell/echonet ../../ntshell/ntshell ../../ntshell/ntshell/core ../../ntshell/ntshell/util ../../ntshell/src $(SRCDIR)/$(TINETDIR)/netapp
+APPLDIRS := $(APPLDIRS) ../src
 APPL_CFG = main.cfg
 APPL_CDL = main.cdl

asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/src/echonet_main.c

@@ -61 +61 @@
 
 /* TODO: メーカーコードを設定 */
-#define MAKER_CODE      0x00, 0x00, 0xB3        /* TOPPERSプロジェクト */
+#define MAKER_CODE      { 0x00, 0x00, 0xB3 }    /* TOPPERSプロジェクト */
 
 /* ノードプロファイルオブジェクト */

asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/src/main.c

@@ -76 +76 @@
 #include <btstack/utils.h>
 #include "client.h"
+#include "ntp_cli.h"
 
 ID ws_api_mailboxid = MAIN_DATAQUEUE;
@@ -309 +310 @@
         }
 
+        if (link_up && up)
+                ntp_cli_execute();
+
         ntshell_change_netif_link(link_up, up);
 
@@ -338 +342 @@
 extern int usrcmd_dhcp4c(int argc, char **argv);
 extern int usrcmd_dnsc(int argc, char **argv);
+extern int usrcmd_ntpc(int argc, char **argv);
 
 static const cmd_table_t cmdlist[] = {
@@ -347 +352 @@
         {"mkdir", "Make directory", usrcmd_mkdir},
         {"hexdump", "Hex dump", usrcmd_hexdump},
+        {"date", "print date and time", usrcmd_date},
         {"curl", "Command lines or scripts to transfer data", curl_main},
         {"ping", "ping", usrcmd_ping},
-        {"dhcpc", "DHCP client rel/renew/info", usrcmd_dhcp4c},
+        {"dhcpc", "DHCP Client rel/renew/info", usrcmd_dhcp4c},
         {"dnsc", "DNS client", usrcmd_dnsc },
+        {"ntpc", "NTP client", usrcmd_ntpc },
         {"logupload", "Upload log to server", cmd_logupload},
         {"info", "This is a description text string for info command.", usrcmd_info},

asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/src/main.cfg

@@ -58 +58 @@
 /* DHCP クライアント */
 #include "netapp/dhcp4_cli.h"
-INCLUDE("netapp/dhcp4_cli_asp.cfg");
+//INCLUDE("netapp/dhcp4_cli_asp.cfg");
 INCLUDE("netapp/tinet_dhcp4_cli.cfg");
 
@@ -65 +65 @@
 INCLUDE("netapp/resolver_asp.cfg");
 INCLUDE("netapp/tinet_resolver.cfg");
+
+/* NTPクライアント */
+#include "ntp_cli.h"
+//INCLUDE("ntp_cli.cfg");
+INCLUDE("tinet_ntp_cli.cfg");
+
+#include "net_misc.h"
+INCLUDE("net_misc.cfg");
 
 /* FatFs */