diff --git a/HMI/US/landscape/nspanel_US_L.HMI b/HMI/US/landscape/nspanel_US_L.HMI index 67a8ad60..34620010 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 267d2607..fb93213d 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 57edf9bd..fa287b69 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 3bde8a38..db95eb1d 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 70162a50..ad95aa4f 100644 --- a/HMI/code_gen/pages/cardEntitiesSerial.py +++ b/HMI/code_gen/pages/cardEntitiesSerial.py @@ -3,17 +3,17 @@ head = sharedhead + """ if(tInstruction.txt=="entityUpd") { // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 - spstr strCommand.txt,tHeading.txt,",",1 + spstr strCommand.txt,tHeading.txt,"~",1 """ + navigation print(head) start = 3 -for i in range(1,5): +for i in range(1,7): idxstart = start + (i-1)*6 item = f""" // get Type - spstr strCommand.txt,type{i}.txt,",",{idxstart} + spstr strCommand.txt,type{i}.txt,"~",{idxstart} // get internal name - spstr strCommand.txt,entn{i}.txt,",",{idxstart+1} + spstr strCommand.txt,entn{i}.txt,"~",{idxstart+1} if(type{i}.txt=="delete"||type{i}.txt=="") {{ vis bUp{i},0 @@ -28,16 +28,16 @@ for i in range(1,5): }}else {{ // change icon - spstr strCommand.txt,tTmp.txt,",",{idxstart+2} + spstr strCommand.txt,tTmp.txt,"~",{idxstart+2} covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tIcon{i}.txt,sys0,1 vis tIcon{i},1 // change icon color - spstr strCommand.txt,tTmp.txt,",",{idxstart+3} + spstr strCommand.txt,tTmp.txt,"~",{idxstart+3} covx tTmp.txt,sys0,0,0 tIcon{i}.pco=sys0 // set name - spstr strCommand.txt,tEntity{i}.txt,",",{idxstart+4} + spstr strCommand.txt,tEntity{i}.txt,"~",{idxstart+4} vis tEntity{i},1 }} @@ -61,7 +61,7 @@ for i in range(1,5): vis hSlider{i},0 vis nNum{i},0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",{idxstart+5} + spstr strCommand.txt,tTmp.txt,"~",{idxstart+5} covx tTmp.txt,sys0,0,0 btOnOff{i}.val=sys0 }} @@ -75,7 +75,7 @@ for i in range(1,5): vis hSlider{i},0 vis nNum{i},0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",{idxstart+5} + spstr strCommand.txt,tTmp.txt,"~",{idxstart+5} covx tTmp.txt,sys0,0,0 btOnOff{i}.val=sys0 }} @@ -92,7 +92,7 @@ for i in range(1,5): bText{i}.pco=65535 bText{i}.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText{i}.txt,",",{idxstart+5} + spstr strCommand.txt,bText{i}.txt,"~",{idxstart+5} }} if(type{i}.txt=="button") {{ @@ -107,7 +107,7 @@ for i in range(1,5): bText{i}.pco=1374 bText{i}.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText{i}.txt,",",{idxstart+5} + spstr strCommand.txt,bText{i}.txt,"~",{idxstart+5} }} if(type{i}.txt=="number") {{ @@ -120,7 +120,7 @@ for i in range(1,5): vis hSlider{i},1 vis nNum{i},1 // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText{i}.txt,",",{idxstart+5} + spstr strCommand.txt,bText{i}.txt,"~",{idxstart+5} //first value is current value spstr bText{i}.txt,tTmp.txt,"|",0 covx tTmp.txt,sys0,0,0 diff --git a/HMI/code_gen/pages/shared.py b/HMI/code_gen/pages/shared.py index e02f9d5a..2867b2ab 100644 --- a/HMI/code_gen/pages/shared.py +++ b/HMI/code_gen/pages/shared.py @@ -41,7 +41,7 @@ if(usize>1) // write command to variable strCommand ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) - spstr strCommand.txt,tInstruction.txt,",",0 + spstr strCommand.txt,tInstruction.txt,"~",0 """ sharedfoot = """ @@ -49,11 +49,11 @@ sharedfoot = """ { //command format pageType,specialPageName //write name of speical page to tId - spstr strCommand.txt,tId.txt,",",1 + spstr strCommand.txt,tId.txt,"~",1 //save second arg if there's one - spstr strCommand.txt,tTmp.txt,",",2 + spstr strCommand.txt,tTmp.txt,"~",2 //save third arg if there's one - spstr strCommand.txt,pageIcons.tTmp2.txt,",",3 + spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... udelete payloadLength-1 bufferPos=0 @@ -103,23 +103,23 @@ sharedfoot = """ if(tInstruction.txt=="time") { // get set time to global variable - spstr strCommand.txt,pageIcons.vaTime.txt,",",1 + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 } if(tInstruction.txt=="date") { // get set date to global variable - spstr strCommand.txt,pageIcons.vaDate.txt,"?",1 + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 } if(tInstruction.txt=="dimmode") { // get value - spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,dimValue,0,0 } if(tInstruction.txt=="timeout") { //set timeout to global var - spstr strCommand.txt,tTmp.txt,",",1 + spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sleepTimeout,0,0 } // end of user code @@ -137,7 +137,7 @@ sharedfoot = """ navigation = """ // navigation icons - spstr strCommand.txt,tId.txt,",",2 + spstr strCommand.txt,tId.txt,"~",2 spstr tId.txt,tTmp.txt,"|",0 if(tTmp.txt=="0") { diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index 0b0faef3..0c5d1b57 100644 Binary files a/HMI/nspanel.HMI and b/HMI/nspanel.HMI differ diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index f669a4e4..fcc74cd1 100644 Binary files a/HMI/nspanel.tft and b/HMI/nspanel.tft differ diff --git a/HMI/nspanel_US_L.tft b/HMI/nspanel_US_L.tft deleted file mode 100644 index ce663a91..00000000 Binary files a/HMI/nspanel_US_L.tft and /dev/null differ