Skip to content

Commit 4249ace

Browse files
nseidlenseidle
committed
Uppercase HEX prints
1 parent aede48b commit 4249ace

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

‎Firmware/RTK_Everywhere/ESPNOW.ino

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ esp_err_t espNowAddPeer(const uint8_t *peerMac, bool encrypt)
6666
esp_err_t result = esp_now_add_peer(&peerInfo);
6767
if (result != ESP_OK)
6868
{
69-
systemPrintf("ERROR: Failed to add ESP-NOW peer %02x:%02x:%02x:%02x:%02x:%02x, result: %d (%s)\r\n", peerMac[0],
69+
systemPrintf("ERROR: Failed to add ESP-NOW peer %02X:%02X:%02X:%02X:%02X:%02X, result: %d (%s)\r\n", peerMac[0],
7070
peerMac[1], peerMac[2], peerMac[3], peerMac[4], peerMac[5], result, esp_err_to_name(result));
7171
}
7272
else if (settings.debugEspNow)
73-
systemPrintf("Added ESP-NOW peer %02x:%02x:%02x:%02x:%02x:%02x\r\n", peerMac[0], peerMac[1], peerMac[2],
73+
systemPrintf("Added ESP-NOW peer %02X:%02X:%02X:%02X:%02X:%02X\r\n", peerMac[0], peerMac[1], peerMac[2],
7474
peerMac[3], peerMac[4], peerMac[5]);
7575
return result;
7676
}
@@ -125,7 +125,7 @@ void espNowOnDataReceived(const esp_now_recv_info *mac, const uint8_t *incomingD
125125
if (settings.debugEspNow == true)
126126
{
127127
systemPrintf(
128-
"*** ESP-NOW: RX %02x:%02x:%02x:%02x:%02x:%02x --> %02x:%02x:%02x:%02x:%02x:%02x, %d bytes, rssi: %d\r\n",
128+
"*** ESP-NOW: RX %02X:%02X:%02X:%02X:%02X:%02X --> %02X:%02X:%02X:%02X:%02X:%02X, %d bytes, rssi: %d\r\n",
129129
mac->src_addr[0], mac->src_addr[1], mac->src_addr[2], mac->src_addr[3], mac->src_addr[4], mac->src_addr[5],
130130
mac->des_addr[0], mac->des_addr[1], mac->des_addr[2], mac->des_addr[3], mac->des_addr[4], mac->des_addr[5],
131131
len, packetRSSI);
@@ -298,11 +298,11 @@ esp_err_t espNowRemovePeer(const uint8_t *peerMac)
298298
if (settings.debugEspNow == true)
299299
{
300300
if (result != ESP_OK)
301-
systemPrintf("ERROR: Failed to remove ESP-NOW peer %02x:%02x:%02x:%02x:%02x:%02x, result: %s\r\n",
301+
systemPrintf("ERROR: Failed to remove ESP-NOW peer %02X:%02X:%02X:%02X:%02X:%02X, result: %s\r\n",
302302
peerMac[0], peerMac[1], peerMac[2], peerMac[3], peerMac[4], peerMac[5],
303303
esp_err_to_name(result));
304304
else
305-
systemPrintf("Removed ESP-NOW peer %02x:%02x:%02x:%02x:%02x:%02x\r\n", peerMac[0], peerMac[1], peerMac[2],
305+
systemPrintf("Removed ESP-NOW peer %02X:%02X:%02X:%02X:%02X:%02X\r\n", peerMac[0], peerMac[1], peerMac[2],
306306
peerMac[3], peerMac[4], peerMac[5]);
307307
}
308308
return result;
@@ -440,7 +440,7 @@ bool espNowStart()
440440
if (esp_now_is_peer_exist(settings.espnowPeers[index]))
441441
{
442442
if (settings.debugEspNow == true)
443-
systemPrintf("ESP-NOW peer %02x:%02x:%02x:%02x:%02x:%02x, status: already exists\r\n",
443+
systemPrintf("ESP-NOW peer %02X:%02X:%02X:%02X:%02X:%02X, status: already exists\r\n",
444444
settings.espnowPeers[index][0], settings.espnowPeers[index][1],
445445
settings.espnowPeers[index][2], settings.espnowPeers[index][3],
446446
settings.espnowPeers[index][4], settings.espnowPeers[index][5]);
@@ -452,7 +452,7 @@ bool espNowStart()
452452
if (status == ESP_OK)
453453
{
454454
if (settings.debugEspNow == true)
455-
systemPrintf("Added ESP-NOW peer %02x:%02x:%02x:%02x:%02x:%02x\r\n",
455+
systemPrintf("Added ESP-NOW peer %02X:%02X:%02X:%02X:%02X:%02X\r\n",
456456
settings.espnowPeers[index][0], settings.espnowPeers[index][1],
457457
settings.espnowPeers[index][2], settings.espnowPeers[index][3],
458458
settings.espnowPeers[index][4], settings.espnowPeers[index][5]);
@@ -461,7 +461,7 @@ bool espNowStart()
461461
{
462462
if (settings.debugEspNow == true)
463463
systemPrintf(
464-
"ERROR: Failed to add ESP-NOW peer %02x:%02x:%02x:%02x:%02x:%02x, status: %d, %s\r\n",
464+
"ERROR: Failed to add ESP-NOW peer %02X:%02X:%02X:%02X:%02X:%02X, status: %d, %s\r\n",
465465
settings.espnowPeers[index][0], settings.espnowPeers[index][1],
466466
settings.espnowPeers[index][2], settings.espnowPeers[index][3],
467467
settings.espnowPeers[index][4], settings.espnowPeers[index][5], status,
@@ -596,13 +596,13 @@ bool espNowStop()
596596
status = espNowRemovePeer(peerInfo.peer_addr);
597597
if (status != ESP_OK)
598598
{
599-
systemPrintf("ERROR: Failed to delete peer %02x:%02x:%02x:%02x:%02x:%02x, status: %d\r\n",
599+
systemPrintf("ERROR: Failed to delete peer %02X:%02X:%02X:%02X:%02X:%02X, status: %d\r\n",
600600
peerInfo.peer_addr[0], peerInfo.peer_addr[1], peerInfo.peer_addr[2], peerInfo.peer_addr[3],
601601
peerInfo.peer_addr[4], peerInfo.peer_addr[5], status);
602602
break;
603603
}
604604
if (settings.debugEspNow)
605-
systemPrintf("ESP-NOW removed peer %02x:%02x:%02x:%02x:%02x:%02x\r\n", peerInfo.peer_addr[0],
605+
systemPrintf("ESP-NOW removed peer %02X:%02X:%02X:%02X:%02X:%02X\r\n", peerInfo.peer_addr[0],
606606
peerInfo.peer_addr[1], peerInfo.peer_addr[2], peerInfo.peer_addr[3], peerInfo.peer_addr[4],
607607
peerInfo.peer_addr[5]);
608608
}

‎Firmware/RTK_Everywhere/Network.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -811,13 +811,13 @@ void networkDisplayMode()
811811
{
812812
if ((1 << mode) == rtkMode)
813813
{
814-
systemPrintf("rtkMode: 0x%02x (%s)\r\n", rtkMode, rtkModeName[mode]);
814+
systemPrintf("rtkMode: 0x%02X (%s)\r\n", rtkMode, rtkModeName[mode]);
815815
return;
816816
}
817817
}
818818

819819
// Illegal mode value
820-
systemPrintf("rtkMode: 0x%02x (Illegal value)\r\n", rtkMode);
820+
systemPrintf("rtkMode: 0x%02X (Illegal value)\r\n", rtkMode);
821821
}
822822

823823
//----------------------------------------

‎Firmware/RTK_Everywhere/System.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -869,6 +869,6 @@ void getMacAddresses(uint8_t *macAddress, const char *name, esp_mac_type_t type,
869869
if (status)
870870
systemPrintf("ERROR: Failed to get %s, status: %d, %s\r\n", name, status, esp_err_to_name(status));
871871
if (debug)
872-
systemPrintf("%02x:%02x:%02x:%02x:%02x:%02x - %s\r\n", macAddress[0], macAddress[1], macAddress[2],
872+
systemPrintf("%02X:%02X:%02X:%02X:%02X:%02X - %s\r\n", macAddress[0], macAddress[1], macAddress[2],
873873
macAddress[3], macAddress[4], macAddress[5], name);
874874
};

‎Firmware/RTK_Everywhere/WiFi.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1960,7 +1960,7 @@ void RTK_WIFI::stationEventHandler(arduino_event_id_t event, arduino_event_info_
19601960
case ARDUINO_EVENT_WIFI_STA_START:
19611961
WiFi.STA.macAddress((uint8_t *)_staMacAddress);
19621962
if (settings.debugWifiState)
1963-
systemPrintf("WiFi Event: Station start: MAC: %02x:%02x:%02x:%02x:%02x:%02x\r\n", _staMacAddress[0],
1963+
systemPrintf("WiFi Event: Station start: MAC: %02X:%02X:%02X:%02X:%02X:%02X\r\n", _staMacAddress[0],
19641964
_staMacAddress[1], _staMacAddress[2], _staMacAddress[3], _staMacAddress[4], _staMacAddress[5]);
19651965

19661966
// Fall through
@@ -2960,7 +2960,7 @@ bool RTK_WIFI::stopStart(WIFI_ACTION_t stopping, WIFI_ACTION_t starting)
29602960

29612961
// Display the ESP-NOW MAC address
29622962
_started = _started | WIFI_EN_ESP_NOW_ONLINE;
2963-
systemPrintf("WiFi: ESP-NOW online (%02x:%02x:%02x:%02x:%02x:%02x, channel: %d)\r\n", _staMacAddress[0],
2963+
systemPrintf("WiFi: ESP-NOW online (%02X:%02X:%02X:%02X:%02X:%02X, channel: %d)\r\n", _staMacAddress[0],
29642964
_staMacAddress[1], _staMacAddress[2], _staMacAddress[3], _staMacAddress[4], _staMacAddress[5],
29652965
wifiChannel);
29662966
}

‎Firmware/RTK_Everywhere/menuPP.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1128,7 +1128,7 @@ void pointperfectCreateTokenString(char *tokenBuffer, uint8_t *tokenArray, int t
11281128
for (int x = 0; x < tokenArrayLength; x++)
11291129
{
11301130
char temp[3];
1131-
snprintf(temp, sizeof(temp), "%02x", tokenArray[x]);
1131+
snprintf(temp, sizeof(temp), "%02X", tokenArray[x]);
11321132
strcat(tokenBuffer, temp);
11331133
if (x == 3 || x == 5 || x == 7 || x == 9)
11341134
strcat(tokenBuffer, "-");

‎Firmware/RTK_Everywhere/support.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ void dumpBuffer(uint8_t *buffer, uint16_t length)
624624

625625
// Display the data bytes
626626
for (index = 0; index < bytes; index++)
627-
systemPrintf("%02x ", buffer[index]);
627+
systemPrintf("%02X ", buffer[index]);
628628

629629
// Separate the data bytes from the ASCII
630630
for (; index < (16 - (offset & 0xf)); index++)
@@ -949,7 +949,7 @@ void printPartitionTable(void)
949949
do
950950
{
951951
const esp_partition_t *p = esp_partition_get(pi);
952-
systemPrintf("| %02x | %02x | 0x%06X | 0x%06X | %-16s |\r\n", p->type, p->subtype, p->address, p->size,
952+
systemPrintf("| %02X | %02X | 0x%06X | 0x%06X | %-16s |\r\n", p->type, p->subtype, p->address, p->size,
953953
p->label);
954954
} while ((pi = (esp_partition_next(pi))));
955955
}

0 commit comments

Comments
 (0)