diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 71c8fbb0..65796ae4 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-05-30 18:27:22.843187876 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-30 18:27:23.923228884 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-30 19:51:39.086222656 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-30 19:51:39.990229715 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt ---- HMI/n2t-out/cardAlarm.txt 2022-05-30 18:27:22.843187876 +0000 -+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-30 18:27:23.927229036 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-05-30 19:51:39.086222656 +0000 ++++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-30 19:51:39.990229715 +0000 @@ -12,7 +12,6 @@ Events @@ -19,7 +19,110 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt vis p0,0 vis tSend,0 vis tInstruction,0 -@@ -684,10 +683,7 @@ +@@ -33,7 +32,6 @@ + vis b8,0 + vis b9,0 + vis b10,0 +- vis b11,0 + vis tCode,0 + vis bPrev,0 + vis bNext,0 +@@ -80,12 +78,6 @@ + Text : + Max. Text Size: 20 + +-Variable (string) vaAddBtn +- Attributes +- Scope : local +- Text : +- Max. Text Size: 20 +- + Text tTmp + Attributes + Scope : local +@@ -333,27 +325,12 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed +- Text : ++ Text : 0 + Max. Text Size : 10 + + Events + Touch Press Event +- // event,buttonPress2,entn,arm1,tCode +- tSend.txt="event,buttonPress2," +- tSend.txt+=entn.txt+"," +- tSend.txt+=vaAddBtn.txt +- //send calc crc +- btlen tSend.txt,sys0 +- crcrest 1,0xffff // reset CRC +- crcputh 55 bb +- crcputs sys0,2 +- crcputs tSend.txt,0 +- //send cmd +- printh 55 bb +- prints sys0,2 +- prints tSend.txt,0 +- prints crcval,2 +- tCode.txt="" ++ tCode.txt=tCode.txt+"0" + + Button b10 + Attributes +@@ -362,12 +339,12 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed +- Text : 0 ++ Text : CLR + Max. Text Size : 10 + + Events + Touch Press Event +- tCode.txt=tCode.txt+"0" ++ tCode.txt="" + + Button arm1 + Attributes +@@ -489,20 +466,6 @@ + prints crcval,2 + tCode.txt="" + +-Button b11 +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- State : unpressed +- Text : CLR +- Max. Text Size : 10 +- +- Events +- Touch Press Event +- tCode.txt="" +- + Hotspot mSwipeNext + Attributes + Scope : local +@@ -704,15 +667,6 @@ + { + tmFlash.en=0 + } +- // extra button +- spstr strCommand.txt,b9.txt,"~",15 +- if(b9.txt!="") +- { +- vis b9,1 +- spstr strCommand.txt,tTmp.txt,"~",16 +- covx tTmp.txt,b9.pco,0,0 +- spstr strCommand.txt,vaAddBtn.txt,"~",17 +- } + } + if(tInstruction.txt=="time") + { +@@ -729,10 +683,7 @@ // get value spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 @@ -32,8 +135,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-30 18:27:22.843187876 +0000 -+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-30 18:27:23.927229036 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-30 19:51:39.086222656 +0000 ++++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-30 19:51:39.990229715 +0000 @@ -12,7 +12,6 @@ Events @@ -54,8 +157,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt ---- HMI/n2t-out/cardGrid.txt 2022-05-30 18:27:22.843187876 +0000 -+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-30 18:27:23.927229036 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-05-30 19:51:39.086222656 +0000 ++++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-30 19:51:39.990229715 +0000 @@ -12,7 +12,7 @@ Events @@ -77,8 +180,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-05-30 18:27:22.843187876 +0000 -+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-30 18:27:23.927229036 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-05-30 19:51:39.086222656 +0000 ++++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-30 19:51:39.990229715 +0000 @@ -12,7 +12,6 @@ Events @@ -100,8 +203,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-30 18:27:22.843187876 +0000 -+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-30 18:27:23.927229036 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-30 19:51:39.086222656 +0000 ++++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-30 19:51:39.990229715 +0000 @@ -12,7 +12,6 @@ Events @@ -123,8 +226,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-05-30 18:27:22.843187876 +0000 -+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-30 18:27:23.923228884 +0000 +--- HMI/n2t-out/cardThermo.txt 2022-05-30 19:51:39.086222656 +0000 ++++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-30 19:51:39.990229715 +0000 @@ -12,7 +12,6 @@ Events @@ -145,8 +248,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-30 18:27:22.843187876 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-30 18:27:23.923228884 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-30 19:51:39.086222656 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-30 19:51:39.990229715 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 @@ -168,8 +271,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-05-30 18:27:22.843187876 +0000 -+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-30 18:27:23.927229036 +0000 +--- HMI/n2t-out/popupLight.txt 2022-05-30 19:51:39.086222656 +0000 ++++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-30 19:51:39.990229715 +0000 @@ -12,7 +12,6 @@ Events @@ -190,8 +293,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt ---- HMI/n2t-out/popupNotify.txt 2022-05-30 18:27:22.843187876 +0000 -+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-30 18:27:23.923228884 +0000 +--- HMI/n2t-out/popupNotify.txt 2022-05-30 19:51:39.086222656 +0000 ++++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-30 19:51:39.990229715 +0000 @@ -12,7 +12,6 @@ Events @@ -212,8 +315,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt if(tInstruction.txt=="timeout") { diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt ---- HMI/n2t-out/popupShutter.txt 2022-05-30 18:27:22.843187876 +0000 -+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-30 18:27:23.923228884 +0000 +--- HMI/n2t-out/popupShutter.txt 2022-05-30 19:51:39.086222656 +0000 ++++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-30 19:51:39.990229715 +0000 @@ -12,7 +12,6 @@ Events @@ -234,8 +337,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt if(tInstruction.txt=="time") { diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-05-30 18:27:22.843187876 +0000 -+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-30 18:27:23.927229036 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-30 19:51:39.086222656 +0000 ++++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-30 19:51:39.990229715 +0000 @@ -397,9 +397,6 @@ spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 4cfa4b20..da084411 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-05-30 18:27:22.843187876 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 18:27:23.351207165 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-30 19:51:39.086222656 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 19:51:39.518226029 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -10,9 +10,115 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + // fix touch offset (Removed for US version) + //lcd_dev fffb 0002 0000 0020 page pageStartup +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt +--- HMI/n2t-out/cardAlarm.txt 2022-05-30 19:51:39.086222656 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-30 19:51:39.522226060 +0000 +@@ -33,7 +33,6 @@ + vis b8,0 + vis b9,0 + vis b10,0 +- vis b11,0 + vis tCode,0 + vis bPrev,0 + vis bNext,0 +@@ -80,12 +79,6 @@ + Text : + Max. Text Size: 20 + +-Variable (string) vaAddBtn +- Attributes +- Scope : local +- Text : +- Max. Text Size: 20 +- + Text tTmp + Attributes + Scope : local +@@ -333,27 +326,12 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed +- Text : ++ Text : 0 + Max. Text Size : 10 + + Events + Touch Press Event +- // event,buttonPress2,entn,arm1,tCode +- tSend.txt="event,buttonPress2," +- tSend.txt+=entn.txt+"," +- tSend.txt+=vaAddBtn.txt +- //send calc crc +- btlen tSend.txt,sys0 +- crcrest 1,0xffff // reset CRC +- crcputh 55 bb +- crcputs sys0,2 +- crcputs tSend.txt,0 +- //send cmd +- printh 55 bb +- prints sys0,2 +- prints tSend.txt,0 +- prints crcval,2 +- tCode.txt="" ++ tCode.txt=tCode.txt+"0" + + Button b10 + Attributes +@@ -362,12 +340,12 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed +- Text : 0 ++ Text : CLR + Max. Text Size : 10 + + Events + Touch Press Event +- tCode.txt=tCode.txt+"0" ++ tCode.txt="" + + Button arm1 + Attributes +@@ -489,20 +467,6 @@ + prints crcval,2 + tCode.txt="" + +-Button b11 +- Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- State : unpressed +- Text : CLR +- Max. Text Size : 10 +- +- Events +- Touch Press Event +- tCode.txt="" +- + Hotspot mSwipeNext + Attributes + Scope : local +@@ -704,15 +668,6 @@ + { + tmFlash.en=0 + } +- // extra button +- spstr strCommand.txt,b9.txt,"~",15 +- if(b9.txt!="") +- { +- vis b9,1 +- spstr strCommand.txt,tTmp.txt,"~",16 +- covx tTmp.txt,b9.pco,0,0 +- spstr strCommand.txt,vaAddBtn.txt,"~",17 +- } + } + if(tInstruction.txt=="time") + { diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-05-30 18:27:22.843187876 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 18:27:23.351207165 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-30 19:51:39.086222656 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 19:51:39.522226060 +0000 @@ -63,6 +63,16 @@ vis bText4,0 vis hSlider4,0 @@ -468,8 +574,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt ---- HMI/n2t-out/cardQR.txt 2022-05-30 18:27:22.843187876 +0000 -+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 18:27:23.351207165 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-30 19:51:39.086222656 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 19:51:39.518226029 +0000 @@ -35,7 +35,7 @@ Attributes Scope : local @@ -480,8 +586,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt Variable (string) entn Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-30 18:27:22.843187876 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 18:27:23.351207165 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-30 19:51:39.086222656 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 19:51:39.522226060 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -501,8 +607,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt ---- HMI/n2t-out/screensaver.txt 2022-05-30 18:27:22.843187876 +0000 -+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 18:27:23.351207165 +0000 +--- HMI/n2t-out/screensaver.txt 2022-05-30 19:51:39.086222656 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 19:51:39.522226060 +0000 @@ -474,22 +474,6 @@ vis tMainIconAlt,1 vis tMRIcon,1 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 26a2da3d..a5344f98 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,8 +1,114 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-30 18:27:23.395208836 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-30 18:27:22.843187876 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 18:27:23.351207165 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-30 18:27:22.843187876 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 18:27:23.351207165 +0000 ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-30 19:51:39.538226185 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-30 19:51:39.086222656 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 19:51:39.518226029 +0000 ++diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt ++--- HMI/n2t-out/cardAlarm.txt 2022-05-30 19:51:39.086222656 +0000 +++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-30 19:51:39.522226060 +0000 ++@@ -33,7 +33,6 @@ ++ vis b8,0 ++ vis b9,0 ++ vis b10,0 ++- vis b11,0 ++ vis tCode,0 ++ vis bPrev,0 ++ vis bNext,0 ++@@ -80,12 +79,6 @@ ++ Text : ++ Max. Text Size: 20 ++ ++-Variable (string) vaAddBtn ++- Attributes ++- Scope : local ++- Text : ++- Max. Text Size: 20 ++- ++ Text tTmp ++ Attributes ++ Scope : local ++@@ -333,27 +326,12 @@ ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ State : unpressed ++- Text : +++ Text : 0 ++ Max. Text Size : 10 ++ ++ Events ++ Touch Press Event ++- // event,buttonPress2,entn,arm1,tCode ++- tSend.txt="event,buttonPress2," ++- tSend.txt+=entn.txt+"," ++- tSend.txt+=vaAddBtn.txt ++- //send calc crc ++- btlen tSend.txt,sys0 ++- crcrest 1,0xffff // reset CRC ++- crcputh 55 bb ++- crcputs sys0,2 ++- crcputs tSend.txt,0 ++- //send cmd ++- printh 55 bb ++- prints sys0,2 ++- prints tSend.txt,0 ++- prints crcval,2 ++- tCode.txt="" +++ tCode.txt=tCode.txt+"0" ++ ++ Button b10 ++ Attributes ++@@ -362,12 +340,12 @@ ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ State : unpressed ++- Text : 0 +++ Text : CLR ++ Max. Text Size : 10 ++ ++ Events ++ Touch Press Event ++- tCode.txt=tCode.txt+"0" +++ tCode.txt="" ++ ++ Button arm1 ++ Attributes ++@@ -489,20 +467,6 @@ ++ prints crcval,2 ++ tCode.txt="" ++ ++-Button b11 ++- Attributes ++- Scope : local ++- Dragging : 0 ++- Disable release event after dragging: 0 ++- Send Component ID : disabled ++- State : unpressed ++- Text : CLR ++- Max. Text Size : 10 ++- ++- Events ++- Touch Press Event ++- tCode.txt="" ++- ++ Hotspot mSwipeNext ++ Attributes ++ Scope : local ++@@ -704,15 +668,6 @@ ++ { ++ tmFlash.en=0 ++ } ++- // extra button ++- spstr strCommand.txt,b9.txt,"~",15 ++- if(b9.txt!="") ++- { ++- vis b9,1 ++- spstr strCommand.txt,tTmp.txt,"~",16 ++- covx tTmp.txt,b9.pco,0,0 ++- spstr strCommand.txt,vaAddBtn.txt,"~",17 ++- } ++ } ++ if(tInstruction.txt=="time") ++ { ++--- HMI/n2t-out/cardEntities.txt 2022-05-30 19:51:39.086222656 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 19:51:39.522226060 +0000 +@@ -63,6 +63,16 @@ +@@ -120,6 +130,18 @@ +@@ -156,6 +178,15 @@ @@ -12,11 +118,11 @@ +@@ -970,6 +1149,33 @@ +@@ -1075,6 +1281,28 @@ +@@ -1850,6 +2078,169 @@ -+--- HMI/n2t-out/cardQR.txt 2022-05-30 18:27:22.843187876 +0000 -++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 18:27:23.351207165 +0000 ++--- HMI/n2t-out/cardQR.txt 2022-05-30 19:51:39.086222656 +0000 +++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 19:51:39.518226029 +0000 +@@ -35,7 +35,7 @@ -+--- HMI/n2t-out/pageStartup.txt 2022-05-30 18:27:22.843187876 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 18:27:23.351207165 +0000 -+--- HMI/n2t-out/screensaver.txt 2022-05-30 18:27:22.843187876 +0000 -++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 18:27:23.351207165 +0000 ++--- HMI/n2t-out/pageStartup.txt 2022-05-30 19:51:39.086222656 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 19:51:39.522226060 +0000 ++--- HMI/n2t-out/screensaver.txt 2022-05-30 19:51:39.086222656 +0000 +++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 19:51:39.522226060 +0000 +@@ -474,22 +474,6 @@ diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index 9ddfb28e..36c23069 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/n2t-out-visual/cardAlarm.txt @@ -41,6 +41,7 @@ Page cardAlarm vis b8,0 vis b9,0 vis b10,0 + vis b11,0 vis tCode,0 vis bPrev,0 vis bNext,0 @@ -94,6 +95,13 @@ Variable (string) va4 Text : Max. Text Size: 20 +Variable (string) vaAddBtn + Attributes + ID : 39 + Scope : local + Text : + Max. Text Size: 20 + Text tTmp Attributes ID : 2 @@ -712,7 +720,60 @@ Button b9 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 116 + x coordinate : 25 + y coordinate : 266 + Width : 75 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : border + Border Color : 6371 + Border Width : 2 + Font ID : 1 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 1374 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + // event,buttonPress2,entn,arm1,tCode + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+=vaAddBtn.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + tCode.txt="" + +Button b10 + Attributes + ID : 22 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 118 y coordinate : 266 Width : 75 Height : 50 @@ -742,44 +803,6 @@ Button b9 Touch Press Event tCode.txt=tCode.txt+"0" -Button b10 - Attributes - ID : 22 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 209 - y coordinate : 266 - Width : 75 - Height : 50 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : border - Border Color : 6371 - Border Width : 2 - Font ID : 2 - Back. Color : 6371 - Back. Picture ID (Pressed) : 65535 - Back. Color (Pressed) : 14823 - Font Color (Unpressed) : 1374 - Font Color (Pressed) : 65535 - Horizontal Alignment : center - Vertical Alignment : center - State : unpressed - Text : CLR - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - - Events - Touch Press Event - tCode.txt="" - Button arm1 Attributes ID : 24 @@ -996,6 +1019,44 @@ Button arm4 prints crcval,2 tCode.txt="" +Button b11 + Attributes + ID : 38 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 209 + y coordinate : 266 + Width : 75 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : border + Border Color : 6371 + Border Width : 2 + Font ID : 2 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 1374 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : CLR + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + tCode.txt="" + Hotspot mSwipeNext Attributes ID : 35 @@ -1225,6 +1286,15 @@ Timer tmSerial { tmFlash.en=0 } + // extra button + spstr strCommand.txt,b9.txt,"~",15 + if(b9.txt!="") + { + vis b9,1 + spstr strCommand.txt,tTmp.txt,"~",16 + covx tTmp.txt,b9.pco,0,0 + spstr strCommand.txt,vaAddBtn.txt,"~",17 + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 4671294c..2b45a0aa 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -27,9 +27,9 @@ popupShutter 248 Line(s) of event code 141 Unique line(s) of event code cardAlarm - 38 Component(s) - 363 Line(s) of event code - 228 Unique line(s) of event code + 40 Component(s) + 385 Line(s) of event code + 235 Unique line(s) of event code cardMedia 33 Component(s) 349 Line(s) of event code @@ -57,6 +57,6 @@ cardEntities Total 13 Page(s) - 404 Component(s) - 4485 Line(s) of event code - 1180 Unique line(s) of event code + 406 Component(s) + 4507 Line(s) of event code + 1186 Unique line(s) of event code diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index 0b2db7dd..57f6e110 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -33,6 +33,7 @@ Page cardAlarm vis b8,0 vis b9,0 vis b10,0 + vis b11,0 vis tCode,0 vis bPrev,0 vis bNext,0 @@ -79,6 +80,12 @@ Variable (string) va4 Text : Max. Text Size: 20 +Variable (string) vaAddBtn + Attributes + Scope : local + Text : + Max. Text Size: 20 + Text tTmp Attributes Scope : local @@ -326,12 +333,27 @@ Button b9 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text : 0 + Text : Max. Text Size : 10 Events Touch Press Event - tCode.txt=tCode.txt+"0" + // event,buttonPress2,entn,arm1,tCode + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+=vaAddBtn.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + tCode.txt="" Button b10 Attributes @@ -340,12 +362,12 @@ Button b10 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text : CLR + Text : 0 Max. Text Size : 10 Events Touch Press Event - tCode.txt="" + tCode.txt=tCode.txt+"0" Button arm1 Attributes @@ -467,6 +489,20 @@ Button arm4 prints crcval,2 tCode.txt="" +Button b11 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : CLR + Max. Text Size : 10 + + Events + Touch Press Event + tCode.txt="" + Hotspot mSwipeNext Attributes Scope : local @@ -668,6 +704,15 @@ Timer tmSerial { tmFlash.en=0 } + // extra button + spstr strCommand.txt,b9.txt,"~",15 + if(b9.txt!="") + { + vis b9,1 + spstr strCommand.txt,tTmp.txt,"~",16 + covx tTmp.txt,b9.pco,0,0 + spstr strCommand.txt,vaAddBtn.txt,"~",17 + } } if(tInstruction.txt=="time") {