Mirrors/ESP3DLib
2
0
Fork 0
mirror of https://github.com/luc-github/ESP3DLib.git synced 2026-03-14 20:06:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Astyle + fix reset_settings warning

Browse Source
This commit is contained in:
Luc
2020-01-09 15:16:31 +01:00
parent b8af52ecf3
commit 13c4a2e6fc
18 changed files with 2420 additions and 1994 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
src/espcom.cpp
View File

@@ -30,73 +30,80 @@
#endif //HTTP_FEATURE
void Esp3DCom::echo(const char * data)
{
SERIAL_ECHO_START();
SERIAL_ECHOLNPAIR("", data);
SERIAL_ECHO_START();
SERIAL_ECHOLNPAIR("", data);
}
long ESPResponseStream::baudRate()
{
long br = flushableSerial.baudRate();
//workaround for ESP32
if (br == 115201) {
br = 115200;
}
if (br == 230423) {
br = 230400;
}
return br;
long br = flushableSerial.baudRate();
//workaround for ESP32
if (br == 115201) {
br = 115200;
}
if (br == 230423) {
br = 230400;
}
return br;
}
#if defined(HTTP_FEATURE)
ESPResponseStream::ESPResponseStream(WebServer * webserver){
ESPResponseStream::ESPResponseStream(WebServer * webserver)
{
_header_sent=false;
_webserver = webserver;
_pipe = WEB_PIPE;
}
#endif //HTTP_FEATURE
ESPResponseStream::ESPResponseStream(tpipe pipe){
_pipe = pipe;
ESPResponseStream::ESPResponseStream(tpipe pipe)
{
_pipe = pipe;
}
void ESPResponseStream::println(const char *data){
void ESPResponseStream::println(const char *data)
{
print(data);
print("\n");
}
void ESPResponseStream::print(const char *data){
void ESPResponseStream::print(const char *data)
{
#if defined(HTTP_FEATURE)
if (_pipe == WEB_PIPE){
if (!_header_sent) {
_webserver->setContentLength(CONTENT_LENGTH_UNKNOWN);
_webserver->sendHeader("Content-Type","text/html");
_webserver->sendHeader("Cache-Control","no-cache");
_webserver->send(200);
_header_sent = true;
}
_buffer+=data;
if (_buffer.length() > 1200) {
//send data
_webserver->sendContent(_buffer);
//reset buffer
_buffer = "";
}
}
if (_pipe == WEB_PIPE) {
if (!_header_sent) {
_webserver->setContentLength(CONTENT_LENGTH_UNKNOWN);
_webserver->sendHeader("Content-Type","text/html");
_webserver->sendHeader("Cache-Control","no-cache");
_webserver->send(200);
_header_sent = true;
}
_buffer+=data;
if (_buffer.length() > 1200) {
//send data
_webserver->sendContent(_buffer);
//reset buffer
_buffer = "";
}
}
#endif //HTTP_FEATURE
if (_pipe == SERIAL_PIPE) {
SERIAL_ECHOPAIR_F("", data);
}
if (_pipe == SERIAL_PIPE) {
SERIAL_ECHOPAIR_F("", data);
}
}
void ESPResponseStream::flush(){
void ESPResponseStream::flush()
{
#if defined(HTTP_FEATURE)
if (_pipe == WEB_PIPE){
if(_header_sent) {
//send data
if(_buffer.length() > 0)_webserver->sendContent(_buffer);
//close connection
_webserver->sendContent("");
}
_header_sent = false;
_buffer = "";
}
if (_pipe == WEB_PIPE) {
if(_header_sent) {
//send data
if(_buffer.length() > 0) {
_webserver->sendContent(_buffer);
}
//close connection
_webserver->sendContent("");
}
_header_sent = false;
_buffer = "";
}
#endif //HTTP_FEATURE
}