Changeset 342 for asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter
- Timestamp:
- Apr 27, 2018, 2:26:14 PM (6 years ago)
- Location:
- asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/Debug/Makefile
r340 r342 391 391 tecs $(TECSGEN_SRCS) $(TECS_HEADERS): $(TECSGEN_TIMESTAMP) ; 392 392 $(TECSGEN_TIMESTAMP): $(APPL_CDL) $(TECS_IMPORTS) 393 $(TECSGEN) $< -R $(INCLUDES) --cpp "$( TECS_CPP)" -g $(TECSGENDIR)393 $(TECSGEN) $< -R $(INCLUDES) --cpp "$(subst ", \", $(TECS_CPP))" -g $(TECSGENDIR) 394 394 395 395 # -
asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/DebugCitrus/Makefile
r340 r342 391 391 tecs $(TECSGEN_SRCS) $(TECS_HEADERS): $(TECSGEN_TIMESTAMP) ; 392 392 $(TECSGEN_TIMESTAMP): $(APPL_CDL) $(TECS_IMPORTS) 393 $(TECSGEN) $< -R $(INCLUDES) --cpp "$( TECS_CPP)" -g $(TECSGENDIR)393 $(TECSGEN) $< -R $(INCLUDES) --cpp "$(subst ", \", $(TECS_CPP))" -g $(TECSGENDIR) 394 394 395 395 # -
asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/DebugEther/Makefile
r340 r342 391 391 tecs $(TECSGEN_SRCS) $(TECS_HEADERS): $(TECSGEN_TIMESTAMP) ; 392 392 $(TECSGEN_TIMESTAMP): $(APPL_CDL) $(TECS_IMPORTS) 393 $(TECSGEN) $< -R $(INCLUDES) --cpp "$( TECS_CPP)" -g $(TECSGENDIR)393 $(TECSGEN) $< -R $(INCLUDES) --cpp "$(subst ", \", $(TECS_CPP))" -g $(TECSGENDIR) 394 394 395 395 # -
asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/src/client.c
r337 r342 245 245 FIL file; 246 246 FRESULT ret; 247 char fname[] = {" 0:/log/20160101000000.log"};247 char fname[] = {"1:/log/20160101000000.log"}; 248 248 249 249 get_logfname(fname); -
asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/src/echonet_main.c
r340 r342 50 50 #include "echonet_main.h" 51 51 #include "echonet_cfg.h" 52 #include " rx630.h"52 #include "target_kernel_impl.h" 53 53 #include "ff.h" 54 54 #include "diskio.h" … … 59 59 #include <net/ethernet.h> 60 60 #include <net/if_var.h> 61 #include "ntshell_main.h" 61 62 62 63 /* TODO: メーカーコードを設定 */ … … 504 505 505 506 /* 3ms後に7SEG表示を更新 */ 506 main_led_timer = 3 ;507 main_led_timer = 3 * 1000; 507 508 508 509 /* 10ms後にボタン状態を確認 */ 509 main_timer = 10 ;510 main_timer = 10 * 1000; 510 511 511 512 /* 12bitADC初期化 */ … … 520 521 521 522 /* 1秒後に表示を更新 */ 522 main_adv_timer = 1000; 523 main_adv_timer = 1000 * 1000; 524 525 ER ret = act_tsk(MAIN_TASK); 526 if (ret != E_OK) { 527 syslog(LOG_ERROR, "act_tsk"); 528 } 523 529 } 524 530 … … 759 765 760 766 if (electric_energy_meter_data[0].current_pos == 0) { 761 //act_tsk(CLIENT_TASK);767 cmd_execute("logupload", NULL); 762 768 } 763 769 } -
asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/src/main.c
r340 r342 77 77 #include "client.h" 78 78 #include "ntp_cli.h" 79 #include "netcmd.h" 79 80 80 81 ID ws_api_mailboxid = MAIN_DATAQUEUE; … … 83 84 #ifdef IF_ETHER_BTUSB 84 85 extern int bt_bnep_mode; 85 86 /* PANU向けリモートアドレス */ 86 87 // BUFFALLO 87 88 //bd_addr_t remote_addr = { 0x00,0x1B,0xDC,0x04,0x5C,0x2D }; … … 144 145 145 146 ntshell_t ntshell; 146 void _start_c(long *p);147 147 148 148 /* … … 150 150 */ 151 151 void main_task(intptr_t exinf) 152 {153 long args[] = {154 1,155 (long)"ntshell",156 };157 _start_c(args);158 }159 160 int main(int argc, char **argv)161 152 { 162 153 #ifdef IF_ETHER_BTUSB … … 170 161 ntshell_set_prompt(&ntshell, "NTShell>"); 171 162 ntshell_execute(&ntshell); 172 173 return 0;174 163 } 175 164 … … 187 176 fno.lfsize = _MAX_LFN + 1; 188 177 #endif 189 ER ret 2;178 ER ret; 190 179 191 180 //wolfSSL_Debugging_ON(); … … 247 236 #endif 248 237 249 ret 2= get_tim(&main_obj.now);250 if (ret 2!= E_OK) {238 ret = get_tim(&main_obj.now); 239 if (ret != E_OK) { 251 240 syslog(LOG_ERROR, "get_tim"); 252 241 ext_tsk(); … … 339 328 340 329 extern int curl_main(int argc, char **argv); 341 extern int usrcmd_ping(int argc, char **argv);342 extern int usrcmd_dhcp4c(int argc, char **argv);343 extern int usrcmd_dnsc(int argc, char **argv);344 extern int usrcmd_ntpc(int argc, char **argv);345 330 346 331 static const cmd_table_t cmdlist[] = { -
asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/src/main.cfg
r340 r342 84 84 INCLUDE("echonet_main.cfg"); 85 85 86 CRE_TSK(MAIN_TASK, { TA_ ACT, 0, main_task, MAIN_PRIORITY, MAIN_STACK_SIZE, NULL });86 CRE_TSK(MAIN_TASK, { TA_NULL, 0, main_task, MAIN_PRIORITY, MAIN_STACK_SIZE, NULL }); 87 87 CRE_DTQ(MAIN_DATAQUEUE, { TA_TFIFO, NUM_MAIN_DATAQUEUE, NULL }); -
asp3_tinet_ecnl_rx/trunk/app1_usb_watt_meter/src/tinet_app_config.h
r337 r342 29 29 * 接的または間接的に生じたいかなる損害に関しても,その責任を負わない. 30 30 * 31 * @(#) $Id $31 * @(#) $Id: tinet_app_config.h 1505 2018-04-17 11:22:02Z coas-nagasima $ 32 32 */ 33 33 … … 624 624 /* DNS サーバの IP アドレス */ 625 625 626 #if !defined(DHCP6_CLI_CFG)626 //#if !defined(DHCP6_CLI_CFG) 627 627 628 628 #define IPV6_ADDR_DNS_INIT \ … … 632 632 UINT_C(0xfe), UINT_C(0x56), UINT_C(0xc5), UINT_C(0xd6) }}} 633 633 634 #endif /* of #if !defined(DHCP6_CLI_CFG) */635 636 #if !defined(DHCP4_CLI_CFG)637 #define IPV4_ADDR_DNS MAKE_IPV4_ADDR(192,168, 2,1)638 #endif634 //#endif /* of #if !defined(DHCP6_CLI_CFG) */ 635 636 //#if !defined(DHCP4_CLI_CFG) 637 #define IPV4_ADDR_DNS MAKE_IPV4_ADDR(192,168,137,1) 638 //#endif 639 639 640 640 /* DOMAIN 名 */
Note:
See TracChangeset
for help on using the changeset viewer.