minor changes at Layout 3/4 output

This commit is contained in:
ON7LDS 2017-12-19 21:02:51 +01:00
parent f930a7fb9f
commit 4b97e879f3
2 changed files with 5 additions and 9 deletions

View File

@ -464,27 +464,23 @@ void CNextion::writeDMRGPSInt(unsigned int slotNo, float latitude, float longitu
if (slotNo == 1U) {
sendCommand(text);
sendCommandAction(9U,35U);
::sprintf(text, "t8.txt=\"%f %f\"", latitude, longitude);
sendCommand(text);
sendCommandAction(8U,35U);
::sprintf(text, "t12.txt=\"%d\"", positionError);
sendCommand(text);
sendCommandAction(12U,35U);
sendCommandAction(8U,35U);
}
if (slotNo == 2U) {
sendCommand(text);
sendCommandAction(11U,35U);
::sprintf(text, "t10.txt=\"%f %f\"", latitude, longitude);
sendCommand(text);
sendCommandAction(10U,35U);
::sprintf(text, "t13.txt=\"%d\"", positionError);
sendCommand(text);
sendCommandAction(13U,35U);
sendCommandAction(10U,35U);
}
}
@ -710,7 +706,7 @@ void CNextion::writeP25RSSIInt(unsigned char rssi)
char text[20U];
::sprintf(text, "t2.txt=\"-%udBm\"", m_rssiAccum1 / P25_RSSI_COUNT);
sendCommand(text);
sendCommandAction(2U,54);
sendCommandAction(2U,54U);
m_rssiAccum1 = 0U;
m_rssiCount1 = 1U;
}

View File

@ -89,7 +89,7 @@ changed field.
14 : ERROR
15 : LOCKOUT
16 : IPaddress
17 : ID/Call (t0 and t4,t5 are sent!)
17 : ID/Call (t0 and t4,t5 are sent)
19 : END
21 : D-Star listening
@ -103,7 +103,7 @@ changed field.
32 : ID
33 : TA
34 : Call end
35 : GPS
35 : GPS (t8,t9,t12 or t10,t11,t13 are sent)
36 : TG
37 : RSSI
38 : ber