huahua/P417_host
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加waveid

Browse Source
This commit is contained in:
sunbeam 2023-09-05 13:31:04 +08:00
parent 6d2a0fc3e9
commit 004bbc5b25
7 changed files with 107 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CANThread/CAN_Msg.aardio
View File

@ -6,7 +6,7 @@ var msg_counter_arr = {}
TxTask = function(){//10ms task
for(k,v in thrdTable_TxTable.each()){
//console.log("k = " ++ k ++ "; v.id = " ++ v.id);
if(msg_counter_arr[v.id] != null){
if(msg_counter_arr[v.id] != null && v.period != 0){
msg_counter_arr[v.id] += 16;
if(msg_counter_arr[v.id] > v.period){
msg_counter_arr[v.id] = 0;

1
dlg/about.aardio
View File

@ -16,6 +16,7 @@ V2.4: 增加DAC周期写入功能
V2.5: 巡航等按键增加第二路信号显示，增加调试帧开关
V2.6: 修复右边2个按键信号和基线没显示数值问题
V2.7: 信号界面增加左右按下状态
V2.8: 增加显示错误信息
*/
winform.button.oncommand = function(id,event){

47
dlg/diagnostic.aardio
View File

@ -15,19 +15,21 @@ btnReadF195={cls="button";text="软件版本";left=133;top=298;right=222;bottom=
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=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};
btnWrite9001={cls="button";text="触发震动";left=42;top=373;right=157;bottom=403;ah=1;aw=1;z=24};
btnWrite9002={cls="button";text="写入参考电压";left=181;top=411;right=281;bottom=441;ah=1;aw=1;z=27};
btnWrite9003={cls="button";text="写入增益";left=180;top=449;right=281;bottom=479;ah=1;aw=1;z=28};
btnWrite9004={cls="button";text="写入周期";left=181;top=487;right=282;bottom=517;ah=1;aw=1;z=51};
btnWrite9005={cls="button";text="写入波形";left=181;top=528;right=282;bottom=558;ah=1;aw=1;z=57};
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};
button={cls="button";text="震动5次";left=175;top=372;right=282;bottom=402;ah=1;aw=1;z=55};
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=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};
cbbDacRef={cls="combobox";left=42;top=411;right=172;bottom=437;ah=1;aw=1;edge=1;font=LOGFONT(h=-18);items={};mode="dropdown";z=25};
cbbMotorGain={cls="combobox";left=42;top=449;right=172;bottom=475;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};
edDACPeriod={cls="edit";text="80";left=42;top=487;right=172;bottom=519;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};
@ -38,13 +40,15 @@ edPressTh5={cls="edit";text="500";left=531;top=254;right=605;bottom=281;ah=1;ali
edPressTh6={cls="edit";text="500";left=531;top=294;right=605;bottom=321;ah=1;align="center";aw=1;edge=1;font=LOGFONT(h=-18);num=1;z=41};
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};
edWaveID={cls="edit";text="0";left=42;top=528;right=149;bottom=560;ah=1;align="center";aw=1;edge=1;font=LOGFONT(h=-18);multiline=1;num=1;z=56};
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=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};
groupbox3={cls="groupbox";text="震动";left=20;top=351;right=329;bottom=580;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};
rbTouchTh={cls="radiobutton";text="触摸";left=529;top=35;right=595;bottom=61;ah=1;aw=1;bgcolor=16777215;z=16};
spin={cls="spin";left=152;top=527;right=172;bottom=558;z=58};
static={cls="static";text="按键";left=445;top=67;right=500;bottom=96;ah=1;aw=1;font=LOGFONT(h=-18);transparent=1;z=13};
static10={cls="static";text="OK";left=420;top=371;right=521;bottom=398;center=1;font=LOGFONT(h=-18);transparent=1;z=36};
static11={cls="static";text="系数";left=411;top=463;right=449;bottom=490;center=1;font=LOGFONT(h=-18);transparent=1;z=45};
@ -298,6 +302,33 @@ winform.btnRead7022.oncommand = function(id,event){
win.delay(20,1);
CT_Diag22(0x7022);
}
import win.timer;
timer1s = win.timer(winform,1000);
timer1s.onTimer = function(){
//win.delay(20,1);
CT_Diag2EVal1B(0x9001,0x01);
}
timer1s.onEnd = function(){
//Display("5次震动完成")
}
winform.button.oncommand = function(id,event){
CT_Diag10(0x03);
win.delay(20,10);
timer1s.enable(1000,5)
}
winform.btnWrite9005.oncommand = function(id,event){
CT_Diag10(0x03);
win.delay(20,1);
var val = tonumber(winform.edWaveID.text);
CT_Diag2EVal1B(0x9005,val);
}
winform.spin.buddy = winform.edWaveID;
winform.spin.setRange(0,14); //一定要设置数值的上下限
winform.spin.pos = 0;//设置数值
winform.spin.inc = 1;//设置每次点击箭头的增减量（步长）
winform.group();

25
dlg/msg.aardio
View File

@ -21,8 +21,16 @@ for(i=1;16;1){
lkey_baseline_data[i] = {};
rkey_baseline_data[i] = {};
}
LeftVibrationFault = 0;
LeftTouchFault = 0;
LeftPressSensorFault = 0;
LeftCommonFault = 0;
RightVibrationFault = 0;
RightTouchFault = 0;
RightPressSensorFault = 0;
RightCommonFault = 0;
keyL1 = 0;
keyL2 = 0;
keyL3 = 0;
@ -61,7 +69,8 @@ getbitdata = function(byte,startbit,len){
import win.timer;
MsgProTable = {0x300,0x305,0x307,0x309,
0x400,0x401,0x402,0x403,0x404,0x405,0x406,0x407,0x408,
0x410,0x411,0x412,0x413,0x414,0x415,0x416,0x417,0x418};
0x410,0x411,0x412,0x413,0x414,0x415,0x416,0x417,0x418,
0x34,0x38};
MsgProTimer = win.timer(,100);
MsgProTimer.onTimer = function(){
for(k,v in MsgProTable){
@ -305,6 +314,18 @@ MsgPro = function(id,data){
rkey_baseline[16]=rkey_baseline_data[16];
rkey_signal[16]=rkey_signal_data[16];
}
case 0x34 {
LeftVibrationFault = getbitdata(data[1],0,2);
LeftTouchFault = getbitdata(data[1],2,2);
LeftPressSensorFault = getbitdata(data[1],4,3);
LeftCommonFault = getbitdata(data[1],7,1);
}
case 0x38 {
RightVibrationFault = getbitdata(data[1],0,2);
RightTouchFault = getbitdata(data[1],2,2);
RightPressSensorFault = getbitdata(data[1],4,3);
RightCommonFault = getbitdata(data[1],7,1);
}
else {
}
}

2
dlg/setting.aardio
View File

@ -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.7 20230616";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.8 20230818";left=745;top=4;right=981;bottom=35;align="right";font=LOGFONT(h=-22);notify=1;transparent=1;z=4}
)
/*}}*/

40
dlg/show.aardio
View File

@ -6,8 +6,9 @@ show = win.form(text="P417上位机";right=984;bottom=602;bgcolor=16777215;borde
show.add(
bkplus={cls="bkplus";left=49;top=93;right=880;bottom=372;ah=1;aw=1;background="\res\P417.png";z=1};
button={cls="button";text="Button";left=381;top=425;right=507;bottom=451;hide=1;z=31};
checkbox={cls="checkbox";text="点亮";left=112;top=31;right=198;bottom=68;ah=1;aw=1;bgcolor=16777215;font=LOGFONT(h=-22);z=3};
checkbox2={cls="checkbox";text="白天";left=208;top=32;right=294;bottom=69;ah=1;aw=1;bgcolor=16777215;checked=1;font=LOGFONT(h=-22);z=20};
checkbox={cls="checkbox";text="点亮";left=112;top=31;right=198;bottom=68;ah=1;aw=1;bgcolor=16777215;checked=1;font=LOGFONT(h=-22);z=3};
checkbox2={cls="checkbox";text="白天";left=208;top=32;right=294;bottom=69;ah=1;aw=1;bgcolor=16777215;font=LOGFONT(h=-22);z=20};
checkbox3={cls="checkbox";text="发送";left=20;top=30;right=106;bottom=67;ah=1;aw=1;bgcolor=16777215;checked=1;font=LOGFONT(h=-22);z=42};
plLeft={cls="plus";left=103;top=129;right=334;bottom=331;ah=1;aw=1;border={color=-7114533;width=1};z=2};
plRight={cls="plus";left=596;top=131;right=827;bottom=333;ah=1;aw=1;border={color=-7114533;width=1};z=26};
stDebug={cls="static";text="Static";left=378;top=465;right=493;bottom=492;hide=1;transparent=1;z=27};
@ -28,8 +29,16 @@ stKeyRleft={cls="static";text="Static";left=904;top=247;right=929;bottom=272;ah=
stKeyRok={cls="static";text="Static";left=904;top=322;right=929;bottom=347;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=16};
stKeyRright={cls="static";text="Static";left=904;top=285;right=929;bottom=310;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=19};
stKeyRup={cls="static";text="Static";left=904;top=172;right=929;bottom=197;ah=1;align="center";aw=1;bgcolor=65280;center=1;hide=1;z=15};
stLeftCommonFaullt={cls="static";text="0";left=190;top=531;right=212;bottom=556;font=LOGFONT(h=-18);transparent=1;z=37};
stLeftPF={cls="static";text="0";left=190;top=476;right=213;bottom=501;font=LOGFONT(h=-18);transparent=1;z=35};
stLeftTF={cls="static";text="0";left=190;top=449;right=214;bottom=474;font=LOGFONT(h=-18);transparent=1;z=34};
stLeftVF={cls="static";text="0";left=190;top=503;right=214;bottom=528;font=LOGFONT(h=-18);transparent=1;z=36};
stLocl={cls="static";left=180;top=225;right=192;bottom=237;bgcolor=255;color=255;font=LOGFONT(name='FontAwesome');z=29};
stLocr={cls="static";left=790;top=226;right=802;bottom=238;bgcolor=255;color=255;font=LOGFONT(name='FontAwesome');z=30};
stRightCommonFaullt={cls="static";text="0";left=722;top=538;right=746;bottom=563;font=LOGFONT(h=-18);transparent=1;z=41};
stRightPF={cls="static";text="0";left=722;top=483;right=746;bottom=508;font=LOGFONT(h=-18);transparent=1;z=39};
stRightTF={cls="static";text="0";left=722;top=456;right=746;bottom=481;font=LOGFONT(h=-18);transparent=1;z=38};
stRightVF={cls="static";text="0";left=722;top=510;right=746;bottom=535;font=LOGFONT(h=-18);transparent=1;z=40};
stZBl={cls="static";text="坐标";left=4;top=384;right=424;bottom=432;align="center";center=1;font=LOGFONT(h=-30);transparent=1;z=24};
stZBr={cls="static";text="坐标";left=481;top=384;right=901;bottom=432;align="center";center=1;font=LOGFONT(h=-30);transparent=1;z=25};
static2={cls="static";text="亮度：";left=348;top=30;right=420;bottom=69;ah=1;align="center";aw=1;center=1;font=LOGFONT(h=-22);transparent=1;z=23};
@ -86,6 +95,15 @@ DisplayKey = function(){
show.stKeyRright.text = keyRright;
show.stKeyRok.text = keyRok;
*/
show.stLeftTF.text = LeftTouchFault;
show.stLeftVF.text = LeftVibrationFault;
show.stLeftPF.text = LeftPressSensorFault;
show.stLeftCommonFaullt.text = LeftCommonFault;
show.stRightTF.text = RightTouchFault;
show.stRightVF.text = RightVibrationFault;
show.stRightPF.text = RightPressSensorFault;
show.stRightCommonFaullt.text = LeftTouchFault;
Displayl("get 0x300 (" + plx + ',' + ply + ') status:' + pls);
if((plx == 0)&&(ply == 0))
{
@ -253,6 +271,24 @@ show.wndproc = function(hwnd,message,wparam,lparam){
//无返回值则继续调用默认回调函数
}
show.checkbox3.oncommand = function(id,event){
if(show.checkbox3.checked){
CT_UpdateCANTxMsg(0x30,200,txdata);
show.checkbox.disabled = false;
show.checkbox2.disabled = false;
show.trackbar.disabled = false;
}
else {
CT_UpdateCANTxMsg(0x30,0,txdata);
show.checkbox.disabled = true;
show.checkbox2.disabled = true;
show.trackbar.disabled = true;
}
}
show.show();
FreshPos();
return win.loopMessage();

8
dlg/switch.aardio
View File

@ -3,10 +3,10 @@ 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;z=137};
button2={cls="button";text="信号";left=656;top=547;right=703;bottom=581;z=138};
button3={cls="button";text="基线";left=183;top=564;right=230;bottom=598;z=139};
button4={cls="button";text="基线";left=605;top=546;right=652;bottom=580;z=140};
button={cls="button";text="信号";left=238;top=563;right=285;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};
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};
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};