diff --git a/HMI/US/landscape/nspanel_US_L.HMI b/HMI/US/landscape/nspanel_US_L.HMI index 5cbb9dc5..2cff68f0 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 f4286eca..252c0de6 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/code_gen/pages/cardGridSerial.py b/HMI/code_gen/pages/cardGridSerial.py index 7ed2d5ac..ab3c6778 100644 --- a/HMI/code_gen/pages/cardGridSerial.py +++ b/HMI/code_gen/pages/cardGridSerial.py @@ -3,7 +3,7 @@ head = sharedhead + """ if(tInstruction.txt=="entityUpd") { // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 - spstr strCommand.txt,tHeading.txt,",",1 + spstr strCommand.txt,tHeading.txt,"~",1 """ + navigation print(head) start = 3 @@ -11,9 +11,9 @@ 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 tEntity{i},0 @@ -21,14 +21,14 @@ for i in range(1,7): }}else {{ // change icon - spstr strCommand.txt,bEntity{i}.txt,",",{idxstart+2} + spstr strCommand.txt,bEntity{i}.txt,"~",{idxstart+2} vis bEntity{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 bEntity{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 }} """ diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index b55c629f..bf9ca02a 100644 Binary files a/HMI/nspanel.HMI and b/HMI/nspanel.HMI differ diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index a55df80f..5f6926bf 100644 Binary files a/HMI/nspanel.tft and b/HMI/nspanel.tft differ