Skip to content

Commit

Permalink
run clang format (#369)
Browse files Browse the repository at this point in the history 
Let's do this first, thanks :)
  • Loading branch information
@israpps
israpps authored Sep 11, 2022
1 parent 0623280 commit c1e445d
Show file tree
Hide file tree
Showing 30 changed files with 34,212 additions and 34,001 deletions.
2 changes: 1 addition & 1 deletion .clang-format
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ KeepEmptyLinesAtTheStartOfBlocks: true
MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 3
NamespaceIndentation: None
NamespaceIndentation: All
ObjCBlockIndentWidth: 2
ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: true
Expand Down
257 changes: 140 additions & 117 deletions PersWiFiManager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,143 +13,166 @@
// static const char wifi_htm[] PROGMEM = R"=====(<!DOCTYPE html><html> <head> <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" /> <title>ESP WiFi</title> <script> function setSSID(ssid) { document.getElementById("s").value = ssid; document.getElementById("wl").style.display = "none"; } function scan() { const request = new XMLHttpRequest(); const wl = document.getElementById("wl"); document.getElementById("wl").style.display = "block"; wl.innerHTML = "Scanning..."; request.onreadystatechange = function () { if (this.readyState == 4 && this.status == 200) { wl.innerHTML = "Scanning..."; const lines = this.responseText.split("\n"); wl.innerHTML = "<ul>" + lines .map((line) => { const [, status, ssid] = line.split(","); return `<li onclick="setSSID('${ssid}')"><span>${ status === "1" ? " \uD83D\uDD12" : " \u26A0" }</span> ${ssid}</li>`; }) .join("") + "</ul>"; } }; request.open("GET", "wifi/list", true); request.send(); } </script> <style> body { background-color: #202020; text-align: center; font-family: verdana; color: #00c0fb; } a, #wl { text-decoration: none; color: #00c0fb; font-size: 14px; } a { cursor: pointer; } .btn, input { box-sizing: border-box; width: 100%; line-height: 34px; appearance: none; background-color: #292929; border-radius: 4px; border: 1px dashed rgba(0, 192, 251, 0.2); color: rgba(0, 192, 251, 0.6); cursor: pointer; font-family: inherit; font-size: 14px; font-weight: 300; margin: 0 0 8px 0; outline: 0; overflow: hidden; padding: 4px 8px; user-select: none; transition: all 0.2s linear; } .btn[active], .btn:hover { color: #00c0fb; border: 1px solid #00c0fb; box-shadow: inset 0 0 6px 4px rgba(0, 192, 251, 0.2), 0 0 6px 4px rgba(0, 192, 251, 0.2); } .btn.secondary { color: rgba(234, 182, 56, 0.7); border: 1px dashed rgba(234, 182, 56, 0.3); } .btn.secondary[active], .btn.secondary:hover { transform: scale(0.98); color: black; box-shadow: inset 0 0 6px 4px rgba(234, 182, 56, 0.2), 0 0 6px 8px rgba(234, 182, 56, 0.2); background-color: rgba(234, 182, 56, 0.7); } .container { text-align: left; display: inline-block; max-width: 320px; padding: 5px; } .mb-16 { margin-bottom: 16px; } ul { list-style-type: none; padding: 0; } li { border-radius: 8px; padding: 6px; cursor: pointer; padding-left: 8px; padding-right: 8px; border: 1px solid transparent; } li:hover { border: 1px solid #00c0fb; } </style> </head> <body> <div class="container"> <button onclick="scan()" class="btn" active>&#x21bb; Scan</button> <p id="wl"></p> <form method="post" action="/wifi/connect"> <input id="s" name="n" length="32" placeholder="SSID" /> <input id="p" name="p" length="64" type="password" placeholder="password" class="mb-16" /> <button class="btn secondary" type="submit" active>Connect</button> </form> <div> <a href="javascript:history.back()">Back</a> | <a href="/">Home</a> </div> </div> </body></html>)=====";
// #endif

extern const char* device_hostname_full;
extern const char* device_hostname_partial;

PersWiFiManager::PersWiFiManager(AsyncWebServer& s, DNSServer& d) {
_server = &s;
_dnsServer = &d;
_apPass = "";
extern const char *device_hostname_full;
extern const char *device_hostname_partial;

PersWiFiManager::PersWiFiManager(AsyncWebServer &s, DNSServer &d)
{
_server = &s;
_dnsServer = &d;
_apPass = "";
} //PersWiFiManager

bool PersWiFiManager::attemptConnection(const String& ssid, const String& pass) {
//attempt to connect to wifi
WiFi.mode(WIFI_STA);
WiFi.hostname(device_hostname_partial); // _full // before WiFi.begin();
if (ssid.length()) {
if (pass.length()) WiFi.begin(ssid.c_str(), pass.c_str());
else WiFi.begin(ssid.c_str());
} else {
WiFi.begin();
}

//if in nonblock mode, skip this loop
_connectStartTime = millis();// + 1;
while (!_connectNonBlock && _connectStartTime) {
handleWiFi();
delay(10);
}

return (WiFi.status() == WL_CONNECTED);
bool PersWiFiManager::attemptConnection(const String &ssid, const String &pass)
{
//attempt to connect to wifi
WiFi.mode(WIFI_STA);
WiFi.hostname(device_hostname_partial); // _full // before WiFi.begin();
if (ssid.length()) {
if (pass.length())
WiFi.begin(ssid.c_str(), pass.c_str());
else
WiFi.begin(ssid.c_str());
} else {
WiFi.begin();
}

//if in nonblock mode, skip this loop
_connectStartTime = millis(); // + 1;
while (!_connectNonBlock && _connectStartTime) {
handleWiFi();
delay(10);
}

return (WiFi.status() == WL_CONNECTED);

} //attemptConnection

void PersWiFiManager::handleWiFi() {
if (!_connectStartTime) return;
void PersWiFiManager::handleWiFi()
{
if (!_connectStartTime)
return;

if (WiFi.status() == WL_CONNECTED) {
_connectStartTime = 0;
if (_connectHandler) _connectHandler();
return;
}
if (WiFi.status() == WL_CONNECTED) {
_connectStartTime = 0;
if (_connectHandler)
_connectHandler();
return;
}

//if failed or not connected and time is up
if ((WiFi.status() == WL_CONNECT_FAILED) || ((WiFi.status() != WL_CONNECTED) && ((millis() - _connectStartTime) > (1000 * WIFI_CONNECT_TIMEOUT)))) {
startApMode();
_connectStartTime = 0; //reset connect start time
}
//if failed or not connected and time is up
if ((WiFi.status() == WL_CONNECT_FAILED) || ((WiFi.status() != WL_CONNECTED) && ((millis() - _connectStartTime) > (1000 * WIFI_CONNECT_TIMEOUT)))) {
startApMode();
_connectStartTime = 0; //reset connect start time
}

} //handleWiFi

void PersWiFiManager::startApMode(){
//start AP mode
IPAddress apIP(192, 168, 4, 1);
WiFi.mode(WIFI_AP);
WiFi.softAPConfig(apIP, apIP, IPAddress(255, 255, 255, 0));
_apPass.length() ? WiFi.softAP(getApSsid().c_str(), _apPass.c_str(), 11) : WiFi.softAP(getApSsid().c_str());

_dnsServer->stop();
// set which return code will be used for all other domains (e.g. sending
// ServerFailure instead of NonExistentDomain will reduce number of queries
// sent by clients)
// default is DNSReplyCode::NonExistentDomain
//_dnsServer->setErrorReplyCode(DNSReplyCode::ServerFailure);
// modify TTL associated with the domain name (in seconds) // default is 60 seconds
_dnsServer->setTTL(300); // (in seconds) as per example
//_dnsServer->start((byte)53, device_hostname_full, apIP);
_dnsServer->start(53, "*", apIP);

if (_apHandler) _apHandler();
}//startApMode

void PersWiFiManager::setConnectNonBlock(bool b) {
_connectNonBlock = b;
void PersWiFiManager::startApMode()
{
//start AP mode
IPAddress apIP(192, 168, 4, 1);
WiFi.mode(WIFI_AP);
WiFi.softAPConfig(apIP, apIP, IPAddress(255, 255, 255, 0));
_apPass.length() ? WiFi.softAP(getApSsid().c_str(), _apPass.c_str(), 11) : WiFi.softAP(getApSsid().c_str());

_dnsServer->stop();
// set which return code will be used for all other domains (e.g. sending
// ServerFailure instead of NonExistentDomain will reduce number of queries
// sent by clients)
// default is DNSReplyCode::NonExistentDomain
//_dnsServer->setErrorReplyCode(DNSReplyCode::ServerFailure);
// modify TTL associated with the domain name (in seconds) // default is 60 seconds
_dnsServer->setTTL(300); // (in seconds) as per example
//_dnsServer->start((byte)53, device_hostname_full, apIP);
_dnsServer->start(53, "*", apIP);

if (_apHandler)
_apHandler();
} //startApMode

void PersWiFiManager::setConnectNonBlock(bool b)
{
_connectNonBlock = b;
} //setConnectNonBlock

void PersWiFiManager::setupWiFiHandlers() {
// note: removed DNS server setup here

_server->on("/wifi/list", HTTP_GET, [](AsyncWebServerRequest* request) {
//scan for wifi networks
int n = WiFi.scanComplete();
String s = "";
if (n == -2) {
WiFi.scanNetworks(true);
}
else if (n) {
//build array of indices
int ix[n];
for (int i = 0; i < n; i++) ix[i] = i;

//sort by signal strength
for (int i = 0; i < n; i++) for (int j = 1; j < n - i; j++) if (WiFi.RSSI(ix[j]) > WiFi.RSSI(ix[j - 1])) std::swap(ix[j], ix[j - 1]);
//remove duplicates
for (int i = 0; i < n; i++) for (int j = i + 1; j < n; j++) if (WiFi.SSID(ix[i]).equals(WiFi.SSID(ix[j])) && WiFi.encryptionType(ix[i]) == WiFi.encryptionType(ix[j])) ix[j] = -1;

s.reserve(2050);
//build plain text string of wifi info
//format [signal%]:[encrypted 0 or 1]:SSID
for (int i = 0; i < n && s.length() < 2000; i++) { //check s.length to limit memory usage
if (ix[i] != -1) {
s += String(i ? "\n" : "") + ((constrain(WiFi.RSSI(ix[i]), -100, -50) + 100) * 2) + ","
+ ((WiFi.encryptionType(ix[i]) == ENC_TYPE_NONE) ? 0 : 1) + "," + WiFi.SSID(ix[i]);
void PersWiFiManager::setupWiFiHandlers()
{
// note: removed DNS server setup here

_server->on("/wifi/list", HTTP_GET, [](AsyncWebServerRequest *request) {
//scan for wifi networks
int n = WiFi.scanComplete();
String s = "";
if (n == -2) {
WiFi.scanNetworks(true);
} else if (n) {
//build array of indices
int ix[n];
for (int i = 0; i < n; i++)
ix[i] = i;

//sort by signal strength
for (int i = 0; i < n; i++)
for (int j = 1; j < n - i; j++)
if (WiFi.RSSI(ix[j]) > WiFi.RSSI(ix[j - 1]))
std::swap(ix[j], ix[j - 1]);
//remove duplicates
for (int i = 0; i < n; i++)
for (int j = i + 1; j < n; j++)
if (WiFi.SSID(ix[i]).equals(WiFi.SSID(ix[j])) && WiFi.encryptionType(ix[i]) == WiFi.encryptionType(ix[j]))
ix[j] = -1;

s.reserve(2050);
//build plain text string of wifi info
//format [signal%]:[encrypted 0 or 1]:SSID
for (int i = 0; i < n && s.length() < 2000; i++) { //check s.length to limit memory usage
if (ix[i] != -1) {
s += String(i ? "\n" : "") + ((constrain(WiFi.RSSI(ix[i]), -100, -50) + 100) * 2) + "," + ((WiFi.encryptionType(ix[i]) == ENC_TYPE_NONE) ? 0 : 1) + "," + WiFi.SSID(ix[i]);
}
}
// don't cache found ssid's
WiFi.scanDelete();
}
}
// don't cache found ssid's
WiFi.scanDelete();
}
//send string to client
request->send(200, "text/plain", s);
}); //_server->on /wifi/list

// #ifdef WIFI_HTM_PROGMEM
// _server->on("/wifi.htm", HTTP_GET, [](AsyncWebServerRequest* request) {
// request->send(200, "text/html", FPSTR(wifi_htm));
// WiFi.scanNetworks(true); // early scan to have results ready on /wifi/list
// });
// #endif

}//setupWiFiHandlers

bool PersWiFiManager::begin(const String& ssid, const String& pass) {
setupWiFiHandlers();
return attemptConnection(ssid, pass); //switched order of these two for return
//send string to client
request->send(200, "text/plain", s);
}); //_server->on /wifi/list

// #ifdef WIFI_HTM_PROGMEM
// _server->on("/wifi.htm", HTTP_GET, [](AsyncWebServerRequest* request) {
// request->send(200, "text/html", FPSTR(wifi_htm));
// WiFi.scanNetworks(true); // early scan to have results ready on /wifi/list
// });
// #endif

} //setupWiFiHandlers

bool PersWiFiManager::begin(const String &ssid, const String &pass)
{
setupWiFiHandlers();
return attemptConnection(ssid, pass); //switched order of these two for return
} //begin

String PersWiFiManager::getApSsid() {
return _apSsid.length() ? _apSsid : "gbscontrol";
String PersWiFiManager::getApSsid()
{
return _apSsid.length() ? _apSsid : "gbscontrol";
} //getApSsid

void PersWiFiManager::setApCredentials(const String& apSsid, const String& apPass) {
if (apSsid.length()) _apSsid = apSsid;
if (apPass.length() >= 8) _apPass = apPass;
void PersWiFiManager::setApCredentials(const String &apSsid, const String &apPass)
{
if (apSsid.length())
_apSsid = apSsid;
if (apPass.length() >= 8)
_apPass = apPass;
} //setApCredentials

void PersWiFiManager::onConnect(WiFiChangeHandlerFunction fn) {
_connectHandler = fn;
void PersWiFiManager::onConnect(WiFiChangeHandlerFunction fn)
{
_connectHandler = fn;
}

void PersWiFiManager::onAp(WiFiChangeHandlerFunction fn) {
_apHandler = fn;
void PersWiFiManager::onAp(WiFiChangeHandlerFunction fn)
{
_apHandler = fn;
}
#endif
22 changes: 11 additions & 11 deletions PersWiFiManager.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@

#define WIFI_CONNECT_TIMEOUT 45

class PersWiFiManager {

public:
class PersWiFiManager
{

public:
typedef std::function<void(void)> WiFiChangeHandlerFunction;

PersWiFiManager(AsyncWebServer& s, DNSServer& d);
PersWiFiManager(AsyncWebServer &s, DNSServer &d);

bool attemptConnection(const String& ssid = "", const String& pass = "");
bool attemptConnection(const String &ssid = "", const String &pass = "");

void setupWiFiHandlers();

bool begin(const String& ssid = "", const String& pass = "");
bool begin(const String &ssid = "", const String &pass = "");

String getApSsid();

void setApCredentials(const String& apSsid, const String& apPass = "");
void setApCredentials(const String &apSsid, const String &apPass = "");

void setConnectNonBlock(bool b);

Expand All @@ -44,9 +44,9 @@ class PersWiFiManager {

void onAp(WiFiChangeHandlerFunction fn);

private:
AsyncWebServer * _server;
DNSServer * _dnsServer;
private:
AsyncWebServer *_server;
DNSServer *_dnsServer;
String _apSsid, _apPass;

bool _connectNonBlock;
Expand All @@ -55,7 +55,7 @@ class PersWiFiManager {
WiFiChangeHandlerFunction _connectHandler;
WiFiChangeHandlerFunction _apHandler;

};//class
}; //class

#endif
#endif
12 changes: 7 additions & 5 deletions fastpin.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@

#include <pins_arduino.h>

static inline uint8_t volatile* portToInput(uint8_t port) {
return reinterpret_cast<uint8_t volatile*>(port_to_input_PGM[port]);
static inline uint8_t volatile *portToInput(uint8_t port)
{
return reinterpret_cast<uint8_t volatile *>(port_to_input_PGM[port]);
}

template <uint8_t Pin>
static inline bool fastRead() {
return (*portToInput(digital_pin_to_port_PGM[Pin]) &
digital_pin_to_bit_mask_PGM[Pin]);
static inline bool fastRead()
{
return (*portToInput(digital_pin_to_port_PGM[Pin]) &
digital_pin_to_bit_mask_PGM[Pin]);
}

#endif
Loading

0 comments on commit c1e445d

Please sign in to comment.