diff --git a/CANThread/Diag22code.aardio b/CANThread/Diag22code.aardio index bb47443..39cd0eb 100644 --- a/CANThread/Diag22code.aardio +++ b/CANThread/Diag22code.aardio @@ -71,8 +71,13 @@ FuncDiag22Pro = function(data){ FuncDisplay("VIN码"); FuncDisplay(string.pack(table.slice(data,3))); } + case 0x7022 { + FuncDisplay("预压值： " + data[3]); + } else { FuncDisplay(TableToStr(data)) + //import console; + //console.dumpJson(data); } } diff --git a/dlg/about.aardio b/dlg/about.aardio index 681dba4..91fd46f 100644 --- a/dlg/about.aardio +++ b/dlg/about.aardio @@ -12,6 +12,10 @@ V2.0: 采用新界面 V2.1: 加入诊断，修复信号界面闪烁问题 V2.2: 加入全屏，修改标定/诊断逻辑 V2.3: 标定增加预设配置 +V2.4: 增加DAC周期写入功能 +V2.5: 巡航等按键增加第二路信号显示，增加调试帧开关 +V2.6: 修复右边2个按键信号和基线没显示数值问题 +V2.7: 信号界面增加左右按下状态 */ winform.button.oncommand = function(id,event){ diff --git a/dlg/diagnostic.aardio b/dlg/diagnostic.aardio index dda66f6..7097065 100644 --- a/dlg/diagnostic.aardio +++ b/dlg/diagnostic.aardio @@ -5,24 +5,29 @@ winform.add( btn1001={cls="button";text="默认会话";left=28;top=58;right=115;bottom=88;ah=1;aw=1;z=4}; btn1003={cls="button";text="扩展会话";left=126;top=58;right=213;bottom=88;ah=1;aw=1;z=5}; btnConvert={cls="button";text="转换";left=541;top=463;right=619;bottom=493;ah=1;aw=1;z=46}; +btnRead7022={cls="button";text="预压值";left=232;top=212;right=319;bottom=242;ah=1;aw=1;z=54}; btnReadConfig={cls="button";text="读取配置";left=531;top=545;right=625;bottom=578;z=48}; -btnReadF187={cls="button";text="ECU零件号";left=234;top=183;right=321;bottom=213;ah=1;aw=1;z=18}; -btnReadF18A={cls="button";text="供应商ID";left=37;top=183;right=124;bottom=213;ah=1;aw=1;z=19}; -btnReadF190={cls="button";text="VIN码";left=135;top=183;right=222;bottom=213;ah=1;aw=1;z=20}; -btnReadF193={cls="button";text="硬件版本";left=37;top=226;right=124;bottom=256;ah=1;aw=1;z=22}; -btnReadF195={cls="button";text="软件版本";left=135;top=226;right=224;bottom=256;ah=1;aw=1;z=23}; -btnReadF198={cls="button";text="维修店代码";left=135;top=141;right=222;bottom=171;ah=1;aw=1;z=21}; -btnReadF199={cls="button";text="刷写日期";left=37;top=141;right=124;bottom=171;ah=1;aw=1;z=17}; +btnReadF187={cls="button";text="ECU零件号";left=232;top=255;right=319;bottom=285;ah=1;aw=1;z=18}; +btnReadF18A={cls="button";text="供应商ID";left=35;top=255;right=122;bottom=285;ah=1;aw=1;z=19}; +btnReadF190={cls="button";text="VIN码";left=133;top=255;right=220;bottom=285;ah=1;aw=1;z=20}; +btnReadF193={cls="button";text="硬件版本";left=35;top=298;right=122;bottom=328;ah=1;aw=1;z=22}; +btnReadF195={cls="button";text="软件版本";left=133;top=298;right=222;bottom=328;ah=1;aw=1;z=23}; +btnReadF198={cls="button";text="维修店代码";left=133;top=213;right=220;bottom=243;ah=1;aw=1;z=21}; +btnReadF199={cls="button";text="刷写日期";left=35;top=213;right=122;bottom=243;ah=1;aw=1;z=17}; btnReadPressTh={cls="button";text="读取";left=420;top=418;right=507;bottom=448;ah=1;aw=1;z=10}; -btnWrite9001={cls="button";text="触发震动";left=45;top=332;right=284;bottom=362;ah=1;aw=1;z=24}; -btnWrite9002={cls="button";text="写入参考电压";left=184;top=370;right=284;bottom=400;ah=1;aw=1;z=27}; -btnWrite9003={cls="button";text="写入增益";left=183;top=408;right=284;bottom=438;ah=1;aw=1;z=28}; +btnWrite9001={cls="button";text="触发震动";left=43;top=404;right=282;bottom=434;ah=1;aw=1;z=24}; +btnWrite9002={cls="button";text="写入参考电压";left=182;top=442;right=282;bottom=472;ah=1;aw=1;z=27}; +btnWrite9003={cls="button";text="写入增益";left=181;top=480;right=282;bottom=510;ah=1;aw=1;z=28}; +btnWrite9004={cls="button";text="写入周期";left=182;top=518;right=283;bottom=548;ah=1;aw=1;z=51}; +btnWriteA00100={cls="button";text="调试帧关";left=126;top=98;right=213;bottom=128;ah=1;aw=1;z=53}; +btnWriteA00101={cls="button";text="调试帧开";left=27;top=98;right=114;bottom=128;ah=1;aw=1;z=52}; btnWriteConfig={cls="button";text="写入配置";left=415;top=545;right=510;bottom=570;hide=1;z=49}; btnWritePressTh={cls="button";text="写入";left=524;top=418;right=611;bottom=448;ah=1;aw=1;z=11}; cb3E={cls="checkbox";text="3E保持";left=232;top=64;right=306;bottom=86;ah=1;aw=1;bgcolor=16777215;z=6}; -cbbDacRef={cls="combobox";left=45;top=370;right=175;bottom=396;ah=1;aw=1;edge=1;font=LOGFONT(h=-18);items={};mode="dropdown";z=25}; -cbbMotorGain={cls="combobox";left=45;top=408;right=175;bottom=434;ah=1;aw=1;edge=1;font=LOGFONT(h=-18);items={};mode="dropdown";z=26}; +cbbDacRef={cls="combobox";left=43;top=442;right=173;bottom=468;ah=1;aw=1;edge=1;font=LOGFONT(h=-18);items={};mode="dropdown";z=25}; +cbbMotorGain={cls="combobox";left=43;top=480;right=173;bottom=506;ah=1;aw=1;edge=1;font=LOGFONT(h=-18);items={};mode="dropdown";z=26}; combobox={cls="combobox";left=408;top=508;right=629;bottom=534;edge=1;font=LOGFONT(h=-18);items={};mode="dropdown";z=47}; +edDACPeriod={cls="edit";text="80";left=43;top=518;right=173;bottom=550;ah=1;align="center";aw=1;edge=1;font=LOGFONT(h=-18);num=1;z=50}; edFactor={cls="edit";text="1.0";left=457;top=464;right=531;bottom=491;ah=1;align="center";aw=1;edge=1;font=LOGFONT(h=-18);z=44}; edLog={cls="edit";left=649;top=12;right=970;bottom=586;ah=1;aw=1;edge=1;font=LOGFONT(h=-18);multiline=1;z=12}; edPressTh1={cls="edit";text="500";left=531;top=97;right=605;bottom=124;ah=1;align="center";aw=1;edge=1;font=LOGFONT(h=-18);num=1;z=9}; @@ -34,8 +39,8 @@ edPressTh6={cls="edit";text="500";left=531;top=294;right=605;bottom=321;ah=1;ali edPressTh7={cls="edit";text="500";left=531;top=333;right=605;bottom=360;ah=1;align="center";aw=1;edge=1;font=LOGFONT(h=-18);num=1;z=42}; edPressTh8={cls="edit";text="500";left=531;top=373;right=605;bottom=400;ah=1;align="center";aw=1;edge=1;font=LOGFONT(h=-18);num=1;z=43}; groupbox={cls="groupbox";text="标定";left=398;top=13;right=638;bottom=586;ah=1;aw=1;edge=1;z=1}; -groupbox2={cls="groupbox";text="读取DID";left=22;top=109;right=331;bottom=275;ah=1;aw=1;edge=1;z=3}; -groupbox3={cls="groupbox";text="震动";left=22;top=293;right=331;bottom=459;ah=1;aw=1;edge=1;z=2}; +groupbox2={cls="groupbox";text="读取DID";left=20;top=181;right=329;bottom=347;ah=1;aw=1;edge=1;z=3}; +groupbox3={cls="groupbox";text="震动";left=20;top=365;right=329;bottom=581;ah=1;aw=1;edge=1;z=2}; rbLeft={cls="radiobutton";text="左侧";left=61;top=15;right=115;bottom=35;ah=1;aw=1;bgcolor=16777215;checked=1;group=1;z=7}; rbPressTh={cls="radiobutton";text="压力";left=440;top=35;right=506;bottom=61;ah=1;aw=1;bgcolor=16777215;checked=1;group=1;z=15}; rbRight={cls="radiobutton";text="右侧";left=141;top=15;right=195;bottom=35;ah=1;aw=1;bgcolor=16777215;z=8}; @@ -147,14 +152,17 @@ winform.btnReadPressTh.oncommand = function(id,event){ winform.btnWritePressTh.oncommand = function(id,event){ CT_Diag10(0x03); - win.delay(20,1); + win.delay(50,1); var didbase = winform.rbPressTh.checked?0x9020:0x9010; for(name,ctrl in winform.eachControl("edit","edPressTh\d") ){ //ctrl.text = 0//string.right(name,1); var did = didbase + tonumber(string.right(name,1)) - 1; var val = tonumber(ctrl.text); + if(val == 0){ + continue; + } CT_Diag2EVal2B(did,val); - win.delay(20,1); + win.delay(50,1); var ret = GetReadThResp(did); if(ret != 0){ ctrl.text = ret; @@ -266,6 +274,31 @@ winform.btnWriteConfig.oncommand = function(id,event){ sec.save(); } +winform.btnWrite9004.oncommand = function(id,event){ + CT_Diag10(0x03); + win.delay(20,1); + var val = tonumber(winform.edDACPeriod.text); + CT_Diag2EVal1B(0x9004,val); +} + +winform.btnWriteA00101.oncommand = function(id,event){ + CT_Diag10(0x03); + win.delay(20,1); + CT_Diag2EVal1B(0xA001,0x01); +} + +winform.btnWriteA00100.oncommand = function(id,event){ + CT_Diag10(0x03); + win.delay(20,1); + CT_Diag2EVal1B(0xA001,0x00); +} + +winform.btnRead7022.oncommand = function(id,event){ + CT_Diag10(0x01); + win.delay(20,1); + CT_Diag22(0x7022); +} + winform.group(); winform.show(); diff --git a/dlg/setting.aardio b/dlg/setting.aardio index a4564c9..881b3d6 100644 --- a/dlg/setting.aardio +++ b/dlg/setting.aardio @@ -9,7 +9,7 @@ cbbDev={cls="combobox";left=127;top=123;right=376;bottom=149;dl=1;dt=1;edge=1;it plus={cls="plus";text="全屏";left=133;top=316;right=216;bottom=347;align="left";dl=1;dt=1;font=LOGFONT(h=-15);iconStyle={align="left";font=LOGFONT(h=-15;name='FontAwesome')};iconText='\uF0C8 ';notify=1;textPadding={left=24};z=7}; plus5={cls="plus";text="English";left=130;top=264;right=248;bottom=295;align="left";dl=1;dt=1;font=LOGFONT(h=-20;name='FontAwesome');iconStyle={align="left";font=LOGFONT(h=-16;name='FontAwesome');padding={left=5}};iconText='\uF0C8';notify=1;textPadding={left=30};z=1}; static={cls="static";left=128;top=65;right=441;bottom=81;transparent=1;z=6}; -static4={cls="static";text="V2.3 20230411";left=745;top=4;right=981;bottom=35;align="right";font=LOGFONT(h=-22);notify=1;transparent=1;z=4} +static4={cls="static";text="V2.7 20230616";left=745;top=4;right=981;bottom=35;align="right";font=LOGFONT(h=-22);notify=1;transparent=1;z=4} ) /*}}*/ diff --git a/dlg/switch.aardio b/dlg/switch.aardio index a5a6bb2..cb24ac5 100644 --- a/dlg/switch.aardio +++ b/dlg/switch.aardio @@ -3,9 +3,14 @@ import fonts.fontAwesome; /*DSG{{*/ var winform = win.form(text="wubiLex - 帮助";right=984;bottom=607;bgcolor=16777215;style=33554432) winform.add( -pgl1={cls="progress";left=63;top=40;right=202;bottom=50;color=12639424;dl=0.06;dt=1;edge=1;max=100;min=0;z=18}; -pgl2={cls="progress";left=63;top=80;right=202;bottom=90;color=12639424;dl=0.06;dt=1;edge=1;max=100;min=0;z=19}; -pgl3={cls="progress";left=63;top=120;right=202;bottom=130;color=12639424;dl=0.06;dt=1;edge=1;max=100;min=0;z=20}; +button={cls="button";text="左";left=363;top=546;right=410;bottom=580;z=137}; +button2={cls="button";text="右";left=794;top=543;right=841;bottom=577;z=138}; +pgl1={cls="progress";left=52;top=38;right=191;bottom=48;color=12639424;dl=0.05;dt=1;edge=1;max=100;min=0;z=18}; +pgl2={cls="progress";left=52;top=78;right=191;bottom=88;color=12639424;dl=0.05;dt=1;edge=1;max=100;min=0;z=19}; +pgl3={cls="progress";left=52;top=118;right=191;bottom=128;color=12639424;dl=0.05;dt=1;edge=1;max=100;min=0;z=20}; +pgl4={cls="progress";left=255;top=40;right=394;bottom=50;color=12639424;dl=0.26;dt=1;edge=1;max=100;min=0;z=124}; +pgl5={cls="progress";left=255;top=80;right=394;bottom=90;color=12639424;dl=0.26;dt=1;edge=1;max=100;min=0;z=125}; +pgl6={cls="progress";left=255;top=120;right=394;bottom=130;color=12639424;dl=0.26;dt=1;edge=1;max=100;min=0;z=126}; pgl_X1={cls="progress";left=50;top=204;right=189;bottom=214;color=12639424;dl=0.05;dt=1;edge=1;max=100;min=0;z=21}; pgl_X2={cls="progress";left=50;top=265;right=189;bottom=275;color=12639424;dl=0.05;dt=1;edge=1;max=100;min=0;z=22}; pgl_X3={cls="progress";left=50;top=325;right=189;bottom=335;color=12639424;dl=0.05;dt=1;edge=1;max=100;min=0;z=23}; @@ -16,22 +21,24 @@ pgl_Y2={cls="progress";left=226;top=264;right=372;bottom=274;color=12639424;dl=0 pgl_Y3={cls="progress";left=226;top=325;right=368;bottom=335;color=12639424;dl=0.23;dt=1;edge=1;max=100;min=0;z=58}; pgl_Y4={cls="progress";left=226;top=386;right=371;bottom=396;color=12639424;dl=0.23;dt=1;edge=1;max=100;min=0;z=59}; pgl_Y5={cls="progress";left=226;top=448;right=364;bottom=458;color=12639424;dl=0.23;dt=1;edge=1;max=100;min=0;z=26}; -pgl_press={cls="progress";left=126;top=518;right=268;bottom=528;color=12639424;dl=0.13;dt=1;edge=1;max=100;min=0;z=80}; +pgl_press={cls="progress";left=54;top=521;right=196;bottom=531;color=12639424;dl=0.05;dt=1;edge=1;max=100;min=0;z=80}; pgr1={cls="progress";left=546;top=23;right=682;bottom=33;color=12639424;dl=0.55;dt=1;edge=1;max=100;min=0;z=27}; pgr2={cls="progress";left=546;top=66;right=682;bottom=76;color=12639424;dl=0.55;dt=1;edge=1;max=100;min=0;z=34}; pgr3={cls="progress";left=546;top=110;right=682;bottom=120;color=12639424;dl=0.55;dt=1;edge=1;max=100;min=0;z=28}; pgr_X1={cls="progress";left=546;top=153;right=682;bottom=163;color=12639424;dl=0.55;dt=1;edge=1;max=100;min=0;z=29}; pgr_X2={cls="progress";left=546;top=196;right=682;bottom=206;color=12639424;dl=0.55;dt=1;edge=1;max=100;min=0;z=30}; -pgr_X3={cls="progress";left=482;top=473;right=619;bottom=483;color=12639424;dl=0.49;dt=1;edge=1;max=100;min=0;z=31}; -pgr_X4={cls="progress";left=482;top=424;right=617;bottom=434;color=12639424;dl=0.49;dt=1;edge=1;max=100;min=0;z=32}; -pgr_X5={cls="progress";left=482;top=374;right=620;bottom=384;color=12639424;dl=0.49;dt=1;edge=1;max=100;min=0;z=33}; -pgr_Y1={cls="progress";left=483;top=324;right=618;bottom=334;color=12639424;dl=0.49;dt=1;edge=1;max=100;min=0;z=69}; -pgr_Y2={cls="progress";left=483;top=272;right=619;bottom=282;color=12639424;dl=0.49;dt=1;edge=1;max=100;min=0;z=70}; -pgr_Y3={cls="progress";left=674;top=392;right=811;bottom=402;color=12639424;dl=0.68;dt=1;edge=1;max=100;min=0;z=71}; -pgr_Y4={cls="progress";left=674;top=332;right=809;bottom=342;color=12639424;dl=0.68;dt=1;edge=1;max=100;min=0;z=72}; -pgr_Y5={cls="progress";left=674;top=270;right=812;bottom=280;color=12639424;dl=0.68;dt=1;edge=1;max=100;min=0;z=73}; -pgr_press={cls="progress";left=575;top=517;right=717;bottom=527;color=12639424;dl=0.58;dt=1;edge=1;max=100;min=0;z=83}; -static={cls="static";text="恢复";left=18;top=24;right=53;bottom=48;align="center";center=1;dl=0.02;dt=1;notify=1;transparent=1;z=85}; +pgr_X3={cls="progress";left=470;top=452;right=607;bottom=462;color=12639424;dl=0.48;dt=1;edge=1;max=100;min=0;z=31}; +pgr_X4={cls="progress";left=470;top=403;right=605;bottom=413;color=12639424;dl=0.48;dt=1;edge=1;max=100;min=0;z=32}; +pgr_X5={cls="progress";left=470;top=353;right=608;bottom=363;color=12639424;dl=0.48;dt=1;edge=1;max=100;min=0;z=33}; +pgr_Y1={cls="progress";left=471;top=303;right=606;bottom=313;color=12639424;dl=0.48;dt=1;edge=1;max=100;min=0;z=69}; +pgr_Y2={cls="progress";left=471;top=251;right=607;bottom=261;color=12639424;dl=0.48;dt=1;edge=1;max=100;min=0;z=70}; +pgr_Y3={cls="progress";left=644;top=453;right=781;bottom=463;color=12639424;dl=0.65;dt=1;edge=1;max=100;min=0;z=71}; +pgr_Y4={cls="progress";left=644;top=402;right=779;bottom=412;color=12639424;dl=0.65;dt=1;edge=1;max=100;min=0;z=72}; +pgr_Y5={cls="progress";left=644;top=352;right=782;bottom=362;color=12639424;dl=0.65;dt=1;edge=1;max=100;min=0;z=73}; +pgr_Y6={cls="progress";left=644;top=301;right=781;bottom=311;color=12639424;dl=0.65;dt=1;edge=1;max=100;min=0;z=113}; +pgr_Y7={cls="progress";left=644;top=250;right=781;bottom=260;color=12639424;dl=0.65;dt=1;edge=1;max=100;min=0;z=117}; +pgr_press={cls="progress";left=475;top=518;right=617;bottom=528;color=12639424;dl=0.48;dt=1;edge=1;max=100;min=0;z=83}; +static={cls="static";text="恢复";left=7;top=22;right=42;bottom=46;align="center";center=1;dl=0.01;dt=1;notify=1;transparent=1;z=85}; static10={cls="static";text="Y轴上2";left=227;top=274;right=281;bottom=298;dl=0.23;dt=1;notify=1;transparent=1;z=94}; static11={cls="static";text="Y轴上3";left=227;top=335;right=281;bottom=359;dl=0.23;dt=1;notify=1;transparent=1;z=95}; static12={cls="static";text="Y轴上4";left=227;top=396;right=281;bottom=420;dl=0.23;dt=1;notify=1;transparent=1;z=96}; @@ -40,31 +47,46 @@ static14={cls="static";text="按键滑条1";left=473;top=19;right=540;bottom=43; static15={cls="static";text="按键滑条2";left=473;top=62;right=540;bottom=86;dl=0.48;dt=1;notify=1;transparent=1;z=99}; static16={cls="static";text="按键滑条3";left=473;top=105;right=540;bottom=129;dl=0.48;dt=1;notify=1;transparent=1;z=100}; static17={cls="static";text="按键滑条4";left=473;top=148;right=540;bottom=172;dl=0.48;dt=1;notify=1;transparent=1;z=101}; +static18={cls="static";text="Y轴上2";left=645;top=311;right=699;bottom=335;dl=0.65;dt=1;notify=1;transparent=1;z=114}; static19={cls="static";text="按键滑条5";left=473;top=191;right=540;bottom=215;dl=0.48;dt=1;notify=1;transparent=1;z=102}; -static2={cls="static";text="巡航";left=18;top=68;right=53;bottom=92;align="center";center=1;dl=0.02;dt=1;notify=1;transparent=1;z=86}; -static24={cls="static";text="X轴左1";left=483;top=283;right=537;bottom=307;dl=0.49;dt=1;notify=1;transparent=1;z=103}; -static25={cls="static";text="X轴左2";left=483;top=334;right=537;bottom=358;dl=0.49;dt=1;notify=1;transparent=1;z=104}; -static26={cls="static";text="X轴左3";left=482;top=385;right=536;bottom=409;dl=0.49;dt=1;notify=1;transparent=1;z=105}; -static27={cls="static";text="X轴左4";left=482;top=436;right=536;bottom=460;dl=0.49;dt=1;notify=1;transparent=1;z=106}; -static28={cls="static";text="X轴左5";left=482;top=484;right=536;bottom=508;dl=0.49;dt=1;notify=1;transparent=1;z=107}; -static29={cls="static";text="Y轴上1";left=675;top=281;right=729;bottom=305;dl=0.69;dt=1;notify=1;transparent=1;z=108}; -static3={cls="static";text="取消";left=18;top=111;right=53;bottom=135;align="center";center=1;dl=0.02;dt=1;notify=1;transparent=1;z=87}; -static30={cls="static";text="Y轴上2";left=675;top=341;right=729;bottom=365;dl=0.69;dt=1;notify=1;transparent=1;z=109}; -static31={cls="static";text="Y轴上3";left=675;top=402;right=729;bottom=426;dl=0.69;dt=1;notify=1;transparent=1;z=110}; -static34={cls="static";text="左板压力";left=124;top=535;right=178;bottom=559;dl=0.13;dt=1;notify=1;transparent=1;z=111}; -static35={cls="static";text="右板压力";left=580;top=531;right=634;bottom=555;dl=0.59;dt=1;notify=1;transparent=1;z=112}; +static2={cls="static";text="巡航";left=7;top=66;right=42;bottom=90;align="center";center=1;dl=0.01;dt=1;notify=1;transparent=1;z=86}; +static20={cls="static";text="左板状态";left=235;top=519;right=325;bottom=550;font=LOGFONT(h=-20);transparent=1;z=133}; +static21={cls="static";text="0";left=326;top=519;right=343;bottom=550;font=LOGFONT(h=-20);transparent=1;z=134}; +static22={cls="static";text="Y轴上1";left=645;top=261;right=699;bottom=285;dl=0.65;dt=1;notify=1;transparent=1;z=118}; +static23={cls="static";text="右板状态";left=654;top=505;right=744;bottom=536;font=LOGFONT(h=-20);transparent=1;z=135}; +static24={cls="static";text="X轴左1";left=471;top=262;right=525;bottom=286;dl=0.48;dt=1;notify=1;transparent=1;z=103}; +static25={cls="static";text="X轴左2";left=471;top=313;right=525;bottom=337;dl=0.48;dt=1;notify=1;transparent=1;z=104}; +static26={cls="static";text="X轴左3";left=470;top=364;right=524;bottom=388;dl=0.48;dt=1;notify=1;transparent=1;z=105}; +static27={cls="static";text="X轴左4";left=470;top=415;right=524;bottom=439;dl=0.48;dt=1;notify=1;transparent=1;z=106}; +static28={cls="static";text="X轴左5";left=470;top=463;right=524;bottom=487;dl=0.48;dt=1;notify=1;transparent=1;z=107}; +static29={cls="static";text="Y轴上3";left=645;top=367;right=699;bottom=391;dl=0.65;dt=1;notify=1;transparent=1;z=108}; +static3={cls="static";text="取消";left=7;top=109;right=42;bottom=133;align="center";center=1;dl=0.01;dt=1;notify=1;transparent=1;z=87}; +static30={cls="static";text="Y轴上4";left=645;top=416;right=699;bottom=440;dl=0.65;dt=1;notify=1;transparent=1;z=109}; +static31={cls="static";text="Y轴上5";left=645;top=463;right=699;bottom=487;dl=0.65;dt=1;notify=1;transparent=1;z=110}; +static32={cls="static";text="0";left=745;top=505;right=762;bottom=536;font=LOGFONT(h=-20);transparent=1;z=136}; +static34={cls="static";text="左板压力";left=52;top=538;right=106;bottom=562;dl=0.05;dt=1;notify=1;transparent=1;z=111}; +static35={cls="static";text="右板压力";left=480;top=532;right=534;bottom=556;dl=0.49;dt=1;notify=1;transparent=1;z=112}; +static37={cls="static";text="恢复2";left=216;top=29;right=256;bottom=53;align="center";center=1;dl=0.22;dt=1;notify=1;transparent=1;z=130}; +static38={cls="static";text="巡航2";left=216;top=72;right=256;bottom=96;align="center";center=1;dl=0.22;dt=1;notify=1;transparent=1;z=131}; +static39={cls="static";text="取消2";left=216;top=111;right=256;bottom=135;align="center";center=1;dl=0.22;dt=1;notify=1;transparent=1;z=132}; static4={cls="static";text="X轴右1";left=50;top=214;right=104;bottom=238;dl=0.05;dt=1;notify=1;transparent=1;z=88}; static5={cls="static";text="X轴右2";left=50;top=275;right=104;bottom=299;dl=0.05;dt=1;notify=1;transparent=1;z=89}; static6={cls="static";text="X轴右3";left=50;top=336;right=104;bottom=360;dl=0.05;dt=1;notify=1;transparent=1;z=90}; static7={cls="static";text="X轴右4";left=50;top=397;right=104;bottom=421;dl=0.05;dt=1;notify=1;transparent=1;z=91}; static8={cls="static";text="X轴右5";left=50;top=459;right=104;bottom=483;dl=0.05;dt=1;notify=1;transparent=1;z=92}; static9={cls="static";text="Y轴上1";left=227;top=213;right=281;bottom=237;dl=0.23;dt=1;notify=1;transparent=1;z=93}; -stlVal1_baseline={cls="static";text="0";left=67;top=16;right=121;bottom=48;dl=0.07;dt=1;font=LOGFONT(h=-16);transparent=1;z=35}; -stlVal1_signal={cls="static";text="0";left=174;top=16;right=228;bottom=48;dl=0.18;dt=1;font=LOGFONT(h=-16);transparent=1;z=1}; -stlVal2_baseline={cls="static";text="0";left=67;top=58;right=121;bottom=90;dl=0.07;dt=1;font=LOGFONT(h=-16);transparent=1;z=36}; -stlVal2_signal={cls="static";text="0";left=174;top=58;right=228;bottom=90;dl=0.18;dt=1;font=LOGFONT(h=-16);transparent=1;z=2}; -stlVal3_baseline={cls="static";text="0";left=67;top=99;right=121;bottom=131;dl=0.07;dt=1;font=LOGFONT(h=-16);transparent=1;z=37}; -stlVal3_signal={cls="static";text="0";left=174;top=99;right=228;bottom=131;dl=0.18;dt=1;font=LOGFONT(h=-16);transparent=1;z=3}; +stlVal1_baseline={cls="static";text="0";left=56;top=14;right=110;bottom=46;dl=0.06;dt=1;font=LOGFONT(h=-16);transparent=1;z=35}; +stlVal1_signal={cls="static";text="0";left=163;top=14;right=217;bottom=46;dl=0.17;dt=1;font=LOGFONT(h=-16);transparent=1;z=1}; +stlVal2_baseline={cls="static";text="0";left=56;top=56;right=110;bottom=88;dl=0.06;dt=1;font=LOGFONT(h=-16);transparent=1;z=36}; +stlVal2_signal={cls="static";text="0";left=163;top=56;right=217;bottom=88;dl=0.17;dt=1;font=LOGFONT(h=-16);transparent=1;z=2}; +stlVal3_baseline={cls="static";text="0";left=56;top=97;right=110;bottom=129;dl=0.06;dt=1;font=LOGFONT(h=-16);transparent=1;z=37}; +stlVal3_signal={cls="static";text="0";left=163;top=97;right=217;bottom=129;dl=0.17;dt=1;font=LOGFONT(h=-16);transparent=1;z=3}; +stlVal4_baseline={cls="static";text="0";left=259;top=16;right=313;bottom=48;dl=0.26;dt=1;font=LOGFONT(h=-16);transparent=1;z=127}; +stlVal4_signal={cls="static";text="0";left=366;top=16;right=420;bottom=48;dl=0.37;dt=1;font=LOGFONT(h=-16);transparent=1;z=121}; +stlVal5_baseline={cls="static";text="0";left=259;top=58;right=313;bottom=90;dl=0.26;dt=1;font=LOGFONT(h=-16);transparent=1;z=128}; +stlVal5_signal={cls="static";text="0";left=366;top=58;right=420;bottom=90;dl=0.37;dt=1;font=LOGFONT(h=-16);transparent=1;z=122}; +stlVal6_baseline={cls="static";text="0";left=259;top=100;right=310;bottom=132;dl=0.26;dt=1;font=LOGFONT(h=-16);transparent=1;z=129}; +stlVal6_signal={cls="static";text="0";left=366;top=99;right=420;bottom=131;dl=0.37;dt=1;font=LOGFONT(h=-16);transparent=1;z=123}; stl_X_Val1_baseline={cls="static";text="0";left=56;top=184;right=110;bottom=216;dl=0.06;dt=1;font=LOGFONT(h=-16);transparent=1;z=38}; stl_X_Val1_signal={cls="static";text="0";left=156;top=182;right=210;bottom=214;dl=0.16;dt=1;font=LOGFONT(h=-16);transparent=1;z=4}; stl_X_Val2_baseline={cls="static";text="0";left=56;top=244;right=110;bottom=276;dl=0.06;dt=1;font=LOGFONT(h=-16);transparent=1;z=39}; @@ -85,8 +107,8 @@ stl_Y_Val4_baseline={cls="static";text="0";left=232;top=365;right=286;bottom=397 stl_Y_Val4_signal={cls="static";text="0";left=345;top=367;right=399;bottom=399;dl=0.35;dt=1;font=LOGFONT(h=-16);transparent=1;z=55}; stl_Y_Val5_baseline={cls="static";text="0";left=232;top=427;right=286;bottom=459;dl=0.24;dt=1;font=LOGFONT(h=-16);transparent=1;z=43}; stl_Y_Val5_signal={cls="static";text="0";left=345;top=428;right=399;bottom=460;dl=0.35;dt=1;font=LOGFONT(h=-16);transparent=1;z=9}; -stl_press_baseline={cls="static";text="0";left=124;top=497;right=176;bottom=529;dl=0.13;dt=1;font=LOGFONT(h=-16);transparent=1;z=81}; -stl_press_signal={cls="static";text="0";left=217;top=496;right=271;bottom=528;align="right";dl=0.22;dt=1;font=LOGFONT(h=-16);transparent=1;z=79}; +stl_press_baseline={cls="static";text="0";left=52;top=500;right=104;bottom=532;dl=0.05;dt=1;font=LOGFONT(h=-16);transparent=1;z=81}; +stl_press_signal={cls="static";text="0";left=145;top=499;right=199;bottom=531;align="right";dl=0.15;dt=1;font=LOGFONT(h=-16);transparent=1;z=79}; strVal1_baseline={cls="static";text="0";left=548;top=2;right=602;bottom=34;dl=0.56;dt=1;font=LOGFONT(h=-16);notify=1;transparent=1;z=44}; strVal1_signal={cls="static";text="0";left=671;top=2;right=721;bottom=34;dl=0.68;dt=1;font=LOGFONT(h=-16);transparent=1;z=10}; strVal2_baseline={cls="static";text="0";left=548;top=45;right=602;bottom=77;dl=0.56;dt=1;font=LOGFONT(h=-16);transparent=1;z=45}; @@ -97,24 +119,28 @@ str_X_Val1_baseline={cls="static";text="0";left=548;top=132;right=602;bottom=164 str_X_Val1_signal={cls="static";text="0";left=671;top=132;right=721;bottom=164;dl=0.68;dt=1;font=LOGFONT(h=-16);notify=1;transparent=1;z=13}; str_X_Val2_baseline={cls="static";text="0";left=548;top=176;right=602;bottom=208;dl=0.56;dt=1;font=LOGFONT(h=-16);transparent=1;z=48}; str_X_Val2_signal={cls="static";text="0";left=671;top=176;right=721;bottom=208;dl=0.68;dt=1;font=LOGFONT(h=-16);transparent=1;z=14}; -str_X_Val3_baseline={cls="static";text="0";left=486;top=451;right=540;bottom=483;dl=0.49;dt=1;font=LOGFONT(h=-16);transparent=1;z=49}; -str_X_Val3_signal={cls="static";text="0";left=561;top=450;right=615;bottom=482;align="right";dl=0.57;dt=1;font=LOGFONT(h=-16);transparent=1;z=15}; -str_X_Val4_baseline={cls="static";text="0";left=486;top=402;right=540;bottom=434;dl=0.49;dt=1;font=LOGFONT(h=-16);transparent=1;z=50}; -str_X_Val4_signal={cls="static";text="0";left=561;top=401;right=615;bottom=433;align="right";dl=0.57;dt=1;font=LOGFONT(h=-16);transparent=1;z=16}; -str_X_Val5_baseline={cls="static";text="0";left=486;top=352;right=540;bottom=384;dl=0.49;dt=1;font=LOGFONT(h=-16);transparent=1;z=51}; -str_X_Val5_signal={cls="static";text="0";left=561;top=351;right=615;bottom=383;align="right";dl=0.57;dt=1;font=LOGFONT(h=-16);transparent=1;z=17}; -str_Y_Val1_baseline={cls="static";text="0";left=487;top=303;right=541;bottom=335;dl=0.49;dt=1;font=LOGFONT(h=-16);transparent=1;z=74}; -str_Y_Val1_signal={cls="static";text="0";left=562;top=302;right=616;bottom=334;align="right";dl=0.57;dt=1;font=LOGFONT(h=-16);transparent=1;z=64}; -str_Y_Val2_baseline={cls="static";text="0";left=487;top=251;right=541;bottom=283;dl=0.49;dt=1;font=LOGFONT(h=-16);transparent=1;z=75}; -str_Y_Val2_signal={cls="static";text="0";left=562;top=251;right=616;bottom=283;align="right";dl=0.57;dt=1;font=LOGFONT(h=-16);transparent=1;z=65}; -str_Y_Val3_baseline={cls="static";text="0";left=680;top=370;right=734;bottom=402;dl=0.69;dt=1;font=LOGFONT(h=-16);transparent=1;z=76}; -str_Y_Val3_signal={cls="static";text="0";left=756;top=371;right=810;bottom=403;align="right";dl=0.77;dt=1;font=LOGFONT(h=-16);transparent=1;z=66}; -str_Y_Val4_baseline={cls="static";text="0";left=680;top=310;right=734;bottom=342;dl=0.69;dt=1;font=LOGFONT(h=-16);transparent=1;z=77}; -str_Y_Val4_signal={cls="static";text="0";left=757;top=311;right=811;bottom=343;align="right";dl=0.77;dt=1;font=LOGFONT(h=-16);transparent=1;z=67}; -str_Y_Val5_baseline={cls="static";text="0";left=680;top=248;right=734;bottom=280;dl=0.69;dt=1;font=LOGFONT(h=-16);transparent=1;z=78}; -str_Y_Val5_signal={cls="static";text="0";left=757;top=249;right=811;bottom=281;align="right";dl=0.77;dt=1;font=LOGFONT(h=-16);transparent=1;z=68}; -str_press_baseline={cls="static";text="0";left=578;top=493;right=632;bottom=525;dl=0.59;dt=1;font=LOGFONT(h=-16);transparent=1;z=84}; -str_press_signal={cls="static";text="0";left=660;top=493;right=714;bottom=525;align="right";dl=0.67;dt=1;font=LOGFONT(h=-16);transparent=1;z=82} +str_X_Val3_baseline={cls="static";text="0";left=474;top=430;right=528;bottom=462;dl=0.48;dt=1;font=LOGFONT(h=-16);transparent=1;z=49}; +str_X_Val3_signal={cls="static";text="0";left=549;top=429;right=603;bottom=461;align="right";dl=0.56;dt=1;font=LOGFONT(h=-16);transparent=1;z=15}; +str_X_Val4_baseline={cls="static";text="0";left=474;top=381;right=528;bottom=413;dl=0.48;dt=1;font=LOGFONT(h=-16);transparent=1;z=50}; +str_X_Val4_signal={cls="static";text="0";left=549;top=380;right=603;bottom=412;align="right";dl=0.56;dt=1;font=LOGFONT(h=-16);transparent=1;z=16}; +str_X_Val5_baseline={cls="static";text="0";left=474;top=331;right=528;bottom=363;dl=0.48;dt=1;font=LOGFONT(h=-16);transparent=1;z=51}; +str_X_Val5_signal={cls="static";text="0";left=549;top=330;right=603;bottom=362;align="right";dl=0.56;dt=1;font=LOGFONT(h=-16);transparent=1;z=17}; +str_Y_Val1_baseline={cls="static";text="0";left=475;top=282;right=529;bottom=314;dl=0.48;dt=1;font=LOGFONT(h=-16);transparent=1;z=74}; +str_Y_Val1_signal={cls="static";text="0";left=550;top=281;right=604;bottom=313;align="right";dl=0.56;dt=1;font=LOGFONT(h=-16);transparent=1;z=64}; +str_Y_Val2_baseline={cls="static";text="0";left=475;top=230;right=529;bottom=262;dl=0.48;dt=1;font=LOGFONT(h=-16);transparent=1;z=75}; +str_Y_Val2_signal={cls="static";text="0";left=550;top=230;right=604;bottom=262;align="right";dl=0.56;dt=1;font=LOGFONT(h=-16);transparent=1;z=65}; +str_Y_Val3_baseline={cls="static";text="0";left=651;top=432;right=705;bottom=464;dl=0.66;dt=1;font=LOGFONT(h=-16);transparent=1;z=76}; +str_Y_Val3_signal={cls="static";text="0";left=726;top=432;right=780;bottom=464;align="right";dl=0.74;dt=1;font=LOGFONT(h=-16);transparent=1;z=66}; +str_Y_Val4_baseline={cls="static";text="0";left=651;top=383;right=705;bottom=415;dl=0.66;dt=1;font=LOGFONT(h=-16);transparent=1;z=77}; +str_Y_Val4_signal={cls="static";text="0";left=726;top=381;right=780;bottom=413;align="right";dl=0.74;dt=1;font=LOGFONT(h=-16);transparent=1;z=67}; +str_Y_Val5_baseline={cls="static";text="0";left=651;top=330;right=705;bottom=362;dl=0.66;dt=1;font=LOGFONT(h=-16);transparent=1;z=78}; +str_Y_Val5_signal={cls="static";text="0";left=726;top=330;right=780;bottom=362;align="right";dl=0.74;dt=1;font=LOGFONT(h=-16);transparent=1;z=68}; +str_Y_Val6_baseline={cls="static";text="0";left=651;top=279;right=705;bottom=311;dl=0.66;dt=1;font=LOGFONT(h=-16);transparent=1;z=116}; +str_Y_Val6_signal={cls="static";text="0";left=726;top=279;right=780;bottom=311;align="right";dl=0.74;dt=1;font=LOGFONT(h=-16);transparent=1;z=115}; +str_Y_Val7_baseline={cls="static";text="0";left=651;top=226;right=705;bottom=258;dl=0.66;dt=1;font=LOGFONT(h=-16);transparent=1;z=120}; +str_Y_Val7_signal={cls="static";text="0";left=726;top=228;right=780;bottom=260;align="right";dl=0.74;dt=1;font=LOGFONT(h=-16);transparent=1;z=119}; +str_press_baseline={cls="static";text="0";left=478;top=494;right=532;bottom=526;dl=0.49;dt=1;font=LOGFONT(h=-16);transparent=1;z=84}; +str_press_signal={cls="static";text="0";left=560;top=494;right=614;bottom=526;align="right";dl=0.57;dt=1;font=LOGFONT(h=-16);transparent=1;z=82} ) /*}}*/ @@ -177,6 +203,9 @@ SignalDisplay = function(){ winform.stlVal1_signal.text = lkey_signal[1]; winform.stlVal2_signal.text = lkey_signal[2]; winform.stlVal3_signal.text = lkey_signal[3]; + winform.stlVal4_signal.text = lkey_signal[14]; + winform.stlVal5_signal.text = lkey_signal[15]; + winform.stlVal6_signal.text = lkey_signal[16]; winform.stl_X_Val1_signal.text = lkey_signal[4]; winform.stl_X_Val2_signal.text = lkey_signal[5]; winform.stl_X_Val3_signal.text = lkey_signal[6]; @@ -199,6 +228,9 @@ SignalDisplay = function(){ winform.stlVal1_baseline.text = lkey_baseline[1]; winform.stlVal2_baseline.text = lkey_baseline[2]; winform.stlVal3_baseline.text = lkey_baseline[3]; + winform.stlVal4_baseline.text = lkey_baseline[14]; + winform.stlVal5_baseline.text = lkey_baseline[15]; + winform.stlVal6_baseline.text = lkey_baseline[16]; winform.stl_X_Val1_baseline.text = lkey_baseline[4]; winform.stl_X_Val2_baseline.text = lkey_baseline[5]; winform.stl_X_Val3_baseline.text = lkey_baseline[6]; @@ -225,6 +257,8 @@ SignalDisplay = function(){ winform.str_Y_Val3_signal.text = rkey_signal[11]; winform.str_Y_Val4_signal.text = rkey_signal[12]; winform.str_Y_Val5_signal.text = rkey_signal[13]; + winform.str_Y_Val6_signal.text = rkey_signal[14]; + winform.str_Y_Val7_signal.text = rkey_signal[15]; if(press_signal[2] > 0x7FF){ press_signal[2] = (press_signal[2]&0xFFF)-0x1000; @@ -247,6 +281,8 @@ SignalDisplay = function(){ winform.str_Y_Val3_baseline.text = rkey_baseline[11]; winform.str_Y_Val4_baseline.text = rkey_baseline[12]; winform.str_Y_Val5_baseline.text = rkey_baseline[13]; + winform.str_Y_Val6_baseline.text = rkey_baseline[14]; + winform.str_Y_Val7_baseline.text = rkey_baseline[15]; winform.str_press_baseline.text = press_baseline[2]; @@ -256,6 +292,9 @@ SignalDisplay = function(){ winform.pgl1.pos = lkey_signal[1]; winform.pgl2.pos = lkey_signal[2]; winform.pgl3.pos = lkey_signal[3]; + winform.pgl4.pos = lkey_signal[14]; + winform.pgl5.pos = lkey_signal[15]; + winform.pgl6.pos = lkey_signal[16]; winform.pgl_X1.pos = lkey_signal[4]; winform.pgl_X2.pos = lkey_signal[5]; winform.pgl_X3.pos = lkey_signal[6]; @@ -282,6 +321,8 @@ SignalDisplay = function(){ winform.pgr_Y3.pos = rkey_signal[11]; winform.pgr_Y4.pos = rkey_signal[12]; winform.pgr_Y5.pos = rkey_signal[13]; + winform.pgr_Y6.pos = rkey_signal[14]; + winform.pgr_Y7.pos = rkey_signal[15]; //winform.pgrp3.pos = rkey_signal[14]; @@ -299,6 +340,8 @@ SignalDisplay = function(){ winform.pgr_X5.pos = press[5]; winform.pgrp3.pos = press[6];*/ + winform.static21.text = pls; + winform.static32.text = prs; } var SignalTimer = win.timer(,50); @@ -376,6 +419,45 @@ subscribe("语言",function(conf){ SetConfig(conf); } ) +winform.button.oncommand = function(id,event){ + import win.clip + var str = ""; + str = str ++ winform.stlVal1_signal.text ++ '\n'; + str = str ++ winform.stlVal2_signal.text ++ '\n'; + str = str ++ winform.stlVal3_signal.text ++ '\n'; + str = str ++ winform.stl_X_Val1_signal.text ++ '\n'; + str = str ++ winform.stl_X_Val2_signal.text ++ '\n'; + str = str ++ winform.stl_X_Val3_signal.text ++ '\n'; + str = str ++ winform.stl_X_Val4_signal.text ++ '\n'; + str = str ++ winform.stl_X_Val5_signal.text ++ '\n'; + str = str ++ winform.stl_Y_Val1_signal.text ++ '\n'; + str = str ++ winform.stl_Y_Val2_signal.text ++ '\n'; + str = str ++ winform.stl_Y_Val3_signal.text ++ '\n'; + str = str ++ winform.stl_Y_Val4_signal.text ++ '\n'; + str = str ++ winform.stl_Y_Val5_signal.text; + win.clip.write(str); +} + +winform.button2.oncommand = function(id,event){ + import win.clip + var str = ""; + str = str ++ winform.strVal1_signal.text ++ '\n'; + str = str ++ winform.strVal2_signal.text ++ '\n'; + str = str ++ winform.strVal3_signal.text ++ '\n'; + str = str ++ winform.str_X_Val1_signal.text ++ '\n'; + str = str ++ winform.str_X_Val2_signal.text ++ '\n'; + str = str ++ winform.str_Y_Val2_signal.text ++ '\n'; + str = str ++ winform.str_Y_Val1_signal.text ++ '\n'; + str = str ++ winform.str_X_Val5_signal.text ++ '\n'; + str = str ++ winform.str_X_Val4_signal.text ++ '\n'; + str = str ++ winform.str_X_Val3_signal.text ++ '\n'; + str = str ++ winform.str_Y_Val5_signal.text ++ '\n'; + str = str ++ winform.str_Y_Val4_signal.text ++ '\n'; + str = str ++ winform.str_Y_Val3_signal.text ++ '\n'; + + + win.clip.write(str); +} winform.show(); win.loopMessage(); diff --git a/配置文件.ini b/配置文件.ini index 55e638c..7f5ee0e 100644 --- a/配置文件.ini +++ b/配置文件.ini @@ -1,60 +1,59 @@ [-ѹ2N] -key1=274 -key2=351 -key3=592 -=164 -=384 -=203 -=268 -OK=237 +key1=271 +key2=365 +key3=584 +=223 +=412 +=295 +=315 +OK=330 [-ѹ3N] -key1=499 -key2=559 -key3=906 -=272 -=620 -=335 -=422 -OK=351 +key1=494 +key2=581 +key3=894 +=370 +=666 +=487 +=496 +OK=488 [-ѹ4N] -key1=699 -key2=765 -key3=1121 -=416 -=831 -=478 -=584 -OK=510 +key1=692 +key2=795 +key3=1106 +=566 +=893 +=695 +=686 +OK=709 [Ҳ-ѹ2N] -key1=333 -key2=315 -key3=518 -=203 -=339 -=248 -=205 -OK=221 +key1=191 +key2=234 +key3=325 +=154 +=223 +=224 +=163 +OK=188 [Ҳ-ѹ3N] -key1=567 -key2=510 -key3=821 -=350 -=546 -=382 -=328 -OK=348 +key1=325 +key2=379 +key3=515 +=265 +=359 +=345 +=260 +OK=296 [Ҳ-ѹ4N] -key1=740 -key2=743 -key3=1040 -=541 -=747 -=542 -=458 -OK=472 - +key1=424 +key2=552 +key3=652 +=410 +=491 +=490 +=363 +OK=401 \ No newline at end of file