diff --git a/HMI/US/landscape/nspanel_US_L.HMI b/HMI/US/landscape/nspanel_US_L.HMI index cdced43a..c5e2627d 100644 Binary files a/HMI/US/landscape/nspanel_US_L.HMI and b/HMI/US/landscape/nspanel_US_L.HMI differ diff --git a/HMI/US/landscape/nspanel_US_L.tft b/HMI/US/landscape/nspanel_US_L.tft index 7e38b7f4..d1986057 100644 Binary files a/HMI/US/landscape/nspanel_US_L.tft and b/HMI/US/landscape/nspanel_US_L.tft differ diff --git a/HMI/US/portrait/nspanel_US_P.HMI b/HMI/US/portrait/nspanel_US_P.HMI index f5992903..588f79f1 100644 Binary files a/HMI/US/portrait/nspanel_US_P.HMI and b/HMI/US/portrait/nspanel_US_P.HMI differ diff --git a/HMI/US/portrait/nspanel_US_P.tft b/HMI/US/portrait/nspanel_US_P.tft index 293b0ed9..9b113d4a 100644 Binary files a/HMI/US/portrait/nspanel_US_P.tft and b/HMI/US/portrait/nspanel_US_P.tft differ diff --git a/HMI/code_gen/pages/cardEntitiesSerial.py b/HMI/code_gen/pages/cardEntitiesSerial.py index 9656cc45..8fcd077f 100644 --- a/HMI/code_gen/pages/cardEntitiesSerial.py +++ b/HMI/code_gen/pages/cardEntitiesSerial.py @@ -7,7 +7,7 @@ head = sharedhead + """ """ + navigation print(head) start = 3 -for i in range(1,5): +for i in range(1,6): idxstart = start + (i-1)*6 item = f""" // get Type @@ -50,44 +50,48 @@ for i in range(1,5): vis nNum{i},0 // get Button State (optional Value) spstr strCommand.txt,tId.txt,"~",{idxstart+5} + // up button spstr tId.txt,tTmp.txt,"|",0 - if(tTmp.txt!="") - {{ - bUp{i}.pco=65535 - tsw bUp{i},1 - }} - else if(tTmp.txt=="disable") + if(tTmp.txt=="disable") {{ bUp{i}.pco=27501 tsw bUp{i},0 }} + else if(tTmp.txt!="") + {{ + bUp{i}.pco=65535 + bUp{i}.txt=tTmp.txt + tsw bUp{i},1 + }} + // stop button spstr tId.txt,tTmp.txt,"|",1 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + {{ + bStop{i}.pco=27501 + tsw bStop{i},0 + }} + else if(tTmp.txt!="") {{ bStop{i}.pco=65535 bStop{i}.txt=tTmp.txt tsw bStop{i},1 }} - else if(tTmp.txt=="disable") - {{ - bStop{i}.pco=27501 - tsw bStop{i},0 - }} + // down button spstr tId.txt,tTmp.txt,"|",2 - if(tTmp.txt!="") + if(tTmp.txt=="disable") + {{ + bDown{i}.pco=27501 + tsw bDown{i},0 + }} + else if(tTmp.txt!="") {{ bDown{i}.pco=65535 bDown{i}.txt=tTmp.txt tsw bDown{i},1 }} - else if(tTmp.txt=="disable") - {{ - bDown{i}.pco=27501 - tsw bDown{i},0 - }} }} if(type{i}.txt=="light") {{ diff --git a/HMI/code_gen/pages/out.txt b/HMI/code_gen/pages/out.txt new file mode 100644 index 00000000..42c39fd9 --- /dev/null +++ b/HMI/code_gen/pages/out.txt @@ -0,0 +1,1034 @@ + +// data available +if(usize>1) +{ + bufferPos=0 + while(bufferPos