Skip to content

Commit aede48b

Browse files
nseidlenseidle
committed
Whitespace
1 parent d0005f8 commit aede48b

File tree

1 file changed

+44
-69
lines changed

1 file changed

+44
-69
lines changed

‎Firmware/RTK_Everywhere/ESPNOW.ino

Lines changed: 44 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ typedef struct _ESP_NOW_PAIR_MESSAGE
4343
uint16_t espNowBytesSent; // May be more than 255
4444
unsigned long espNowLastAdd; // Tracks how long since the last byte was added to the outgoing buffer
4545
unsigned long espNowLastRssiUpdate;
46-
uint8_t espNowOutgoing[250]; // ESP NOW has max of 250 characters
47-
uint8_t espNowOutgoingSpot; // ESP Now has a max of 250 characters
46+
uint8_t espNowOutgoing[250]; // ESP NOW has max of 250 characters
47+
uint8_t espNowOutgoingSpot; // ESP Now has a max of 250 characters
4848
uint8_t espNowReceivedMAC[6]; // Holds the MAC received during pairing
4949
ESPNOWState espNowState;
5050

5151
//*********************************************************************
5252
// Add a peer to the ESP-NOW network
53-
esp_err_t espNowAddPeer(const uint8_t * peerMac, bool encrypt)
53+
esp_err_t espNowAddPeer(const uint8_t *peerMac, bool encrypt)
5454
{
5555
esp_now_peer_info_t peerInfo;
5656

@@ -66,14 +66,12 @@ 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",
70-
peerMac[0], peerMac[1], peerMac[2], peerMac[3],
71-
peerMac[4], peerMac[5], result, esp_err_to_name(result));
69+
systemPrintf("ERROR: Failed to add ESP-NOW peer %02x:%02x:%02x:%02x:%02x:%02x, result: %d (%s)\r\n", peerMac[0],
70+
peerMac[1], peerMac[2], peerMac[3], peerMac[4], peerMac[5], result, esp_err_to_name(result));
7271
}
7372
else if (settings.debugEspNow)
74-
systemPrintf("Added ESP-NOW peer %02x:%02x:%02x:%02x:%02x:%02x\r\n",
75-
peerMac[0], peerMac[1], peerMac[2], peerMac[3],
76-
peerMac[4], peerMac[5]);
73+
systemPrintf("Added ESP-NOW peer %02x:%02x:%02x:%02x:%02x:%02x\r\n", peerMac[0], peerMac[1], peerMac[2],
74+
peerMac[3], peerMac[4], peerMac[5]);
7775
return result;
7876
}
7977

@@ -92,7 +90,7 @@ void espNowBeginPairing()
9290
{
9391
settings.enableEspNow = true;
9492
recordSystemSettings();
95-
93+
9694
if (settings.debugEspNow)
9795
systemPrintln("espNowBeginPairing enabling ESP-NOW");
9896
}
@@ -115,25 +113,22 @@ bool espNowIsPaired()
115113

