diff --git a/default.aproj b/default.aproj index 9c72f9a..be8e075 100644 --- a/default.aproj +++ b/default.aproj @@ -1,5 +1,5 @@  - + diff --git a/dlg/about.aardio b/dlg/about.aardio index 8548194..e244ed2 100644 --- a/dlg/about.aardio +++ b/dlg/about.aardio @@ -18,6 +18,7 @@ V2.6: 修复右边2个按键信号和基线没显示数值问题 V2.7: 信号界面增加左右按下状态 V2.8: 增加显示错误信息 v2.9: 修复诊断错误信号关联错误;增加读取振动参数;增加自动重连功能 +v2.10: 产品信号改为raw值 */ winform.button.oncommand = function(id,event){ diff --git a/dlg/msg.aardio b/dlg/msg.aardio index eb8b99a..b81b8e2 100644 --- a/dlg/msg.aardio +++ b/dlg/msg.aardio @@ -143,80 +143,80 @@ MsgPro = function(id,data){ } case 0x401 { //console.log(1); - lkey_baseline_data[1] = data[1] + ((data[2]&0x0f)<<8); - lkey_signal_data[1] = data[3] + ((data[4]&0x0f)<<8); - lkey_baseline_data[2] = data[5] + ((data[6]&0x0f)<<8); - lkey_signal_data[2] = data[7] + ((data[8]&0x0f)<<8); + lkey_baseline_data[1] = data[1] + ((data[2]&0xff)<<8); + lkey_signal_data[1] = data[3] + ((data[4]&0xff)<<8) - lkey_baseline_data[1]; + lkey_baseline_data[2] = data[5] + ((data[6]&0xff)<<8); + lkey_signal_data[2] = data[7] + ((data[8]&0xff)<<8) - lkey_baseline_data[2]; lkey_baseline[1]=lkey_baseline_data[1]; lkey_signal[1]=lkey_signal_data[1]; lkey_baseline[2]=lkey_baseline_data[2]; lkey_signal[2]=lkey_signal_data[2]; } case 0x402 { - lkey_baseline_data[3] = data[1] + ((data[2]&0x0f)<<8); - lkey_signal_data[3] = data[3] + ((data[4]&0x0f)<<8); - lkey_baseline_data[4] = data[5] + ((data[6]&0x0f)<<8); - lkey_signal_data[4] = data[7] + ((data[8]&0x0f)<<8); + lkey_baseline_data[3] = data[1] + ((data[2]&0xff)<<8); + lkey_signal_data[3] = data[3] + ((data[4]&0xff)<<8) - lkey_baseline_data[3]; + lkey_baseline_data[4] = data[5] + ((data[6]&0xff)<<8); + lkey_signal_data[4] = data[7] + ((data[8]&0xff)<<8) - lkey_baseline_data[4]; lkey_baseline[3]=lkey_baseline_data[3]; lkey_signal[3]=lkey_signal_data[3]; lkey_baseline[4]=lkey_baseline_data[4]; lkey_signal[4]=lkey_signal_data[4]; } case 0x403 { - lkey_baseline_data[5] = data[1] + ((data[2]&0x0f)<<8); - lkey_signal_data[5] = data[3] + ((data[4]&0x0f)<<8); - lkey_baseline_data[6] = data[5] + ((data[6]&0x0f)<<8); - lkey_signal_data[6] = data[7] + ((data[8]&0x0f)<<8); + lkey_baseline_data[5] = data[1] + ((data[2]&0xff)<<8); + lkey_signal_data[5] = data[3] + ((data[4]&0xff)<<8) - lkey_baseline_data[5]; + lkey_baseline_data[6] = data[5] + ((data[6]&0xff)<<8); + lkey_signal_data[6] = data[7] + ((data[8]&0xff)<<8) - lkey_baseline_data[6]; lkey_baseline[5]=lkey_baseline_data[5]; lkey_signal[5]=lkey_signal_data[5]; lkey_baseline[6]=lkey_baseline_data[6]; lkey_signal[6]=lkey_signal_data[6]; } case 0x404 { - lkey_baseline_data[7] = data[1] + ((data[2]&0x0f)<<8); - lkey_signal_data[7] = data[3] + ((data[4]&0x0f)<<8); - lkey_baseline_data[8] = data[5] + ((data[6]&0x0f)<<8); - lkey_signal_data[8] = data[7] + ((data[8]&0x0f)<<8); + lkey_baseline_data[7] = data[1] + ((data[2]&0xff)<<8); + lkey_signal_data[7] = data[3] + ((data[4]&0xff)<<8) - lkey_baseline_data[7]; + lkey_baseline_data[8] = data[5] + ((data[6]&0xff)<<8); + lkey_signal_data[8] = data[7] + ((data[8]&0xff)<<8) - lkey_baseline_data[8]; lkey_baseline[7]=lkey_baseline_data[7]; lkey_signal[7]=lkey_signal_data[7]; lkey_baseline[8]=lkey_baseline_data[8]; lkey_signal[8]=lkey_signal_data[8]; } case 0x405 { - lkey_baseline_data[9] = data[1] + ((data[2]&0x0f)<<8); - lkey_signal_data[9] = data[3] + ((data[4]&0x0f)<<8); - lkey_baseline_data[10] = data[5] + ((data[6]&0x0f)<<8); - lkey_signal_data[10] = data[7] + ((data[8]&0x0f)<<8); + lkey_baseline_data[9] = data[1] + ((data[2]&0xff)<<8); + lkey_signal_data[9] = data[3] + ((data[4]&0xff)<<8) - lkey_baseline_data[9]; + lkey_baseline_data[10] = data[5] + ((data[6]&0xff)<<8); + lkey_signal_data[10] = data[7] + ((data[8]&0xff)<<8) - lkey_baseline_data[10]; lkey_baseline[9]=lkey_baseline_data[9]; lkey_signal[9]=lkey_signal_data[9]; lkey_baseline[10]=lkey_baseline_data[10]; lkey_signal[10]=lkey_signal_data[10]; } case 0x406 { - lkey_baseline_data[11] = data[1] + ((data[2]&0x0f)<<8); - lkey_signal_data[11] = data[3] + ((data[4]&0x0f)<<8); - lkey_baseline_data[12] = data[5] + ((data[6]&0x0f)<<8); - lkey_signal_data[12] = data[7] + ((data[8]&0x0f)<<8); + lkey_baseline_data[11] = data[1] + ((data[2]&0xff)<<8); + lkey_signal_data[11] = data[3] + ((data[4]&0xff)<<8) - lkey_baseline_data[11]; + lkey_baseline_data[12] = data[5] + ((data[6]&0xff)<<8); + lkey_signal_data[12] = data[7] + ((data[8]&0xff)<<8) - lkey_baseline_data[12]; lkey_baseline[11]=lkey_baseline_data[11]; lkey_signal[11]=lkey_signal_data[11]; lkey_baseline[12]=lkey_baseline_data[12]; lkey_signal[12]=lkey_signal_data[12]; } case 0x407 { - lkey_baseline_data[13] = data[1] + ((data[2]&0x0f)<<8); - lkey_signal_data[13] = data[3] + ((data[4]&0x0f)<<8); - lkey_baseline_data[14] = data[5] + ((data[6]&0x0f)<<8); - lkey_signal_data[14] = data[7] + ((data[8]&0x0f)<<8); + lkey_baseline_data[13] = data[1] + ((data[2]&0xff)<<8); + lkey_signal_data[13] = data[3] + ((data[4]&0xff)<<8) - lkey_baseline_data[13]; + lkey_baseline_data[14] = data[5] + ((data[6]&0xff)<<8); + lkey_signal_data[14] = data[7] + ((data[8]&0xff)<<8) - lkey_baseline_data[14]; lkey_baseline[13]=lkey_baseline_data[13]; lkey_signal[13]=lkey_signal_data[13]; lkey_baseline[14]=lkey_baseline_data[14]; lkey_signal[14]=lkey_signal_data[14]; } case 0x408 { - lkey_baseline_data[15] = data[1] + ((data[2]&0x0f)<<8); - lkey_signal_data[15] = data[3] + ((data[4]&0x0f)<<8); - lkey_baseline_data[16] = data[5] + ((data[6]&0x0f)<<8); - lkey_signal_data[16] = data[7] + ((data[8]&0x0f)<<8); + lkey_baseline_data[15] = data[1] + ((data[2]&0xff)<<8); + lkey_signal_data[15] = data[3] + ((data[4]&0xff)<<8) - lkey_baseline_data[15]; + lkey_baseline_data[16] = data[5] + ((data[6]&0xff)<<8); + lkey_signal_data[16] = data[7] + ((data[8]&0xff)<<8) - lkey_baseline_data[16]; lkey_baseline[15]=lkey_baseline_data[15]; lkey_signal[15]=lkey_signal_data[15]; lkey_baseline[16]=lkey_baseline_data[16]; @@ -235,80 +235,80 @@ MsgPro = function(id,data){ } } case 0x411 { - rkey_baseline_data[1] = data[1] + ((data[2]&0x0f)<<8); - rkey_signal_data[1] = data[3] + ((data[4]&0x0f)<<8); - rkey_baseline_data[2] = data[5] + ((data[6]&0x0f)<<8); - rkey_signal_data[2] = data[7] + ((data[8]&0x0f)<<8); + rkey_baseline_data[1] = data[1] + ((data[2]&0xff)<<8); + rkey_signal_data[1] = data[3] + ((data[4]&0xff)<<8) - rkey_baseline_data[1]; + rkey_baseline_data[2] = data[5] + ((data[6]&0xff)<<8); + rkey_signal_data[2] = data[7] + ((data[8]&0xff)<<8) - rkey_baseline_data[2]; rkey_baseline[1]=rkey_baseline_data[1]; rkey_signal[1]=rkey_signal_data[1]; rkey_baseline[2]=rkey_baseline_data[2]; rkey_signal[2]=rkey_signal_data[2]; } case 0x412 { - rkey_baseline_data[3] = data[1] + ((data[2]&0x0f)<<8); - rkey_baseline_data[4] = data[3] + ((data[4]&0x0f)<<8); - rkey_signal_data[3] = data[5] + ((data[6]&0x0f)<<8); - rkey_signal_data[4] = data[7] + ((data[8]&0x0f)<<8); + rkey_baseline_data[3] = data[1] + ((data[2]&0xff)<<8); + rkey_baseline_data[4] = data[3] + ((data[4]&0xff)<<8); + rkey_signal_data[3] = data[5] + ((data[6]&0xff)<<8) - rkey_baseline_data[3]; + rkey_signal_data[4] = data[7] + ((data[8]&0xff)<<8) - rkey_baseline_data[4]; rkey_baseline[3]=rkey_baseline_data[3]; rkey_signal[3]=rkey_signal_data[3]; rkey_baseline[4]=rkey_baseline_data[4]; rkey_signal[4]=rkey_signal_data[4]; } case 0x413 { - rkey_baseline_data[5] = data[1] + ((data[2]&0x0f)<<8); - rkey_baseline_data[6] = data[3] + ((data[4]&0x0f)<<8); - rkey_signal_data[5] = data[5] + ((data[6]&0x0f)<<8); - rkey_signal_data[6] = data[7] + ((data[8]&0x0f)<<8); + rkey_baseline_data[5] = data[1] + ((data[2]&0xff)<<8); + rkey_baseline_data[6] = data[3] + ((data[4]&0xff)<<8); + rkey_signal_data[5] = data[5] + ((data[6]&0xff)<<8) - rkey_baseline_data[5]; + rkey_signal_data[6] = data[7] + ((data[8]&0xff)<<8) - rkey_baseline_data[6]; rkey_baseline[5]=rkey_baseline_data[5]; rkey_signal[5]=rkey_signal_data[5]; rkey_baseline[6]=rkey_baseline_data[6]; rkey_signal[6]=rkey_signal_data[6]; } case 0x414 { - rkey_baseline_data[7] = data[1] + ((data[2]&0x0f)<<8); - rkey_baseline_data[8] = data[3] + ((data[4]&0x0f)<<8); - rkey_signal_data[7] = data[5] + ((data[6]&0x0f)<<8); - rkey_signal_data[8] = data[7] + ((data[8]&0x0f)<<8); + rkey_baseline_data[7] = data[1] + ((data[2]&0xff)<<8); + rkey_baseline_data[8] = data[3] + ((data[4]&0xff)<<8); + rkey_signal_data[7] = data[5] + ((data[6]&0xff)<<8) - rkey_baseline_data[7]; + rkey_signal_data[8] = data[7] + ((data[8]&0xff)<<8) - rkey_baseline_data[8]; rkey_baseline[7]=rkey_baseline_data[7]; rkey_signal[7]=rkey_signal_data[7]; rkey_baseline[8]=rkey_baseline_data[8]; rkey_signal[8]=rkey_signal_data[8]; } case 0x415 { - rkey_baseline_data[9] = data[1] + ((data[2]&0x0f)<<8); - rkey_baseline_data[10] = data[3] + ((data[4]&0x0f)<<8); - rkey_signal_data[9] = data[5] + ((data[6]&0x0f)<<8); - rkey_signal_data[10] = data[7] + ((data[8]&0x0f)<<8); + rkey_baseline_data[9] = data[1] + ((data[2]&0xff)<<8); + rkey_baseline_data[10] = data[3] + ((data[4]&0xff)<<8); + rkey_signal_data[9] = data[5] + ((data[6]&0xff)<<8) - rkey_baseline_data[9]; + rkey_signal_data[10] = data[7] + ((data[8]&0xff)<<8) - rkey_baseline_data[10]; rkey_baseline[9]=rkey_baseline_data[9]; rkey_signal[9]=rkey_signal_data[9]; rkey_baseline[10]=rkey_baseline_data[10]; rkey_signal[10]=rkey_signal_data[10]; } case 0x416 { - rkey_baseline_data[11] = data[1] + ((data[2]&0x0f)<<8); - rkey_baseline_data[12] = data[3] + ((data[4]&0x0f)<<8); - rkey_signal_data[11] = data[5] + ((data[6]&0x0f)<<8); - rkey_signal_data[12] = data[7] + ((data[8]&0x0f)<<8); + rkey_baseline_data[11] = data[1] + ((data[2]&0xff)<<8); + rkey_baseline_data[12] = data[3] + ((data[4]&0xff)<<8); + rkey_signal_data[11] = data[5] + ((data[6]&0xff)<<8) - rkey_baseline_data[11]; + rkey_signal_data[12] = data[7] + ((data[8]&0xff)<<8) - rkey_baseline_data[12]; rkey_baseline[11]=rkey_baseline_data[11]; rkey_signal[11]=rkey_signal_data[11]; rkey_baseline[12]=rkey_baseline_data[12]; rkey_signal[12]=rkey_signal_data[12]; } case 0x417 { - rkey_baseline_data[13] = data[1] + ((data[2]&0x0f)<<8); - rkey_baseline_data[14] = data[3] + ((data[4]&0x0f)<<8); - rkey_signal_data[13] = data[5] + ((data[6]&0x0f)<<8); - rkey_signal_data[14] = data[7] + ((data[8]&0x0f)<<8); + rkey_baseline_data[13] = data[1] + ((data[2]&0xff)<<8); + rkey_baseline_data[14] = data[3] + ((data[4]&0xff)<<8); + rkey_signal_data[13] = data[5] + ((data[6]&0xff)<<8) - rkey_baseline_data[13]; + rkey_signal_data[14] = data[7] + ((data[8]&0xff)<<8) - rkey_baseline_data[14]; rkey_baseline[13]=rkey_baseline_data[13]; rkey_signal[13]=rkey_signal_data[13]; rkey_baseline[14]=rkey_baseline_data[14]; rkey_signal[14]=rkey_signal_data[14]; } case 0x418 { - rkey_baseline_data[15] = data[1] + ((data[2]&0x0f)<<8); - rkey_baseline_data[16] = data[3] + ((data[4]&0x0f)<<8); - rkey_signal_data[15] = data[5] + ((data[6]&0x0f)<<8); - rkey_signal_data[16] = data[7] + ((data[8]&0x0f)<<8); + rkey_baseline_data[15] = data[1] + ((data[2]&0xff)<<8); + rkey_baseline_data[16] = data[3] + ((data[4]&0xff)<<8); + rkey_signal_data[15] = data[5] + ((data[6]&0xff)<<8) - rkey_baseline_data[15]; + rkey_signal_data[16] = data[7] + ((data[8]&0xff)<<8) - rkey_baseline_data[16]; rkey_baseline[15]=rkey_baseline_data[15]; rkey_signal[15]=rkey_signal_data[15]; rkey_baseline[16]=rkey_baseline_data[16]; diff --git a/dlg/setting.aardio b/dlg/setting.aardio index 546a4a1..0c9758f 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.9 20240304";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.10 20240705";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 12344fb..5fad31c 100644 --- a/dlg/switch.aardio +++ b/dlg/switch.aardio @@ -3,9 +3,9 @@ import fonts.fontAwesome; /*DSG{{*/ var winform = win.form(text="wubiLex - 帮助";right=984;bottom=607;bgcolor=16777215;style=33554432) winform.add( -button={cls="button";text="信号";left=238;top=563;right=285;bottom=597;hide=1;z=137}; +button={cls="button";text="信号";left=98;top=563;right=145;bottom=597;hide=1;z=137}; button2={cls="button";text="信号";left=656;top=547;right=703;bottom=581;hide=1;z=138}; -button3={cls="button";text="基线";left=183;top=564;right=230;bottom=598;hide=1;z=139}; +button3={cls="button";text="基线";left=44;top=563;right=91;bottom=597;hide=1;z=139}; button4={cls="button";text="基线";left=605;top=546;right=652;bottom=580;hide=1;z=140}; 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}; @@ -52,8 +52,8 @@ static17={cls="static";text="按键滑条4";left=473;top=148;right=540;bottom=17 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=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}; +static20={cls="static";text="左板状态";left=240;top=504;right=330;bottom=535;font=LOGFONT(h=-20);transparent=1;z=133}; +static21={cls="static";text="0";left=330;top=506;right=347;bottom=537;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}; @@ -66,12 +66,18 @@ static3={cls="static";text="取消";left=7;top=109;right=42;bottom=133;align="ce 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}; +static33={cls="static";text="恢复";left=177;top=548;right=267;bottom=579;font=LOGFONT(h=-20);notify=1;transparent=1;z=141}; 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}; +static36={cls="static";text="0";left=227;top=548;right=244;bottom=579;font=LOGFONT(h=-20);transparent=1;z=142}; 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}; +static40={cls="static";text="巡航";left=269;top=548;right=359;bottom=579;font=LOGFONT(h=-20);notify=1;transparent=1;z=143}; +static41={cls="static";text="0";left=319;top=548;right=336;bottom=579;font=LOGFONT(h=-20);transparent=1;z=144}; +static42={cls="static";text="取消";left=360;top=548;right=450;bottom=579;font=LOGFONT(h=-20);notify=1;transparent=1;z=145}; +static43={cls="static";text="0";left=410;top=548;right=427;bottom=579;font=LOGFONT(h=-20);transparent=1;z=146}; 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}; @@ -344,6 +350,9 @@ SignalDisplay = function(){ winform.static21.text = pls; winform.static32.text = prs; + winform.static36.text = keyL1; + winform.static41.text = keyL2; + winform.static43.text = keyL3; } var SignalTimer = win.timer(,50); @@ -510,6 +519,7 @@ winform.button4.oncommand = function(id,event){ win.clip.write(str); } + winform.show(); win.loopMessage(); return winform; \ No newline at end of file