mirror of
https://github.com/esp8266/Arduino.git
synced 2025-07-27 18:02:17 +03:00
Migrate from astyle to clang-format (#8464)
This commit is contained in:
committed by
Max Prokhorov
parent
46190b61f1
commit
19b7a29720
@ -1,4 +1,4 @@
|
||||
#define ESP8266WIFIMESH_DISABLE_COMPATIBILITY // Excludes redundant compatibility code. TODO: Should be used for new code until the compatibility code is removed with release 3.0.0 of the Arduino core.
|
||||
#define ESP8266WIFIMESH_DISABLE_COMPATIBILITY // Excludes redundant compatibility code. TODO: Should be used for new code until the compatibility code is removed with release 3.0.0 of the Arduino core.
|
||||
|
||||
#include <ESP8266WiFi.h>
|
||||
#include <EspnowMeshBackend.h>
|
||||
@ -19,26 +19,23 @@ namespace TypeCast = MeshTypeConversionFunctions;
|
||||
https://github.com/esp8266/Arduino/issues/1143
|
||||
https://arduino-esp8266.readthedocs.io/en/latest/PROGMEM.html
|
||||
*/
|
||||
constexpr char exampleMeshName[] PROGMEM = "MeshNode_"; // The name of the mesh network. Used as prefix for the node SSID and to find other network nodes in the example networkFilter and broadcastFilter functions below.
|
||||
constexpr char exampleWiFiPassword[] PROGMEM = "ChangeThisWiFiPassword_TODO"; // Note: " is an illegal character. The password has to be min 8 and max 64 characters long, otherwise an AP which uses it will not be found during scans.
|
||||
constexpr char exampleMeshName[] PROGMEM = "MeshNode_"; // The name of the mesh network. Used as prefix for the node SSID and to find other network nodes in the example networkFilter and broadcastFilter functions below.
|
||||
constexpr char exampleWiFiPassword[] PROGMEM = "ChangeThisWiFiPassword_TODO"; // Note: " is an illegal character. The password has to be min 8 and max 64 characters long, otherwise an AP which uses it will not be found during scans.
|
||||
|
||||
// A custom encryption key is required when using encrypted ESP-NOW transmissions. There is always a default Kok set, but it can be replaced if desired.
|
||||
// All ESP-NOW keys below must match in an encrypted connection pair for encrypted communication to be possible.
|
||||
// Note that it is also possible to use Strings as key seeds instead of arrays.
|
||||
uint8_t espnowEncryptedConnectionKey[16] = {0x33, 0x44, 0x33, 0x44, 0x33, 0x44, 0x33, 0x44, // This is the key for encrypting transmissions of encrypted connections.
|
||||
0x33, 0x44, 0x33, 0x44, 0x33, 0x44, 0x32, 0x11
|
||||
};
|
||||
uint8_t espnowEncryptionKok[16] = {0x22, 0x44, 0x33, 0x44, 0x33, 0x44, 0x33, 0x44, // This is the key for encrypting the encrypted connection key.
|
||||
0x33, 0x44, 0x33, 0x44, 0x33, 0x44, 0x32, 0x33
|
||||
};
|
||||
uint8_t espnowHashKey[16] = {0xEF, 0x44, 0x33, 0x0C, 0x33, 0x44, 0xFE, 0x44, // This is the secret key used for HMAC during encrypted connection requests.
|
||||
0x33, 0x44, 0x33, 0xB0, 0x33, 0x44, 0x32, 0xAD
|
||||
};
|
||||
uint8_t espnowEncryptedConnectionKey[16] = { 0x33, 0x44, 0x33, 0x44, 0x33, 0x44, 0x33, 0x44, // This is the key for encrypting transmissions of encrypted connections.
|
||||
0x33, 0x44, 0x33, 0x44, 0x33, 0x44, 0x32, 0x11 };
|
||||
uint8_t espnowEncryptionKok[16] = { 0x22, 0x44, 0x33, 0x44, 0x33, 0x44, 0x33, 0x44, // This is the key for encrypting the encrypted connection key.
|
||||
0x33, 0x44, 0x33, 0x44, 0x33, 0x44, 0x32, 0x33 };
|
||||
uint8_t espnowHashKey[16] = { 0xEF, 0x44, 0x33, 0x0C, 0x33, 0x44, 0xFE, 0x44, // This is the secret key used for HMAC during encrypted connection requests.
|
||||
0x33, 0x44, 0x33, 0xB0, 0x33, 0x44, 0x32, 0xAD };
|
||||
|
||||
unsigned int requestNumber = 0;
|
||||
unsigned int responseNumber = 0;
|
||||
|
||||
const char broadcastMetadataDelimiter = 23; // 23 = End-of-Transmission-Block (ETB) control character in ASCII
|
||||
const char broadcastMetadataDelimiter = 23; // 23 = End-of-Transmission-Block (ETB) control character in ASCII
|
||||
|
||||
String manageRequest(const String &request, MeshBackendBase &meshInstance);
|
||||
TransmissionStatusType manageResponse(const String &response, MeshBackendBase &meshInstance);
|
||||
@ -61,7 +58,7 @@ String manageRequest(const String &request, MeshBackendBase &meshInstance) {
|
||||
String transmissionEncrypted = espnowInstance->receivedEncryptedTransmission() ? F(", Encrypted transmission") : F(", Unencrypted transmission");
|
||||
Serial.print(String(F("ESP-NOW (")) + espnowInstance->getSenderMac() + transmissionEncrypted + F("): "));
|
||||
} else if (TcpIpMeshBackend *tcpIpInstance = TypeCast::meshBackendCast<TcpIpMeshBackend *>(&meshInstance)) {
|
||||
(void)tcpIpInstance; // This is useful to remove a "unused parameter" compiler warning. Does nothing else.
|
||||
(void)tcpIpInstance; // This is useful to remove a "unused parameter" compiler warning. Does nothing else.
|
||||
Serial.print(F("TCP/IP: "));
|
||||
} else {
|
||||
Serial.print(F("UNKNOWN!: "));
|
||||
@ -174,7 +171,7 @@ bool broadcastFilter(String &firstTransmission, EspnowMeshBackend &meshInstance)
|
||||
String targetMeshName = firstTransmission.substring(0, metadataEndIndex);
|
||||
|
||||
if (!targetMeshName.isEmpty() && meshInstance.getMeshName() != targetMeshName) {
|
||||
return false; // Broadcast is for another mesh network
|
||||
return false; // Broadcast is for another mesh network
|
||||
} else {
|
||||
// Remove metadata from message and mark as accepted broadcast.
|
||||
// Note that when you modify firstTransmission it is best to avoid using substring or other String methods that rely on null values for String length determination.
|
||||
@ -198,7 +195,7 @@ bool broadcastFilter(String &firstTransmission, EspnowMeshBackend &meshInstance)
|
||||
bool exampleTransmissionOutcomesUpdateHook(MeshBackendBase &meshInstance) {
|
||||
// Currently this is exactly the same as the default hook, but you can modify it to alter the behaviour of attemptTransmission.
|
||||
|
||||
(void)meshInstance; // This is useful to remove a "unused parameter" compiler warning. Does nothing else.
|
||||
(void)meshInstance; // This is useful to remove a "unused parameter" compiler warning. Does nothing else.
|
||||
|
||||
return true;
|
||||
}
|
||||
@ -221,7 +218,7 @@ bool exampleTransmissionOutcomesUpdateHook(MeshBackendBase &meshInstance) {
|
||||
bool exampleResponseTransmittedHook(bool transmissionSuccessful, const String &response, const uint8_t *recipientMac, uint32_t responseIndex, EspnowMeshBackend &meshInstance) {
|
||||
// Currently this is exactly the same as the default hook, but you can modify it to alter the behaviour of sendEspnowResponses.
|
||||
|
||||
(void)transmissionSuccessful; // This is useful to remove a "unused parameter" compiler warning. Does nothing else.
|
||||
(void)transmissionSuccessful; // This is useful to remove a "unused parameter" compiler warning. Does nothing else.
|
||||
(void)response;
|
||||
(void)recipientMac;
|
||||
(void)responseIndex;
|
||||
@ -281,8 +278,8 @@ void setup() {
|
||||
// Uncomment the lines below to use automatic AEAD encryption/decryption of messages sent/received.
|
||||
// All nodes this node wishes to communicate with must then also use encrypted messages with the same getEspnowMessageEncryptionKey(), or messages will not be accepted.
|
||||
// Note that using AEAD encrypted messages will reduce the number of message bytes that can be transmitted.
|
||||
//espnowNode.setEspnowMessageEncryptionKey(F("ChangeThisKeySeed_TODO")); // The message encryption key should always be set manually. Otherwise a default key (all zeroes) is used.
|
||||
//espnowNode.setUseEncryptedMessages(true);
|
||||
// espnowNode.setEspnowMessageEncryptionKey(F("ChangeThisKeySeed_TODO")); // The message encryption key should always be set manually. Otherwise a default key (all zeroes) is used.
|
||||
// espnowNode.setUseEncryptedMessages(true);
|
||||
}
|
||||
|
||||
int32_t timeOfLastScan = -10000;
|
||||
@ -293,10 +290,10 @@ void loop() {
|
||||
// Note that depending on the amount of responses to send and their length, this method can take tens or even hundreds of milliseconds to complete.
|
||||
// More intense transmission activity and less frequent calls to performEspnowMaintenance will likely cause the method to take longer to complete, so plan accordingly.
|
||||
|
||||
//Should not be used inside responseHandler, requestHandler, networkFilter or broadcastFilter callbacks since performEspnowMaintenance() can alter the ESP-NOW state.
|
||||
// Should not be used inside responseHandler, requestHandler, networkFilter or broadcastFilter callbacks since performEspnowMaintenance() can alter the ESP-NOW state.
|
||||
EspnowMeshBackend::performEspnowMaintenance();
|
||||
|
||||
if (millis() - timeOfLastScan > 10000) { // Give other nodes some time to connect between data transfers.
|
||||
if (millis() - timeOfLastScan > 10000) { // Give other nodes some time to connect between data transfers.
|
||||
Serial.println(F("\nPerforming unencrypted ESP-NOW transmissions."));
|
||||
|
||||
uint32_t startTime = millis();
|
||||
@ -310,9 +307,7 @@ void loop() {
|
||||
espnowDelay(100);
|
||||
|
||||
// One way to check how attemptTransmission worked out
|
||||
if (espnowNode.latestTransmissionSuccessful()) {
|
||||
Serial.println(F("Transmission successful."));
|
||||
}
|
||||
if (espnowNode.latestTransmissionSuccessful()) { Serial.println(F("Transmission successful.")); }
|
||||
|
||||
// Another way to check how attemptTransmission worked out
|
||||
if (espnowNode.latestTransmissionOutcomes().empty()) {
|
||||
@ -343,20 +338,20 @@ void loop() {
|
||||
espnowNode.broadcast(broadcastMetadata + broadcastMessage);
|
||||
Serial.println(String(F("Broadcast to all mesh nodes done in ")) + String(millis() - startTime) + F(" ms."));
|
||||
|
||||
espnowDelay(100); // Wait for responses (broadcasts can receive an unlimited number of responses, other transmissions can only receive one response).
|
||||
espnowDelay(100); // Wait for responses (broadcasts can receive an unlimited number of responses, other transmissions can only receive one response).
|
||||
|
||||
// If you have a data array containing null values it is possible to transmit the raw data by making the array into a multiString as shown below.
|
||||
// You can use String::c_str() or String::begin() to retrieve the data array later.
|
||||
// Note that certain String methods such as String::substring use null values to determine String length, which means they will not work as normal with multiStrings.
|
||||
uint8_t dataArray[] = {0, '\'', 0, '\'', ' ', '(', 'n', 'u', 'l', 'l', ')', ' ', 'v', 'a', 'l', 'u', 'e'};
|
||||
uint8_t dataArray[] = { 0, '\'', 0, '\'', ' ', '(', 'n', 'u', 'l', 'l', ')', ' ', 'v', 'a', 'l', 'u', 'e' };
|
||||
String espnowMessage = TypeCast::uint8ArrayToMultiString(dataArray, sizeof dataArray) + F(" from ") + espnowNode.getMeshName() + espnowNode.getNodeID() + String('.');
|
||||
Serial.println(String(F("\nTransmitting: ")) + espnowMessage);
|
||||
espnowNode.attemptTransmission(espnowMessage, false);
|
||||
espnowDelay(100); // Wait for response.
|
||||
espnowDelay(100); // Wait for response.
|
||||
|
||||
Serial.println(F("\nPerforming encrypted ESP-NOW transmissions."));
|
||||
|
||||
uint8_t targetBSSID[6] {0};
|
||||
uint8_t targetBSSID[6]{ 0 };
|
||||
|
||||
// We can create encrypted connections to individual nodes so that all ESP-NOW communication with the node will be encrypted.
|
||||
if (espnowNode.constConnectionQueue()[0].getBSSID(targetBSSID) && espnowNode.requestEncryptedConnection(targetBSSID) == EncryptedConnectionStatus::CONNECTION_ESTABLISHED) {
|
||||
@ -369,7 +364,7 @@ void loop() {
|
||||
String espnowMessage = String(F("This message is encrypted only when received by node ")) + peerMac;
|
||||
Serial.println(String(F("\nTransmitting: ")) + espnowMessage);
|
||||
espnowNode.attemptTransmission(espnowMessage, false);
|
||||
espnowDelay(100); // Wait for response.
|
||||
espnowDelay(100); // Wait for response.
|
||||
|
||||
// A connection can be serialized and stored for later use.
|
||||
// Note that this saves the current state only, so if encrypted communication between the nodes happen after this, the stored state is invalid.
|
||||
@ -383,7 +378,7 @@ void loop() {
|
||||
espnowMessage = String(F("This message is no longer encrypted when received by node ")) + peerMac;
|
||||
Serial.println(String(F("\nTransmitting: ")) + espnowMessage);
|
||||
espnowNode.attemptTransmission(espnowMessage, false);
|
||||
espnowDelay(100); // Wait for response.
|
||||
espnowDelay(100); // Wait for response.
|
||||
Serial.println(F("Cannot read the encrypted response..."));
|
||||
|
||||
// Let's re-add our stored connection so we can communicate properly with targetBSSID again!
|
||||
@ -392,7 +387,7 @@ void loop() {
|
||||
espnowMessage = String(F("This message is once again encrypted when received by node ")) + peerMac;
|
||||
Serial.println(String(F("\nTransmitting: ")) + espnowMessage);
|
||||
espnowNode.attemptTransmission(espnowMessage, false);
|
||||
espnowDelay(100); // Wait for response.
|
||||
espnowDelay(100); // Wait for response.
|
||||
|
||||
Serial.println();
|
||||
// If we want to remove the encrypted connection on both nodes, we can do it like this.
|
||||
@ -403,7 +398,7 @@ void loop() {
|
||||
espnowMessage = String(F("This message is only received by node ")) + peerMac + F(". Transmitting in this way will not change the transmission state of the sender.");
|
||||
Serial.println(String(F("Transmitting: ")) + espnowMessage);
|
||||
espnowNode.attemptTransmission(espnowMessage, EspnowNetworkInfo(targetBSSID));
|
||||
espnowDelay(100); // Wait for response.
|
||||
espnowDelay(100); // Wait for response.
|
||||
|
||||
Serial.println();
|
||||
|
||||
@ -423,7 +418,7 @@ void loop() {
|
||||
espnowMessage = String(F("Due to encrypted connection expiration, this message is no longer encrypted when received by node ")) + peerMac;
|
||||
Serial.println(String(F("\nTransmitting: ")) + espnowMessage);
|
||||
espnowNode.attemptTransmission(espnowMessage, false);
|
||||
espnowDelay(100); // Wait for response.
|
||||
espnowDelay(100); // Wait for response.
|
||||
}
|
||||
|
||||
// Or if we prefer we can just let the library automatically create brief encrypted connections which are long enough to transmit an encrypted message.
|
||||
@ -432,9 +427,9 @@ void loop() {
|
||||
espnowMessage = F("This message is always encrypted, regardless of receiver.");
|
||||
Serial.println(String(F("\nTransmitting: ")) + espnowMessage);
|
||||
espnowNode.attemptAutoEncryptingTransmission(espnowMessage);
|
||||
espnowDelay(100); // Wait for response.
|
||||
espnowDelay(100); // Wait for response.
|
||||
} else {
|
||||
Serial.println(String(F("Ooops! Encrypted connection removal failed. Status: ")) + String(static_cast<int>(removalOutcome)));
|
||||
Serial.println(String(F("Ooops! Encrypted connection removal failed. Status: ")) + String(static_cast<int>(removalOutcome)));
|
||||
}
|
||||
|
||||
// Finally, should you ever want to stop other parties from sending unencrypted messages to the node
|
||||
@ -445,8 +440,7 @@ void loop() {
|
||||
}
|
||||
|
||||
// Our last request was sent to all nodes found, so time to create a new request.
|
||||
espnowNode.setMessage(String(F("Hello world request #")) + String(++requestNumber) + F(" from ")
|
||||
+ espnowNode.getMeshName() + espnowNode.getNodeID() + String('.'));
|
||||
espnowNode.setMessage(String(F("Hello world request #")) + String(++requestNumber) + F(" from ") + espnowNode.getMeshName() + espnowNode.getNodeID() + String('.'));
|
||||
}
|
||||
|
||||
Serial.println();
|
||||
|
Reference in New Issue
Block a user