116114
//*********************************************************************
117115
// Callback when data is received
118-
void espNowOnDataReceived(const esp_now_recv_info *mac,
119-
const uint8_t *incomingData,
120-
int len)
116+
void espNowOnDataReceived(const esp_now_recv_info *mac, const uint8_t *incomingData, int len)
121117
{
122-
// typedef struct esp_now_recv_info {
123-
// uint8_t * src_addr; // Source address of ESPNOW packet
124-
// uint8_t * des_addr; // Destination address of ESPNOW packet
125-
// wifi_pkt_rx_ctrl_t * rx_ctrl; // Rx control info of ESPNOW packet
126-
// } esp_now_recv_info_t;
118+
// typedef struct esp_now_recv_info {
119+
// uint8_t * src_addr; // Source address of ESPNOW packet
120+
// uint8_t * des_addr; // Destination address of ESPNOW packet
121+
// wifi_pkt_rx_ctrl_t * rx_ctrl; // Rx control info of ESPNOW packet
122+
// } esp_now_recv_info_t;
127123

128124
// Display the packet
129125
if (settings.debugEspNow == true)
130126
{
131-
systemPrintf("*** ESP-NOW: RX %02x:%02x:%02x:%02x:%02x:%02x --> %02x:%02x:%02x:%02x:%02x:%02x, %d bytes, rssi: %d\r\n",
132-
mac->src_addr[0], mac->src_addr[1], mac->src_addr[2],
133-
mac->src_addr[3], mac->src_addr[4], mac->src_addr[5],
134-
mac->des_addr[0], mac->des_addr[1], mac->des_addr[2],
135-
mac->des_addr[3], mac->des_addr[4], mac->des_addr[5],
136-
len, packetRSSI);
127+
systemPrintf(
128+
"*** ESP-NOW: RX %02x:%02x:%02x:%02x:%02x:%02x --> %02x:%02x:%02x:%02x:%02x:%02x, %d bytes, rssi: %d\r\n",
129+
mac->src_addr[0], mac->src_addr[1], mac->src_addr[2], mac->src_addr[3], mac->src_addr[4], mac->src_addr[5],
130+
mac->des_addr[0], mac->des_addr[1], mac->des_addr[2], mac->des_addr[3], mac->des_addr[4], mac->des_addr[5],
131+
len, packetRSSI);
137132
}
138133

139134
if (espNowState == ESPNOW_PAIRING)
@@ -304,15 +299,11 @@ esp_err_t espNowRemovePeer(const uint8_t *peerMac)
304299
{
305300
if (result != ESP_OK)
306301
systemPrintf("ERROR: Failed to remove ESP-NOW peer %02x:%02x:%02x:%02x:%02x:%02x, result: %s\r\n",
307-
peerMac[0], peerMac[1],
308-
peerMac[2], peerMac[3],
309-
peerMac[4], peerMac[5],
302+
peerMac[0], peerMac[1], peerMac[2], peerMac[3], peerMac[4], peerMac[5],
310303
esp_err_to_name(result));
311304
else
312-
systemPrintf("Removed ESP-NOW peer %02x:%02x:%02x:%02x:%02x:%02x\r\n",
313-
peerMac[0], peerMac[1],
314-
peerMac[2], peerMac[3],
315-
peerMac[4], peerMac[5]);
305+
systemPrintf("Removed ESP-NOW peer %02x:%02x:%02x:%02x:%02x:%02x\r\n", peerMac[0], peerMac[1], peerMac[2],
306+
peerMac[3], peerMac[4], peerMac[5]);
316307
}
317308
return result;
318309
}
@@ -340,18 +331,13 @@ esp_err_t espNowSendPairMessage(const uint8_t *sendToMac)
340331
// Update the state of the ESP-NOW subsystem
341332
void espNowSetState(ESPNOWState newState)
342333
{
343-
const char * name[] =
344-
{
345-
"ESPNOW_OFF",
346-
"ESPNOW_BROADCASTING",
347-
"ESPNOW_PAIRING",
348-
"ESPNOW_MAC_RECEIVED",
349-
"ESPNOW_PAIRED",
334+
const char *name[] = {
335+
"ESPNOW_OFF", "ESPNOW_BROADCASTING", "ESPNOW_PAIRING", "ESPNOW_MAC_RECEIVED", "ESPNOW_PAIRED",
350336
};
351337
const int nameCount = sizeof(name) / sizeof(name[0]);
352-
const char * newName;
338+
const char *newName;
353339
char nLine[80];
354-
const char * oldName;
340+
const char *oldName;
355341
char oLine[80];
356342

357343
if (settings.debugEspNow == true)
@@ -455,12 +441,9 @@ bool espNowStart()
455441
{
456442
if (settings.debugEspNow == true)
457443
systemPrintf("ESP-NOW peer %02x:%02x:%02x:%02x:%02x:%02x, status: already exists\r\n",
458-
settings.espnowPeers[index][0],
459-
settings.espnowPeers[index][1],
460-
settings.espnowPeers[index][2],
461-
settings.espnowPeers[index][3],
462-
settings.espnowPeers[index][4],
463-
settings.espnowPeers[index][5]);
444+
settings.espnowPeers[index][0], settings.espnowPeers[index][1],
445+
settings.espnowPeers[index][2], settings.espnowPeers[index][3],
446+
settings.espnowPeers[index][4], settings.espnowPeers[index][5]);
464447
}
465448
else
466449
{
@@ -470,24 +453,19 @@ bool espNowStart()
470453
{
471454
if (settings.debugEspNow == true)
472455
systemPrintf("Added ESP-NOW peer %02x:%02x:%02x:%02x:%02x:%02x\r\n",
473-
settings.espnowPeers[index][0],
474-
settings.espnowPeers[index][1],
475-
settings.espnowPeers[index][2],
476-
settings.espnowPeers[index][3],
477-
settings.espnowPeers[index][4],
478-
settings.espnowPeers[index][5]);
456+
settings.espnowPeers[index][0], settings.espnowPeers[index][1],
457+
settings.espnowPeers[index][2], settings.espnowPeers[index][3],
458+
settings.espnowPeers[index][4], settings.espnowPeers[index][5]);
479459
}
480460
else
481461
{
482462
if (settings.debugEspNow == true)
483-
systemPrintf("ERROR: Failed to add ESP-NOW peer %02x:%02x:%02x:%02x:%02x:%02x, status: %d, %s\r\n",
484-
settings.espnowPeers[index][0],
485-
settings.espnowPeers[index][1],
486-
settings.espnowPeers[index][2],
487-
settings.espnowPeers[index][3],
488-
settings.espnowPeers[index][4],
489-
settings.espnowPeers[index][5],
490-
status, esp_err_to_name(status));
463+
systemPrintf(
464+
"ERROR: Failed to add ESP-NOW peer %02x:%02x:%02x:%02x:%02x:%02x, status: %d, %s\r\n",
465+
settings.espnowPeers[index][0], settings.espnowPeers[index][1],
466+
settings.espnowPeers[index][2], settings.espnowPeers[index][3],
467+
settings.espnowPeers[index][4], settings.espnowPeers[index][5], status,
468+
esp_err_to_name(status));
491469
break;
492470
}
493471
}
@@ -619,17 +597,14 @@ bool espNowStop()
619597
if (status != ESP_OK)
620598
{
621599
systemPrintf("ERROR: Failed to delete peer %02x:%02x:%02x:%02x:%02x:%02x, status: %d\r\n",
622-
peerInfo.peer_addr[0], peerInfo.peer_addr[1],
623-
peerInfo.peer_addr[2], peerInfo.peer_addr[3],
624-
peerInfo.peer_addr[4], peerInfo.peer_addr[5],
625-
status);
600+
peerInfo.peer_addr[0], peerInfo.peer_addr[1], peerInfo.peer_addr[2], peerInfo.peer_addr[3],
601+
peerInfo.peer_addr[4], peerInfo.peer_addr[5], status);
626602
break;
627603
}
628604
if (settings.debugEspNow)
629-
systemPrintf("ESP-NOW removed peer %02x:%02x:%02x:%02x:%02x:%02x\r\n",
630-
peerInfo.peer_addr[0], peerInfo.peer_addr[1],
631-
peerInfo.peer_addr[2], peerInfo.peer_addr[3],
632-
peerInfo.peer_addr[4], peerInfo.peer_addr[5]);
605+
systemPrintf("ESP-NOW removed peer %02x:%02x:%02x:%02x:%02x:%02x\r\n", peerInfo.peer_addr[0],
606+
peerInfo.peer_addr[1], peerInfo.peer_addr[2], peerInfo.peer_addr[3], peerInfo.peer_addr[4],
607+
peerInfo.peer_addr[5]);
633608
}
634609
if (status != ESP_ERR_ESPNOW_NOT_FOUND)
635610
{
@@ -712,4 +687,4 @@ void espNowUpdate()
712687
}
713688
}
714689

715-
#endif // COMPILE_ESPNOW
690+
#endif // COMPILE_ESPNOW

0 commit comments

Comments
 (0)