diff --git a/default.aproj b/default.aproj index 5331824..d45c856 100644 --- a/default.aproj +++ b/default.aproj @@ -3,7 +3,8 @@ - + + diff --git a/dlg/show.aardio b/dlg/show.aardio index 8df1f61..33b9dea 100644 --- a/dlg/show.aardio +++ b/dlg/show.aardio @@ -5,54 +5,31 @@ import console; /*DSG{{*/ show = win.form(text="P417上位机";right=984;bottom=602;bgcolor=16777215;border="dialog frame";style=33554432) show.add( -["AntdUI.button"]={cls="AntdUI.button";text="按摩";left=433;top=21;right=514;bottom=96;bgcolor=65280;z=47}; -btn_Fan={cls="AntdUI.button";text="通风";left=81;top=506;right=162;bottom=581;bgcolor=65280;z=38}; -btn_HG_F={cls="AntdUI.button";text="滑轨前";left=25;top=212;right=106;bottom=287;bgcolor=65280;z=5}; -btn_HG_R={cls="AntdUI.button";text="滑轨后";left=317;top=213;right=398;bottom=288;bgcolor=65280;z=6}; -btn_Heat={cls="AntdUI.button";text="加热";left=207;top=508;right=288;bottom=583;bgcolor=65280;z=39}; -btn_KB_F={cls="AntdUI.button";text="靠背前";left=71;top=26;right=152;bottom=101;bgcolor=65280;z=1}; -btn_KB_R={cls="AntdUI.button";text="靠背后";left=257;top=26;right=338;bottom=101;bgcolor=65280;z=2}; -btn_Massage={cls="AntdUI.button";text="按摩";left=433;top=21;right=514;bottom=96;bgcolor=65280;z=47}; -btn_Reset={cls="AntdUI.button";text="标定";left=414;top=508;right=495;bottom=583;bgcolor=65280;z=46}; -btn_SET={cls="AntdUI.button";text="M";left=23;top=404;right=104;bottom=479;bgcolor=65280;z=42}; -btn_SET_1={cls="AntdUI.button";text="1";left=119;top=403;right=200;bottom=478;bgcolor=65280;z=43}; -btn_SET_2={cls="AntdUI.button";text="2";left=216;top=406;right=297;bottom=481;bgcolor=65280;z=44}; -btn_SET_3={cls="AntdUI.button";text="3";left=315;top=406;right=396;bottom=481;bgcolor=65280;z=45}; -btn_TT_F={cls="AntdUI.button";text="腿托上";left=95;top=127;right=176;bottom=202;bgcolor=65280;z=7}; -btn_TT_R={cls="AntdUI.button";text="腿托下";left=82;top=297;right=163;bottom=372;bgcolor=65280;z=8}; -btn_ZY_D={cls="AntdUI.button";text="座椅下";left=226;top=297;right=307;bottom=372;bgcolor=65280;z=4}; -btn_ZY_U={cls="AntdUI.button";text="座椅上";left=232;top=131;right=313;bottom=206;bgcolor=65280;z=3}; -groupbox={cls="groupbox";text="滑轨电机";left=539;top=190;right=725;bottom=382;clipch=1;edge=1;z=14}; -groupbox2={cls="groupbox";text="靠背电机";left=743;top=193;right=929;bottom=385;edge=1;z=15}; -groupbox3={cls="groupbox";text="前升降电机";left=538;top=391;right=724;bottom=583;edge=1;z=16}; -groupbox4={cls="groupbox";text="后升降电机";left=741;top=390;right=927;bottom=582;edge=1;z=17}; -st_FanState={cls="static";text="Static";left=765;top=28;right=896;bottom=57;center=1;font=LOGFONT(h=-16);transparent=1;z=40}; -st_HeatState={cls="static";text="Static";left=765;top=55;right=896;bottom=84;center=1;font=LOGFONT(h=-16);transparent=1;z=41}; -st_hg_hallio={cls="static";text="Static";left=556;top=246;right=687;bottom=275;center=1;font=LOGFONT(h=-16);z=19}; -st_hg_loc={cls="static";text="Static";left=556;top=275;right=687;bottom=304;center=1;font=LOGFONT(h=-16);z=20}; -st_hg_state={cls="static";text="Static";left=556;top=217;right=687;bottom=246;center=1;font=LOGFONT(h=-16);z=18}; -st_hg_stop1={cls="static";text="Static";left=556;top=304;right=687;bottom=333;center=1;font=LOGFONT(h=-16);z=21}; -st_hg_stop2={cls="static";text="Static";left=556;top=333;right=687;bottom=362;center=1;font=LOGFONT(h=-16);z=22}; -st_kb_hallio={cls="static";text="Static";left=758;top=241;right=889;bottom=270;center=1;font=LOGFONT(h=-16);z=24}; -st_kb_loc={cls="static";text="Static";left=758;top=270;right=889;bottom=299;center=1;font=LOGFONT(h=-16);z=25}; -st_kb_state={cls="static";text="Static";left=758;top=212;right=889;bottom=241;center=1;font=LOGFONT(h=-16);z=23}; -st_kb_stop1={cls="static";text="Static";left=758;top=299;right=889;bottom=328;center=1;font=LOGFONT(h=-16);z=26}; -st_kb_stop2={cls="static";text="Static";left=758;top=328;right=889;bottom=357;center=1;font=LOGFONT(h=-16);z=27}; -st_test1={cls="static";text="Static";left=552;top=34;right=683;bottom=63;center=1;font=LOGFONT(h=-16);transparent=1;z=9}; -st_test2={cls="static";text="Static";left=552;top=64;right=683;bottom=93;center=1;font=LOGFONT(h=-16);transparent=1;z=10}; -st_test3={cls="static";text="Static";left=552;top=94;right=683;bottom=123;center=1;font=LOGFONT(h=-16);transparent=1;z=11}; -st_test4={cls="static";text="Static";left=552;top=124;right=683;bottom=153;center=1;font=LOGFONT(h=-16);transparent=1;z=12}; -st_test5={cls="static";text="Static";left=552;top=154;right=683;bottom=183;center=1;font=LOGFONT(h=-16);transparent=1;z=13}; -st_tt_hallio={cls="static";text="Static";left=561;top=452;right=692;bottom=481;center=1;font=LOGFONT(h=-16);z=29}; -st_tt_loc={cls="static";text="Static";left=561;top=481;right=692;bottom=510;center=1;font=LOGFONT(h=-16);z=30}; -st_tt_state={cls="static";text="Static";left=561;top=423;right=692;bottom=452;center=1;font=LOGFONT(h=-16);z=28}; -st_tt_stop1={cls="static";text="Static";left=561;top=510;right=692;bottom=539;center=1;font=LOGFONT(h=-16);z=31}; -st_tt_stop2={cls="static";text="Static";left=561;top=539;right=692;bottom=568;center=1;font=LOGFONT(h=-16);z=32}; -st_zy_hallio={cls="static";text="Static";left=764;top=448;right=895;bottom=477;center=1;font=LOGFONT(h=-16);z=34}; -st_zy_loc={cls="static";text="Static";left=764;top=477;right=895;bottom=506;center=1;font=LOGFONT(h=-16);z=35}; -st_zy_state={cls="static";text="Static";left=764;top=419;right=895;bottom=448;center=1;font=LOGFONT(h=-16);z=33}; -st_zy_stop1={cls="static";text="Static";left=764;top=506;right=895;bottom=535;center=1;font=LOGFONT(h=-16);z=36}; -st_zy_stop2={cls="static";text="Static";left=764;top=535;right=895;bottom=564;center=1;font=LOGFONT(h=-16);z=37} +bkplus={cls="bkplus";left=128;top=14;right=573;bottom=510;ah=1;aw=1;background="\res\座椅.png";z=1}; +btn_Fan={cls="AntdUI.button";text="通风";left=736;top=31;right=817;bottom=106;bgcolor=65280;z=10}; +btn_HG_F={cls="AntdUI.button";left=52;top=367;right=133;bottom=442;bgcolor=65280;z=6}; +btn_HG_R={cls="AntdUI.button";left=479;top=367;right=560;bottom=442;bgcolor=65280;z=7}; +btn_Heat={cls="AntdUI.button";text="加热";left=736;top=117;right=817;bottom=192;bgcolor=65280;z=11}; +btn_KB_F={cls="AntdUI.button";left=263;top=87;right=344;bottom=162;bgcolor=16777215;z=2}; +btn_KB_R={cls="AntdUI.button";left=584;top=72;right=665;bottom=147;bgcolor=65280;z=3}; +btn_Massage={cls="AntdUI.button";text="按摩";left=737;top=203;right=818;bottom=278;bgcolor=65280;z=17}; +btn_PGL_M={cls="AntdUI.button";text="-";left=737;top=534;right=818;bottom=573;bgcolor=65280;z=23}; +btn_PGL_P={cls="AntdUI.button";text="+";left=737;top=487;right=818;bottom=526;bgcolor=65280;z=22}; +btn_PGR_M={cls="AntdUI.button";text="-";left=840;top=533;right=921;bottom=570;bgcolor=65280;z=25}; +btn_PGR_P={cls="AntdUI.button";text="+";left=841;top=485;right=922;bottom=524;bgcolor=65280;z=24}; +btn_Reset={cls="AntdUI.button";text="标定";left=737;top=295;right=818;bottom=370;bgcolor=65280;z=16}; +btn_SET={cls="AntdUI.button";text="M";left=873;top=28;right=954;bottom=103;bgcolor=65280;z=12}; +btn_SET_1={cls="AntdUI.button";text="1";left=874;top=118;right=955;bottom=193;bgcolor=65280;z=13}; +btn_SET_2={cls="AntdUI.button";text="2";left=876;top=202;right=957;bottom=277;bgcolor=65280;z=14}; +btn_SET_3={cls="AntdUI.button";text="3";left=876;top=292;right=957;bottom=367;bgcolor=65280;z=15}; +btn_TT_F={cls="AntdUI.button";left=133;top=289;right=214;bottom=364;bgcolor=65280;z=8}; +btn_TT_R={cls="AntdUI.button";left=135;top=447;right=216;bottom=522;bgcolor=65280;z=9}; +btn_YT1_M={cls="AntdUI.button";text="-";left=840;top=391;right=921;bottom=430;bgcolor=65280;z=19}; +btn_YT1_P={cls="AntdUI.button";text="+";left=735;top=391;right=816;bottom=430;bgcolor=65280;z=18}; +btn_YT2_M={cls="AntdUI.button";text="-";left=840;top=437;right=921;bottom=476;bgcolor=65280;z=21}; +btn_YT2_P={cls="AntdUI.button";text="+";left=737;top=437;right=818;bottom=476;bgcolor=65280;z=20}; +btn_ZY_D={cls="AntdUI.button";left=479;top=444;right=560;bottom=519;bgcolor=65280;z=5}; +btn_ZY_U={cls="AntdUI.button";left=479;top=291;right=560;bottom=366;bgcolor=65280;z=4} ) /*}}*/ @@ -63,42 +40,50 @@ import win.timer var showtimer = win.timer( show ,50); showtimer.onTimer = function(){ CT_UpdateCANTxMsg(0x201,10,txdata); - signaldislay(); + //signaldislay(); } -signaldislay = function(){ - show.st_test1.text = msg301_test1*(80.4/12.4)/100; - show.st_test2.text = msg301_test2; - show.st_test3.text = msg301_test3; - show.st_test4.text = msg301_test4; - show.st_test5.text = msg301_test5; - show.st_hg_state.text = msgDebug[1]["status"] - show.st_hg_hallio.text = msgDebug[1]["hallio"] - show.st_hg_loc.text = msgDebug[1]["loc"] - show.st_hg_stop1.text = msgDebug[1]["stop1"] - show.st_hg_stop2.text = msgDebug[1]["stop2"] - - show.st_kb_state.text = msgDebug[2]["status"] - show.st_kb_hallio.text = msgDebug[2]["hallio"] - show.st_kb_loc.text = msgDebug[2]["loc"] - show.st_kb_stop1.text = msgDebug[2]["stop1"] - show.st_kb_stop2.text = msgDebug[2]["stop2"] - - show.st_tt_state.text = msgDebug[3]["status"] - show.st_tt_hallio.text = msgDebug[3]["hallio"] - show.st_tt_loc.text = msgDebug[3]["loc"] - show.st_tt_stop1.text = msgDebug[3]["stop1"] - show.st_tt_stop2.text = msgDebug[3]["stop2"] - - show.st_zy_state.text = msgDebug[4]["status"] - show.st_zy_hallio.text = msgDebug[4]["hallio"] - show.st_zy_loc.text = msgDebug[4]["loc"] - show.st_zy_stop1.text = msgDebug[4]["stop1"] - show.st_zy_stop2.text = msgDebug[4]["stop2"] - show.st_FanState.text = msg301_FanState; - show.st_HeatState.text = msg301_HeatState; -} +//图标 https://ant-design.antgroup.com/components/icon-cn +AntdUI.setThemes(show,"Light") +show.btn_KB_F.Type = 2; +show.btn_KB_F.Shape = 1/*圆形AntdUI.TShape.Circle*/ +show.btn_KB_F.IconSvg = "LeftOutlined"; +show.btn_KB_F.IconRatio = 2; +show.btn_KB_R.Type = 2; +show.btn_KB_R.Shape = 1/*圆形AntdUI.TShape.Circle*/ +show.btn_KB_R.IconSvg = "RightOutlined"; +show.btn_KB_R.IconRatio = 2; + +show.btn_HG_F.Type = 2; +show.btn_HG_F.Shape = 1/*圆形AntdUI.TShape.Circle*/ +show.btn_HG_F.IconSvg = "LeftOutlined"; +show.btn_HG_F.IconRatio = 2; + +show.btn_HG_R.Type = 2; +show.btn_HG_R.Shape = 1/*圆形AntdUI.TShape.Circle*/ +show.btn_HG_R.IconSvg = "RightOutlined"; +show.btn_HG_R.IconRatio = 2; + +show.btn_TT_F.Type = 2; +show.btn_TT_F.Shape = 1/*圆形AntdUI.TShape.Circle*/ +show.btn_TT_F.IconSvg = "UpOutlined"; +show.btn_TT_F.IconRatio = 2; + +show.btn_TT_R.Type = 2; +show.btn_TT_R.Shape = 1/*圆形AntdUI.TShape.Circle*/ +show.btn_TT_R.IconSvg = "DownOutlined"; +show.btn_TT_R.IconRatio = 2; + +show.btn_ZY_D.Type = 2; +show.btn_ZY_D.Shape = 1/*圆形AntdUI.TShape.Circle*/ +show.btn_ZY_D.IconSvg = "DownOutlined"; +show.btn_ZY_D.IconRatio = 2; + +show.btn_ZY_U.Type = 2; +show.btn_ZY_U.Shape = 1/*圆形AntdUI.TShape.Circle*/ +show.btn_ZY_U.IconSvg = "UpOutlined"; +show.btn_ZY_U.IconRatio = 2; set_txdataTabBit = function(bitnum,val){ if(bitnum >= 64){ @@ -325,5 +310,110 @@ show.btn_Massage.wndproc = function(hwnd,message,wParam,lParam){ } } +show.btn_YT1_P.wndproc = function(hwnd,message,wParam,lParam){ + + //无返回值则继续调用默认回调函数 + select(message) { + case 0x202/*_WM_LBUTTONUP*/ { + set_txdataTabBit(40,0); + } + case 0x201/*_WM_LBUTTONDOWN*/ { + set_txdataTabBit(40,1) + } + } +} + +show.btn_YT1_M.wndproc = function(hwnd,message,wParam,lParam){ + + //无返回值则继续调用默认回调函数 + select(message) { + case 0x202/*_WM_LBUTTONUP*/ { + set_txdataTabBit(41,0); + } + case 0x201/*_WM_LBUTTONDOWN*/ { + set_txdataTabBit(41,1) + } + } +} + +show.btn_YT2_P.wndproc = function(hwnd,message,wParam,lParam){ + + //无返回值则继续调用默认回调函数 + select(message) { + case 0x202/*_WM_LBUTTONUP*/ { + set_txdataTabBit(42,0); + } + case 0x201/*_WM_LBUTTONDOWN*/ { + set_txdataTabBit(42,1) + } + } +} + +show.btn_YT2_M.wndproc = function(hwnd,message,wParam,lParam){ + + //无返回值则继续调用默认回调函数 + select(message) { + case 0x202/*_WM_LBUTTONUP*/ { + set_txdataTabBit(43,0); + } + case 0x201/*_WM_LBUTTONDOWN*/ { + set_txdataTabBit(43,1) + } + } +} + +show.btn_PGL_P.wndproc = function(hwnd,message,wParam,lParam){ + + //无返回值则继续调用默认回调函数 + select(message) { + case 0x202/*_WM_LBUTTONUP*/ { + set_txdataTabBit(44,0); + } + case 0x201/*_WM_LBUTTONDOWN*/ { + set_txdataTabBit(44,1) + } + } +} + +show.btn_PGL_M.wndproc = function(hwnd,message,wParam,lParam){ + + //无返回值则继续调用默认回调函数 + select(message) { + case 0x202/*_WM_LBUTTONUP*/ { + set_txdataTabBit(45,0); + } + case 0x201/*_WM_LBUTTONDOWN*/ { + set_txdataTabBit(45,1) + } + } +} + +show.btn_PGR_P.wndproc = function(hwnd,message,wParam,lParam){ + + //无返回值则继续调用默认回调函数 + select(message) { + case 0x202/*_WM_LBUTTONUP*/ { + set_txdataTabBit(46,0); + } + case 0x201/*_WM_LBUTTONDOWN*/ { + set_txdataTabBit(46,1) + } + } +} + +show.btn_PGR_M.wndproc = function(hwnd,message,wParam,lParam){ + + //无返回值则继续调用默认回调函数 + select(message) { + case 0x202/*_WM_LBUTTONUP*/ { + set_txdataTabBit(47,0); + } + case 0x201/*_WM_LBUTTONDOWN*/ { + set_txdataTabBit(47,1) + } + } +} + + show.show(); return win.loopMessage(); \ No newline at end of file diff --git a/dlg/switch.aardio b/dlg/switch.aardio index 946b603..594a0be 100644 --- a/dlg/switch.aardio +++ b/dlg/switch.aardio @@ -2,16 +2,79 @@ import win.ui; import fonts.fontAwesome; /*DSG{{*/ var winform = win.form(text="wubiLex - 帮助";right=984;bottom=607;bgcolor=16777215;style=33554432) -winform.add() +winform.add( +groupbox={cls="groupbox";text="滑轨电机";left=539;top=190;right=725;bottom=382;clipch=1;edge=1;z=6}; +groupbox2={cls="groupbox";text="靠背电机";left=743;top=193;right=929;bottom=385;edge=1;z=7}; +groupbox3={cls="groupbox";text="前升降电机";left=538;top=391;right=724;bottom=583;edge=1;z=8}; +groupbox4={cls="groupbox";text="后升降电机";left=741;top=390;right=927;bottom=582;edge=1;z=9}; +st_FanState={cls="static";text="Static";left=765;top=28;right=896;bottom=57;center=1;font=LOGFONT(h=-16);transparent=1;z=30}; +st_HeatState={cls="static";text="Static";left=765;top=55;right=896;bottom=84;center=1;font=LOGFONT(h=-16);transparent=1;z=31}; +st_hg_hallio={cls="static";text="Static";left=556;top=246;right=687;bottom=275;center=1;font=LOGFONT(h=-16);z=11}; +st_hg_loc={cls="static";text="Static";left=556;top=275;right=687;bottom=304;center=1;font=LOGFONT(h=-16);z=12}; +st_hg_state={cls="static";text="Static";left=556;top=217;right=687;bottom=246;center=1;font=LOGFONT(h=-16);z=10}; +st_hg_stop1={cls="static";text="Static";left=556;top=304;right=687;bottom=333;center=1;font=LOGFONT(h=-16);z=13}; +st_hg_stop2={cls="static";text="Static";left=556;top=333;right=687;bottom=362;center=1;font=LOGFONT(h=-16);z=14}; +st_kb_hallio={cls="static";text="Static";left=758;top=241;right=889;bottom=270;center=1;font=LOGFONT(h=-16);z=16}; +st_kb_loc={cls="static";text="Static";left=758;top=270;right=889;bottom=299;center=1;font=LOGFONT(h=-16);z=17}; +st_kb_state={cls="static";text="Static";left=758;top=212;right=889;bottom=241;center=1;font=LOGFONT(h=-16);z=15}; +st_kb_stop1={cls="static";text="Static";left=758;top=299;right=889;bottom=328;center=1;font=LOGFONT(h=-16);z=18}; +st_kb_stop2={cls="static";text="Static";left=758;top=328;right=889;bottom=357;center=1;font=LOGFONT(h=-16);z=19}; +st_test1={cls="static";text="Static";left=552;top=34;right=683;bottom=63;center=1;font=LOGFONT(h=-16);transparent=1;z=1}; +st_test2={cls="static";text="Static";left=552;top=64;right=683;bottom=93;center=1;font=LOGFONT(h=-16);transparent=1;z=2}; +st_test3={cls="static";text="Static";left=552;top=94;right=683;bottom=123;center=1;font=LOGFONT(h=-16);transparent=1;z=3}; +st_test4={cls="static";text="Static";left=552;top=124;right=683;bottom=153;center=1;font=LOGFONT(h=-16);transparent=1;z=4}; +st_test5={cls="static";text="Static";left=552;top=154;right=683;bottom=183;center=1;font=LOGFONT(h=-16);transparent=1;z=5}; +st_tt_hallio={cls="static";text="Static";left=561;top=452;right=692;bottom=481;center=1;font=LOGFONT(h=-16);z=21}; +st_tt_loc={cls="static";text="Static";left=561;top=481;right=692;bottom=510;center=1;font=LOGFONT(h=-16);z=22}; +st_tt_state={cls="static";text="Static";left=561;top=423;right=692;bottom=452;center=1;font=LOGFONT(h=-16);z=20}; +st_tt_stop1={cls="static";text="Static";left=561;top=510;right=692;bottom=539;center=1;font=LOGFONT(h=-16);z=23}; +st_tt_stop2={cls="static";text="Static";left=561;top=539;right=692;bottom=568;center=1;font=LOGFONT(h=-16);z=24}; +st_zy_hallio={cls="static";text="Static";left=764;top=448;right=895;bottom=477;center=1;font=LOGFONT(h=-16);z=26}; +st_zy_loc={cls="static";text="Static";left=764;top=477;right=895;bottom=506;center=1;font=LOGFONT(h=-16);z=27}; +st_zy_state={cls="static";text="Static";left=764;top=419;right=895;bottom=448;center=1;font=LOGFONT(h=-16);z=25}; +st_zy_stop1={cls="static";text="Static";left=764;top=506;right=895;bottom=535;center=1;font=LOGFONT(h=-16);z=28}; +st_zy_stop2={cls="static";text="Static";left=764;top=535;right=895;bottom=564;center=1;font=LOGFONT(h=-16);z=29} +) /*}}*/ - var SignalTimer = win.timer(,50); SignalTimer.onTimer = function(){ - //SignalDisplay(); + signaldislay(); } SignalTimer.enable(); +signaldislay = function(){ + winform.st_test1.text = msg301_test1*(80.4/12.4)/100; + winform.st_test2.text = msg301_test2; + winform.st_test3.text = msg301_test3; + winform.st_test4.text = msg301_test4; + winform.st_test5.text = msg301_test5; + winform.st_hg_state.text = msgDebug[1]["status"] + winform.st_hg_hallio.text = msgDebug[1]["hallio"] + winform.st_hg_loc.text = msgDebug[1]["loc"] + winform.st_hg_stop1.text = msgDebug[1]["stop1"] + winform.st_hg_stop2.text = msgDebug[1]["stop2"] + + winform.st_kb_state.text = msgDebug[2]["status"] + winform.st_kb_hallio.text = msgDebug[2]["hallio"] + winform.st_kb_loc.text = msgDebug[2]["loc"] + winform.st_kb_stop1.text = msgDebug[2]["stop1"] + winform.st_kb_stop2.text = msgDebug[2]["stop2"] + + winform.st_tt_state.text = msgDebug[3]["status"] + winform.st_tt_hallio.text = msgDebug[3]["hallio"] + winform.st_tt_loc.text = msgDebug[3]["loc"] + winform.st_tt_stop1.text = msgDebug[3]["stop1"] + winform.st_tt_stop2.text = msgDebug[3]["stop2"] + + winform.st_zy_state.text = msgDebug[4]["status"] + winform.st_zy_hallio.text = msgDebug[4]["hallio"] + winform.st_zy_loc.text = msgDebug[4]["loc"] + winform.st_zy_stop1.text = msgDebug[4]["stop1"] + winform.st_zy_stop2.text = msgDebug[4]["stop2"] + winform.st_FanState.text = msg301_FanState; + winform.st_HeatState.text = msg301_HeatState; +}