mirror of
https://github.com/esp8266/Arduino.git
synced 2025-07-23 08:45:22 +03:00
Allman now (#6080)
* switch restyle script for CI * remove confirmation * restyle with allman
This commit is contained in:
Allman-astyler
committed by
david gauchard
david gauchard
parent
625c3a62c4
commit
98125f8860
@ -1,22 +1,22 @@
|
||||
/*
|
||||
Old version of ESP8266WiFiMesh.cpp - Mesh network node
|
||||
Sets up a Mesh Node which acts as a router, creating a Mesh Network with other nodes. All information
|
||||
is passed in both directions, but it is up to the user what the data sent is and how it is dealt with.
|
||||
|
||||
Copyright (c) 2015 Julian Fell. All rights reserved.
|
||||
Updated 2018 by Anders Löfgren.
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
This library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
Old version of ESP8266WiFiMesh.cpp - Mesh network node
|
||||
Sets up a Mesh Node which acts as a router, creating a Mesh Network with other nodes. All information
|
||||
is passed in both directions, but it is up to the user what the data sent is and how it is dealt with.
|
||||
|
||||
Copyright (c) 2015 Julian Fell. All rights reserved.
|
||||
Updated 2018 by Anders Löfgren.
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
This library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
|
||||
@ -25,13 +25,13 @@
|
||||
|
||||
|
||||
/********************************************************************************************
|
||||
* NOTE!
|
||||
*
|
||||
* All method signatures in this file are deprecated and will be removed in core version 2.5.0.
|
||||
* If you are still using these methods, please consider migrating to the new API shown in
|
||||
* the ESP8266WiFiMesh.h source file.
|
||||
*
|
||||
* TODO: delete this file.
|
||||
NOTE!
|
||||
|
||||
All method signatures in this file are deprecated and will be removed in core version 2.5.0.
|
||||
If you are still using these methods, please consider migrating to the new API shown in
|
||||
the ESP8266WiFiMesh.h source file.
|
||||
|
||||
TODO: delete this file.
|
||||
********************************************************************************************/
|
||||
|
||||
|
||||
@ -40,7 +40,7 @@
|
||||
|
||||
#include <Arduino.h>
|
||||
#include <ESP8266WiFi.h>
|
||||
#include <WiFiClient.h>
|
||||
#include <WiFiClient.h>
|
||||
#include <WiFiServer.h>
|
||||
|
||||
#include "ESP8266WiFiMesh.h"
|
||||
@ -51,131 +51,149 @@
|
||||
|
||||
// DEPRECATED!
|
||||
ESP8266WiFiMesh::ESP8266WiFiMesh(uint32_t chipID, ESP8266WiFiMesh::compatibilityLayerHandlerType handler)
|
||||
: _server(SERVER_PORT)
|
||||
: _server(SERVER_PORT)
|
||||
{
|
||||
_chipID = chipID;
|
||||
_SSID = String( String( SSID_PREFIX ) + String( _chipID ) );
|
||||
_ssidPrefix = String( SSID_PREFIX );
|
||||
_handler = handler;
|
||||
_chipID = chipID;
|
||||
_SSID = String(String(SSID_PREFIX) + String(_chipID));
|
||||
_ssidPrefix = String(SSID_PREFIX);
|
||||
_handler = handler;
|
||||
}
|
||||
|
||||
/**
|
||||
* Wait for a WiFiClient to connect
|
||||
*
|
||||
* @returns: True if the client is ready, false otherwise.
|
||||
*
|
||||
*/
|
||||
Wait for a WiFiClient to connect
|
||||
|
||||
@returns: True if the client is ready, false otherwise.
|
||||
|
||||
*/
|
||||
// DEPRECATED!
|
||||
bool ESP8266WiFiMesh::waitForClient(WiFiClient &currClient, int maxWait)
|
||||
{
|
||||
int wait = maxWait;
|
||||
while(currClient.connected() && !currClient.available() && wait--)
|
||||
delay(3);
|
||||
int wait = maxWait;
|
||||
while (currClient.connected() && !currClient.available() && wait--)
|
||||
{
|
||||
delay(3);
|
||||
}
|
||||
|
||||
/* Return false if the client isn't ready to communicate */
|
||||
if (WiFi.status() == WL_DISCONNECTED || !currClient.connected())
|
||||
return false;
|
||||
|
||||
return true;
|
||||
/* Return false if the client isn't ready to communicate */
|
||||
if (WiFi.status() == WL_DISCONNECTED || !currClient.connected())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Send the supplied message then read back the other node's response
|
||||
* and pass that to the user-supplied handler.
|
||||
*
|
||||
* @message The string to send to the node.
|
||||
* @returns: True if the exchange was a succes, false otherwise.
|
||||
*
|
||||
*/
|
||||
Send the supplied message then read back the other node's response
|
||||
and pass that to the user-supplied handler.
|
||||
|
||||
@message The string to send to the node.
|
||||
@returns: True if the exchange was a succes, false otherwise.
|
||||
|
||||
*/
|
||||
// DEPRECATED!
|
||||
bool ESP8266WiFiMesh::exchangeInfo(const char *message, WiFiClient &currClient)
|
||||
{
|
||||
currClient.println( message );
|
||||
currClient.println(message);
|
||||
|
||||
if (!waitForClient(currClient, 1000))
|
||||
return false;
|
||||
if (!waitForClient(currClient, 1000))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
String response = currClient.readStringUntil('\r');
|
||||
currClient.readStringUntil('\n');
|
||||
String response = currClient.readStringUntil('\r');
|
||||
currClient.readStringUntil('\n');
|
||||
|
||||
if (response.length() <= 2)
|
||||
return false;
|
||||
if (response.length() <= 2)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
/* Pass data to user callback */
|
||||
_handler(response);
|
||||
return true;
|
||||
/* Pass data to user callback */
|
||||
_handler(response);
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Connect to the AP at ssid, send them a message then disconnect.
|
||||
*
|
||||
* @targetSSID The name of the AP the other node has set up.
|
||||
* @message The string to send to the node.
|
||||
*
|
||||
*/
|
||||
Connect to the AP at ssid, send them a message then disconnect.
|
||||
|
||||
@targetSSID The name of the AP the other node has set up.
|
||||
@message The string to send to the node.
|
||||
|
||||
*/
|
||||
// DEPRECATED!
|
||||
void ESP8266WiFiMesh::connectToNode(const String &targetSSID, const char *message)
|
||||
{
|
||||
WiFiClient currClient;
|
||||
WiFi.begin( targetSSID.c_str() );
|
||||
WiFiClient currClient;
|
||||
WiFi.begin(targetSSID.c_str());
|
||||
|
||||
int wait = 1500;
|
||||
while((WiFi.status() == WL_DISCONNECTED) && wait--)
|
||||
delay(3);
|
||||
int wait = 1500;
|
||||
while ((WiFi.status() == WL_DISCONNECTED) && wait--)
|
||||
{
|
||||
delay(3);
|
||||
}
|
||||
|
||||
/* If the connection timed out */
|
||||
if (WiFi.status() != 3)
|
||||
return;
|
||||
/* If the connection timed out */
|
||||
if (WiFi.status() != 3)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
/* Connect to the node's server */
|
||||
if (!currClient.connect(SERVER_IP_ADDR, SERVER_PORT))
|
||||
return;
|
||||
/* Connect to the node's server */
|
||||
if (!currClient.connect(SERVER_IP_ADDR, SERVER_PORT))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (!exchangeInfo(message, currClient))
|
||||
return;
|
||||
if (!exchangeInfo(message, currClient))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
currClient.stop();
|
||||
WiFi.disconnect();
|
||||
currClient.stop();
|
||||
WiFi.disconnect();
|
||||
}
|
||||
|
||||
// DEPRECATED!
|
||||
void ESP8266WiFiMesh::attemptScanKernel(const char *message)
|
||||
{
|
||||
/* Scan for APs */
|
||||
int n = WiFi.scanNetworks();
|
||||
/* Scan for APs */
|
||||
int n = WiFi.scanNetworks();
|
||||
|
||||
for (int i = 0; i < n; ++i) {
|
||||
String currentSSID = WiFi.SSID(i);
|
||||
int index = currentSSID.indexOf( _ssidPrefix );
|
||||
uint32_t targetChipID = (currentSSID.substring(index + _ssidPrefix.length())).toInt();
|
||||
for (int i = 0; i < n; ++i)
|
||||
{
|
||||
String currentSSID = WiFi.SSID(i);
|
||||
int index = currentSSID.indexOf(_ssidPrefix);
|
||||
uint32_t targetChipID = (currentSSID.substring(index + _ssidPrefix.length())).toInt();
|
||||
|
||||
/* Connect to any _suitable_ APs which contain _ssidPrefix */
|
||||
if (index >= 0 && (targetChipID < _chipID)) {
|
||||
/* Connect to any _suitable_ APs which contain _ssidPrefix */
|
||||
if (index >= 0 && (targetChipID < _chipID))
|
||||
{
|
||||
|
||||
WiFi.mode(WIFI_STA);
|
||||
delay(100);
|
||||
connectToNode(currentSSID, message);
|
||||
WiFi.mode(WIFI_AP_STA);
|
||||
delay(100);
|
||||
}
|
||||
}
|
||||
WiFi.mode(WIFI_STA);
|
||||
delay(100);
|
||||
connectToNode(currentSSID, message);
|
||||
WiFi.mode(WIFI_AP_STA);
|
||||
delay(100);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// DEPRECATED!
|
||||
void ESP8266WiFiMesh::attemptScan(const String &message)
|
||||
{
|
||||
attemptScanKernel(message.c_str());
|
||||
attemptScanKernel(message.c_str());
|
||||
}
|
||||
|
||||
// DEPRECATED!
|
||||
void ESP8266WiFiMesh::attemptScan(char *message)
|
||||
{
|
||||
attemptScanKernel(message);
|
||||
attemptScanKernel(message);
|
||||
}
|
||||
|
||||
// DEPRECATED!
|
||||
template<size_t Size>
|
||||
void ESP8266WiFiMesh::attemptScan(char (&message)[Size])
|
||||
{
|
||||
attemptScanKernel(message);
|
||||
attemptScanKernel(message);
|
||||
}
|
||||
Reference in New Issue
Block a user