andy/python_tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

实现方案导入导出，根据选项自动生成文件名

Browse Source
This commit is contained in:
ranchuan
2024-01-15 18:07:02 +08:00
parent 5b3786dd36
commit 89ef0a6514
20 changed files with 2141 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
web/layui/epro2_cmd.js
View File

@@ -47,7 +47,8 @@ var ep2_excued_rtv;
var ep2_cmd_excue_busy = 0
var ep2_bus_cur = 0;
var ep2_recive_buf = [];
var EP2_CMM_RATE = 800;
var EP2_CMM_RATE = 500;
var ep2_log_write_flag = 0;
function Ep2_Start_Comm()
{
console.log("Ep2_Start_Comm ");
@@ -164,7 +165,13 @@ function Ep2_Init()
var id = data.elem.id;
if(id == "mes_save_log")
{
layer.tips('日志记录 '+ (this.checked ? 'true' : 'false'), data.othis)
layer.tips('日志记录 '+ (this.checked ? 'true' : 'false'), data.othis);
if(this.checked )
{
ep2_log_write_flag = 1;
}else{
ep2_log_write_flag = 0;
}
}
// else if(id == "soft_enhace")
// {
@@ -243,7 +250,7 @@ function EP2_HeartBeat(frame_buf)
bus_current = bus_current.toFixed(3);
var mes = "高电平电压 "+bus_volate+"V 中电平"+bus_mvolate+"V 总线输出 "+bus_v+"V 总线电流 "+bus_current+"mA"
ep2_bus_cur = bus_current;
ShowCommMes(mes,MesgType.MESG_TYPE_INFO);
ShowCommMes(mes,MesgType.MESG_TYPE_INFO,ep2_log_write_flag);
}
function EP2Comm_Recive(jsoninfo)
{
@@ -342,7 +349,7 @@ async function Ep2_WaitCmdExcu( cmd, time_out)
if(ep2_excued_rtv != 0)
{
ShowCommMes("命令执行失败",MesgType.MESG_TYPE_ERROR);
epro2_oper.cycle_test = 0;//停止循环测试
// epro2_oper.cycle_test = 0;//停止循环测试
//epro2_oper.cycle_runcount = 1;
return 2;
}
@@ -501,14 +508,45 @@ async function Ep2_CheckSelfCmd(addr)
case 4: param[0] = 0 ; break;
case 5: param[0] = 1 ;break;
case 6: param[0] = 2 ;break;
}
var cmd_buf = Ep2_CmdData(addr,32,param,0,4,EP2_CMM_RATE);
var cmd_buf = Ep2_CmdData(addr,32,param,0,4,EP2_CMM_RATE);
ep2_excuedcmd = 0;
Ep2_SendCmd(cmd_buf);
var rtv = await Ep2_WaitCmdExcu(epro2_oper.cmd,1000);
return rtv;
}
async function Ep2_ReadCapChgT()
{
var param = [];
param[0] = 8;
var cmd_buf = Ep2_CmdData(epro2_oper.commaddr,32,param,5,4,EP2_CMM_RATE);
ep2_excuedcmd = 0;
Ep2_SendCmd(cmd_buf);
var rtv = await Ep2_WaitCmdExcu(epro2_oper.cmd,1000);
if(rtv == 0)
{
var read_buf = [];
ArrayCopy(ep2_recive_buf,read_buf,10,4);
var capT = read_buf[3];
capT <<= 8;
capT += read_buf[2];
capT <<= 8;
capT += read_buf[1];
capT <<= 8;
capT += read_buf[0];
capT >>= 2;
var mes ;
mes = "地址 "+epro2_oper.commaddr +" 电容充电时间us "+ capT;
ShowCommMes(mes,MesgType.MESG_TYPE_INFO);
return;
}
}
async function Ep2_ReadFirmwareCmd(addr)
{
var param = [];
@@ -531,7 +569,7 @@ async function Ep2_ReadFirmwareCmd(addr)
async function Ep2_ReadSysStatesCmd(addr)
{
var param = [];
var cmd_buf = Ep2_CmdData(addr,28,param,5,2,EP2_CMM_RATE);
var cmd_buf = Ep2_CmdData(addr,28,param,5,80,EP2_CMM_RATE);
ep2_excuedcmd = 0;
Ep2_SendCmd(cmd_buf);
var rtv = await Ep2_WaitCmdExcu(epro2_oper.cmd,1000);
@@ -757,6 +795,9 @@ async function Ep2_SaveFirInfo()
}
}
var Ep2_Inspect_OK = [];
async function Ep2_Inspect_Task(type)
{
var bgaddr = epro2_oper.cycle_bgaddr;
@@ -784,6 +825,7 @@ async function Ep2_Inspect_Task(type)
var mes = "巡检成功： ";
for(var index = 0; index < rtd.ok_addr.length;index++)
{
Ep2_Inspect_OK[Ep2_Inspect_OK.length] = rtd.ok_addr[index];
mes += rtd.ok_addr[index]+" ";
}
if(rtd.ok_addr.length > 0)
@@ -838,19 +880,19 @@ async function Ep2_RunBootLoader()
ShowCommMes("执行跳转成功",MesgType.MESG_TYPE_INFO);
}
}
async function Ep2_autoSetAddr()
async function Ep2_autoSetAddr(max_addr, addr_fac)
{
var param = [];
param[0] = epro2_oper.cycle_endaddr & 0x0FF;
param[1] = (epro2_oper.cycle_endaddr >> 8) & 0x0FF;
param[2] = epro2_oper.auset_addr_fac & 0x0FF;
param[3] = (epro2_oper.auset_addr_fac >> 8) & 0x0FF;
param[0] = max_addr & 0x0FF;
param[1] = (max_addr >> 8) & 0x0FF;
param[2] = addr_fac & 0x0FF;
param[3] = (addr_fac >> 8) & 0x0FF;
var cmd_buf = Ep2_CmdData(0,39,param,0,0,EP2_CMM_RATE)
ep2_excuedcmd = 0;
Ep2_SendCmd(cmd_buf);
var rtv = await Ep2_WaitCmdExcu(epro2_oper.cmd,1000);
if(rtv == 0){
ShowCommMes("设置自动分配地址因子成功 " + epro2_oper.auset_addr_fac + "最大地址 "+ epro2_oper.cycle_endaddr ,MesgType.MESG_TYPE_INFO);
ShowCommMes("设置自动分配地址因子成功 " + addr_fac + "最大地址 "+ max_addr ,MesgType.MESG_TYPE_INFO);
}
return rtv;
}
@@ -876,7 +918,8 @@ async function Ep2_ReadUID()
return 0;
}else{
ShowCommMes("读取UID失败 ",MesgType.MESG_TYPE_ERROR);
ShowCommMes("地址 "+epro2_oper.commaddr +" 读取UID失败 ",MesgType.MESG_TYPE_ERROR);
rtv = -1;
}
}
@@ -885,7 +928,8 @@ async function Ep2_ReadUID()
async function Ep2_WriteUID()
{
var uid_arr = Str2Bytes(epro2_oper.uid);
uid_arr = UidCode_YM2JQ(uid_arr);
//uid_arr = UidCode_YM2JQ(uid_arr);
uid_arr = UidCode_YM2JQ_2(uid_arr);
uid_arr[uid_arr.length]= Epj_CalcCrc8(uid_arr,uid_arr.length);
var rtv = await Ep2_WriteMTPCmd(epro2_oper.commaddr,0,uid_arr.length,uid_arr);
if(rtv != 0)
@@ -1069,8 +1113,22 @@ async function Ep2_ReadDelay()
}else{
ShowCommMes("地址 "+epro2_oper.commaddr+" 读延时失败",MesgType.MESG_TYPE_ERROR);
}
}
async function Ep2_UpdateAddr(newaddr)
{
var param = [];
param[0] = newaddr & 0xFF;
param[1] = (newaddr >> 8) & 0xFF;
var cmd_buf = Ep2_CmdData(epro2_oper.commaddr,36,param,0,0,EP2_CMM_RATE);
ep2_excuedcmd = 0;
Ep2_SendCmd(cmd_buf);
var rtv = await Ep2_WaitCmdExcu(epro2_oper.cmd,1000);
if(rtv == 0)
{
ShowCommMes("地址 "+ epro2_oper.commaddr+" 更新成功",MesgType.MESG_TYPE_INFO);
}else{
ShowCommMes("地址 "+ epro2_oper.commaddr+" 更新成功",MesgType.MESG_TYPE_ERROR);
}
}
async function Ep2_WriteDelay()
{
@@ -1175,6 +1233,8 @@ async function Ep2_WriteRuncfg()
async function Ep2_ExcueOperCmd()
{
var once_excue = 0;
if(epro2_oper.cycle_test > 0)
{
@@ -1199,6 +1259,7 @@ async function Ep2_ExcueOperCmd()
case 6 : await Ep2_CheckSelfCmd(0);break;
case 7 : await Ep2_ClkAmend();break;
case 9: await Ep2_Inspect_Task(0);break;
case 11 : await Ep2_ReadCapChgT();break;
case 13: await Ep2_HeartBeat_SW();break;
case 15: await Ep2_BusSwitch(1); break;
case 16: await Ep2_BusSwitch(0); break;
@@ -1219,7 +1280,7 @@ async function Ep2_ExcueOperCmd()
case 31: await Ep2_WritMTPTask();break;
case 32: await Ep2_ReadSysStatesCmd(epro2_oper.commaddr);break;
case 33: await Ep2_ReadAmend();break;
case 35: await Ep2_autoSetAddr();break;
case 35: await Ep2_autoSetAddr(epro2_oper.cycle_endaddr,epro2_oper.auset_addr_fac);break;
case 36: await Ep2_ReadRuncfg();break;
case 37: await Ep2_WriteRuncfg();break;
case 38: await Ep2_CfgAck();break;