log可以单独设置打印ip

This commit is contained in:
ranchuan
2023-06-15 18:11:28 +08:00
parent d3c3f120e7
commit c59f1738a2
10 changed files with 182 additions and 73 deletions

View File

@@ -6,7 +6,7 @@
#define BUILD_DATE "2023-06-14 22:00:30"
#define BUILD_DATE "2023-06-15 17:41:54"
#define SOFT_VERSION "0.01"

View File

@@ -210,19 +210,24 @@ commend_export(moter,moter,"control moter up or down|use:moter [frequency] [coun
static void print_sys_param(const sys_param_def *par)
{
cmd_print(" - - - - - - - - - - - - - - ");
cmd_print("pack time: %s",par->pack_time);
cmd_print("host if: %s",par->host_if);
cmd_print("device type: %s",par->device_type);
cmd_print("mac addr: %02x.%02x.%02x.%02x.%02x.%02x",
cmd_print("pack time: %s",par->pack_time);
cmd_print("host if: %s",par->host_if);
cmd_print("device type: %s",par->device_type);
cmd_print("mac addr: %02x.%02x.%02x.%02x.%02x.%02x",
par->mac[0],par->mac[1],par->mac[2],par->mac[3],par->mac[4],par->mac[5]);
cmd_print("local ip: %d.%d.%d.%d",
cmd_print("local ip: %d.%d.%d.%d",
par->local_ip[0],par->local_ip[1],par->local_ip[2],par->local_ip[3]);
cmd_print("host ip: %d.%d.%d.%d",
cmd_print("host ip: %d.%d.%d.%d",
par->host_ip[0],par->host_ip[1],par->host_ip[2],par->host_ip[3]);
cmd_print("host port: %d",par->host_port);
cmd_print("local cmd port: %d",par->local_cmd_port);
cmd_print("host log port: %d",par->host_log_port);
cmd_print("local id: %d",par->local_id);
cmd_print("host port: %d",par->host_port);
cmd_print("local cmd port: %d",par->local_cmd_port);
cmd_print("host log port: %d",par->host_log_port);
cmd_print("local id: %d",par->local_id);
cmd_print("host log ip: %d.%d.%d.%d",
par->host_log_ip[0],par->host_log_ip[1],par->host_log_ip[2],par->host_log_ip[3]);
cmd_print("uart bsp: %d",par->uartbsp);
cmd_print("coder ret mode: %d",par->coder_ret_mode);
cmd_print("slave_addr_start: %d",par->slave_addr_start);
}
@@ -239,7 +244,7 @@ static int sysinfo(list_def *argv)
return 0;
}
commend_export(sysinfo,sysinfo,"print the sortware info")
commend_export(sysinfo,sysinfo,"print the software info")
@@ -256,6 +261,7 @@ static void print_sys_help(void)
cmd_print("set localcmdport 7777");
cmd_print("set hostlogport 12345");
cmd_print("set localid 1");
cmd_print("set hostlogip 192.168.80.80");
cmd_print("set uartbsp 115200");
cmd_print("set codermode 1/0");
cmd_print("set slave_addr_start 1/0");
@@ -358,6 +364,17 @@ static int sys_set(list_def *argv)
spar->uartbsp=str_atoi(str);
cmd_print("uart bsp: %d",spar->uartbsp);
}
else if(strcmp(list_get_str(argv,1),"hostlogip")==0)
{
char *str=list_get_str(argv,2);
list_def *ip=str_atod_list(str,'.');
spar->host_log_ip[0]=list_get_int(ip,0);
spar->host_log_ip[1]=list_get_int(ip,1);
spar->host_log_ip[2]=list_get_int(ip,2);
spar->host_log_ip[3]=list_get_int(ip,3);
cmd_print("host log ip: %d.%d.%d.%d",
spar->host_log_ip[0],spar->host_log_ip[1],spar->host_log_ip[2],spar->host_log_ip[3]);
}
else if(strcmp(list_get_str(argv,1),"codermode")==0)
{
char *str=list_get_str(argv,2);
@@ -478,9 +495,9 @@ void param_init(rom_head *h)
{
static sys_param_def pars={0};
memcpy(&pars,sys_param(),sizeof(sys_param_def));
memcpy(pars.pack_time,h->pack_time,20);
if(pars.local_id==0xffffffff){
if(h){
if(h){
memcpy(pars.pack_time,h->pack_time,20);
if(pars.local_id==0xffffffff){
memcpy(pars.host_if,h->host_if,8);
memcpy(pars.device_type,"checker",8);
mac_init(pars.mac);
@@ -491,20 +508,24 @@ void param_init(rom_head *h)
pars.host_log_port=12345;
pars.local_id=1;
}
else{
// 填充默认配置
flash_save_param(&pars);
}
else{
// 填充默认配置
if(pars.local_id==0xffffffff){
memcpy(pars.host_if,"uart4",6);
memcpy(pars.device_type,"coder",6);
mac_init(pars.mac);
memcpy(pars.local_ip,(uint8_t []){192,168,80,10},4);
memcpy(pars.host_ip,(uint8_t []){192,168,80,80},4);
memcpy(pars.host_log_ip,(uint8_t []){192,168,80,80},4);
pars.host_port=9527;
pars.local_cmd_port=7777;
pars.host_log_port=12345;
pars.local_id=1;
flash_save_param(&pars);
}
}
flash_save_param(&pars);
}