Changeset 342 for asp3_tinet_ecnl_rx/trunk/app6_hot_water_pot/src
- Timestamp:
- Apr 27, 2018, 2:26:14 PM (6 years ago)
- Location:
- asp3_tinet_ecnl_rx/trunk/app6_hot_water_pot/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
asp3_tinet_ecnl_rx/trunk/app6_hot_water_pot/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 54 54 /* TODO: メーカーコードを設定 */ … … 386 386 main_btn1_state = (btn1 & 0x80) != 0; 387 387 main_btn2_state = (btn2 & 0x80) != 0; 388 389 ER ret = act_tsk(MAIN_TASK); 390 if (ret != E_OK) { 391 syslog(LOG_ERROR, "act_tsk"); 392 } 388 393 } 389 394 -
asp3_tinet_ecnl_rx/trunk/app6_hot_water_pot/src/main.c
r341 r342 76 76 #include <btstack/utils.h> 77 77 #include "ntp_cli.h" 78 #include "netcmd.h" 78 79 79 80 ID ws_api_mailboxid = MAIN_DATAQUEUE; … … 82 83 #ifdef IF_ETHER_BTUSB 83 84 extern int bt_bnep_mode; 84 85 /* PANU向けリモートアドレス */ 85 86 // BUFFALLO 86 87 //bd_addr_t remote_addr = { 0x00,0x1B,0xDC,0x04,0x5C,0x2D }; … … 143 144 144 145 ntshell_t ntshell; 145 void _start_c(long *p);146 146 147 147 /* … … 149 149 */ 150 150 void main_task(intptr_t exinf) 151 {152 long args[] = {153 1,154 (long)"ntshell",155 };156 _start_c(args);157 }158 159 int main(int argc, char **argv)160 151 { 161 152 #ifdef IF_ETHER_BTUSB … … 169 160 ntshell_set_prompt(&ntshell, "NTShell>"); 170 161 ntshell_execute(&ntshell); 171 172 return 0;173 162 } 174 163 … … 184 173 fno.lfsize = _MAX_LFN + 1; 185 174 #endif 186 ER ret 2;175 ER ret; 187 176 188 177 ntshell_task_init(); … … 239 228 #endif 240 229 241 ret 2= get_tim(&main_obj.now);242 if (ret 2!= E_OK) {230 ret = get_tim(&main_obj.now); 231 if (ret != E_OK) { 243 232 syslog(LOG_ERROR, "get_tim"); 244 233 ext_tsk(); … … 309 298 echonet_change_netif_link(link_up, up); 310 299 } 311 312 extern int usrcmd_ping(int argc, char **argv);313 extern int usrcmd_dhcp4c(int argc, char **argv);314 extern int usrcmd_dnsc(int argc, char **argv);315 extern int usrcmd_ntpc(int argc, char **argv);316 300 317 301 static const cmd_table_t cmdlist[] = { -
asp3_tinet_ecnl_rx/trunk/app6_hot_water_pot/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/app6_hot_water_pot/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.