Ignore:
Timestamp:
Apr 27, 2018, 2:26:14 PM (6 years ago)
Author:
coas-nagasima
Message:

syscallが関数呼びになるよう変更
他更新

Location:
asp3_tinet_ecnl_rx/trunk/app5_temp_sensor
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • asp3_tinet_ecnl_rx/trunk/app5_temp_sensor/Debug/Makefile

    r340 r342  
    382382tecs $(TECSGEN_SRCS) $(TECS_HEADERS): $(TECSGEN_TIMESTAMP) ;
    383383$(TECSGEN_TIMESTAMP): $(APPL_CDL) $(TECS_IMPORTS)
    384         $(TECSGEN) $< -R $(INCLUDES) --cpp "$(TECS_CPP)" -g $(TECSGENDIR)
     384        $(TECSGEN) $< -R $(INCLUDES) --cpp "$(subst ", \", $(TECS_CPP))" -g $(TECSGENDIR)
    385385
    386386#

  • asp3_tinet_ecnl_rx/trunk/app5_temp_sensor/DebugCitrus/Makefile

    r340 r342  
    382382tecs $(TECSGEN_SRCS) $(TECS_HEADERS): $(TECSGEN_TIMESTAMP) ;
    383383$(TECSGEN_TIMESTAMP): $(APPL_CDL) $(TECS_IMPORTS)
    384         $(TECSGEN) $< -R $(INCLUDES) --cpp "$(TECS_CPP)" -g $(TECSGENDIR)
     384        $(TECSGEN) $< -R $(INCLUDES) --cpp "$(subst ", \", $(TECS_CPP))" -g $(TECSGENDIR)
    385385
    386386#

  • asp3_tinet_ecnl_rx/trunk/app5_temp_sensor/DebugEther/Makefile

    r340 r342  
    380380tecs $(TECSGEN_SRCS) $(TECS_HEADERS): $(TECSGEN_TIMESTAMP) ;
    381381$(TECSGEN_TIMESTAMP): $(APPL_CDL) $(TECS_IMPORTS)
    382         $(TECSGEN) $< -R $(INCLUDES) --cpp "$(TECS_CPP)" -g $(TECSGENDIR)
     382        $(TECSGEN) $< -R $(INCLUDES) --cpp "$(subst ", \", $(TECS_CPP))" -g $(TECSGENDIR)
    383383
    384384#

  • asp3_tinet_ecnl_rx/trunk/app5_temp_sensor/src/echonet_main.c

    r340 r342  
    5050#include "echonet_main.h"
    5151#include "echonet_cfg.h"
    52 #include "rx630.h"
     52#include "target_kernel_impl.h"
    5353
    5454/* TODO: メーカーコードを設定 */
    … …  
    403403        main_btn1_state = (btn1 & 0x20) != 0;
    404404        main_btn2_state = (btn2 & 0x80) != 0;
     405
     406        ER ret = act_tsk(MAIN_TASK);
     407        if (ret != E_OK) {
     408                syslog(LOG_ERROR, "act_tsk");
     409        }
    405410}
    406411

  • asp3_tinet_ecnl_rx/trunk/app5_temp_sensor/src/main.c

    r341 r342  
    7676#include <btstack/utils.h>
    7777#include "ntp_cli.h"
     78#include "netcmd.h"
    7879
    7980ID ws_api_mailboxid = MAIN_DATAQUEUE;
    … …  
    8283#ifdef IF_ETHER_BTUSB
    8384extern int bt_bnep_mode;
    84 
     85/* PANU向けリモートアドレス */
    8586// BUFFALLO
    8687//bd_addr_t remote_addr = { 0x00,0x1B,0xDC,0x04,0x5C,0x2D };
    … …  
    143144
    144145ntshell_t ntshell;
    145 void _start_c(long *p);
    146146
    147147/*
    … …  
    149149 */
    150150void 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)
    160151{
    161152#ifdef IF_ETHER_BTUSB
    … …  
    169160        ntshell_set_prompt(&ntshell, "NTShell>");
    170161        ntshell_execute(&ntshell);
    171 
    172         return 0;
    173162}
    174163
    … …  
    184173        fno.lfsize = _MAX_LFN + 1;
    185174#endif
    186         ER ret2;
     175        ER ret;
    187176
    188177        ntshell_task_init();
    … …  
    239228#endif
    240229
    241         ret2 = get_tim(&main_obj.now);
    242         if (ret2 != E_OK) {
     230        ret = get_tim(&main_obj.now);
     231        if (ret != E_OK) {
    243232                syslog(LOG_ERROR, "get_tim");
    244233                ext_tsk();
    … …  
    309298        echonet_change_netif_link(link_up, up);
    310299}
    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);
    316300
    317301static const cmd_table_t cmdlist[] = {

  • asp3_tinet_ecnl_rx/trunk/app5_temp_sensor/src/main.cfg

    r340 r342  
    8484INCLUDE("echonet_main.cfg");
    8585
    86 CRE_TSK(MAIN_TASK, { TA_ACT, 0, main_task, MAIN_PRIORITY, MAIN_STACK_SIZE, NULL });
     86CRE_TSK(MAIN_TASK, { TA_NULL, 0, main_task, MAIN_PRIORITY, MAIN_STACK_SIZE, NULL });
    8787CRE_DTQ(MAIN_DATAQUEUE, { TA_TFIFO, NUM_MAIN_DATAQUEUE, NULL });

  • asp3_tinet_ecnl_rx/trunk/app5_temp_sensor/src/tinet_app_config.h

    r337 r342  
    2929 *  接的または間接的に生じたいかなる損害に関しても，その責任を負わない．
    3030 *
    31  *  @(#) $Id$
     31 *  @(#) $Id: tinet_app_config.h 1505 2018-04-17 11:22:02Z coas-nagasima $
    3232 */
    3333
    … …  
    624624/* DNS サーバの IP アドレス */
    625625
    626 #if !defined(DHCP6_CLI_CFG)
     626//#if !defined(DHCP6_CLI_CFG)
    627627
    628628#define IPV6_ADDR_DNS_INIT      \
    … …  
    632632            UINT_C(0xfe), UINT_C(0x56), UINT_C(0xc5), UINT_C(0xd6) }}}
    633633
    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 #endif
     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,137,1)
     638//#endif
    639639
    640640/* DOMAIN 名 */
Note: See TracChangeset for help on using the changeset viewer.