mirror of
https://github.com/esp8266/Arduino.git
synced 2025-07-29 05:21:37 +03:00
Migrate from astyle to clang-format (#8464)
This commit is contained in:
committed by
Max Prokhorov
parent
46190b61f1
commit
19b7a29720
@ -20,11 +20,11 @@
|
||||
*/
|
||||
#include <ESP8266WiFi.h>
|
||||
|
||||
#include <algorithm> // std::min
|
||||
#include <algorithm> // std::min
|
||||
|
||||
#ifndef STASSID
|
||||
#define STASSID "your-ssid"
|
||||
#define STAPSK "your-password"
|
||||
#define STAPSK "your-password"
|
||||
#endif
|
||||
|
||||
/*
|
||||
@ -64,9 +64,9 @@ SoftwareSerial* logger = nullptr;
|
||||
#define logger (&Serial1)
|
||||
#endif
|
||||
|
||||
#define STACK_PROTECTOR 512 // bytes
|
||||
#define STACK_PROTECTOR 512 // bytes
|
||||
|
||||
//how many clients should be able to telnet to this ESP8266
|
||||
// how many clients should be able to telnet to this ESP8266
|
||||
#define MAX_SRV_CLIENTS 2
|
||||
const char* ssid = STASSID;
|
||||
const char* password = STAPSK;
|
||||
@ -98,7 +98,7 @@ void setup() {
|
||||
logger->printf("Serial receive buffer size: %d bytes\n", RXBUFFERSIZE);
|
||||
|
||||
#if SERIAL_LOOPBACK
|
||||
USC0(0) |= (1 << UCLBE); // incomplete HardwareSerial API
|
||||
USC0(0) |= (1 << UCLBE); // incomplete HardwareSerial API
|
||||
logger->println("Serial Internal Loopback enabled");
|
||||
#endif
|
||||
|
||||
@ -114,7 +114,7 @@ void setup() {
|
||||
logger->print("connected, address=");
|
||||
logger->println(WiFi.localIP());
|
||||
|
||||
//start server
|
||||
// start server
|
||||
server.begin();
|
||||
server.setNoDelay(true);
|
||||
|
||||
@ -124,19 +124,19 @@ void setup() {
|
||||
}
|
||||
|
||||
void loop() {
|
||||
//check if there are any new clients
|
||||
// check if there are any new clients
|
||||
if (server.hasClient()) {
|
||||
//find free/disconnected spot
|
||||
// find free/disconnected spot
|
||||
int i;
|
||||
for (i = 0; i < MAX_SRV_CLIENTS; i++)
|
||||
if (!serverClients[i]) { // equivalent to !serverClients[i].connected()
|
||||
if (!serverClients[i]) { // equivalent to !serverClients[i].connected()
|
||||
serverClients[i] = server.accept();
|
||||
logger->print("New client: index ");
|
||||
logger->print(i);
|
||||
break;
|
||||
}
|
||||
|
||||
//no free/disconnected spot so reject
|
||||
// no free/disconnected spot so reject
|
||||
if (i == MAX_SRV_CLIENTS) {
|
||||
server.accept().println("busy");
|
||||
// hints: server.accept() is a WiFiClient with short-term scope
|
||||
@ -147,7 +147,7 @@ void loop() {
|
||||
}
|
||||
}
|
||||
|
||||
//check TCP clients for data
|
||||
// check TCP clients for data
|
||||
#if 1
|
||||
// Incredibly, this code is faster than the buffered one below - #4620 is needed
|
||||
// loopback/3000000baud average 348KB/s
|
||||
@ -165,9 +165,7 @@ void loop() {
|
||||
uint8_t buf[maxToSerial];
|
||||
size_t tcp_got = serverClients[i].read(buf, maxToSerial);
|
||||
size_t serial_sent = Serial.write(buf, tcp_got);
|
||||
if (serial_sent != maxToSerial) {
|
||||
logger->printf("len mismatch: available:%zd tcp-read:%zd serial-write:%zd\n", maxToSerial, tcp_got, serial_sent);
|
||||
}
|
||||
if (serial_sent != maxToSerial) { logger->printf("len mismatch: available:%zd tcp-read:%zd serial-write:%zd\n", maxToSerial, tcp_got, serial_sent); }
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -189,7 +187,7 @@ void loop() {
|
||||
}
|
||||
}
|
||||
|
||||
//check UART for data
|
||||
// check UART for data
|
||||
size_t len = std::min(Serial.available(), maxToTcp);
|
||||
len = std::min(len, (size_t)STACK_PROTECTOR);
|
||||
if (len) {
|
||||
@ -202,9 +200,7 @@ void loop() {
|
||||
// ensure write space is sufficient:
|
||||
if (serverClients[i].availableForWrite() >= serial_got) {
|
||||
size_t tcp_sent = serverClients[i].write(sbuf, serial_got);
|
||||
if (tcp_sent != len) {
|
||||
logger->printf("len mismatch: available:%zd serial-read:%zd tcp-write:%zd\n", len, serial_got, tcp_sent);
|
||||
}
|
||||
if (tcp_sent != len) { logger->printf("len mismatch: available:%zd serial-read:%zd tcp-write:%zd\n", len, serial_got, tcp_sent); }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user