Merge remote-tracking branch 'upstream/dev' into keymindCascade
# Conflicts: # examples/companion_radio/ui-new/UITask.cpp # examples/companion_radio/ui-orig/UITask.cpp # examples/companion_radio/ui-tiny/UITask.cpp # examples/simple_repeater/MyMesh.cpp # src/Mesh.cpp # src/Mesh.h # src/helpers/ESP32Board.cpp # src/helpers/ESP32Board.h # src/helpers/SimpleMeshTables.h # variants/heltec_v3/HeltecV3Board.h # variants/tenstar_c3/target.h
This commit is contained in:
commit
84c166d5cc
53 files changed
+1057
-130
No files matched your search
@@ -41,7 +41,7 @@ void ESPNowBridge::begin() {
|
||||
// Initialize WiFi in station mode
|
||||
WiFi.mode(WIFI_STA);
|
||||
|
||||
// Set wifi channel
|
||||
// Set Wi-Fi channel
|
||||
if (esp_wifi_set_channel(_prefs->bridge_channel, WIFI_SECOND_CHAN_NONE) != ESP_OK) {
|
||||
BRIDGE_DEBUG_PRINTLN("Error setting WIFI channel to %d\n", _prefs->bridge_channel);
|
||||
return;
|
||||
@@ -176,7 +176,8 @@ void ESPNowBridge::sendPacket(mesh::Packet *packet) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!_seen_packets.hasSeen(packet)) {
|
||||
if (!_seen_packets.wasSeen(packet)) {
|
||||
_seen_packets.markSeen(packet);
|
||||
// Create a temporary buffer just for size calculation and reuse for actual writing
|
||||
uint8_t sizingBuffer[MAX_PAYLOAD_SIZE];
|
||||
uint16_t meshPacketLen = packet->writeTo(sizingBuffer);
|
||||
|
||||
Reference in new issue
Block a user