mirror of
https://github.com/luc-github/ESP3D.git
synced 2025-10-31 11:56:48 -07:00
* Add a realtime command detector * Move `\r` as printable char and not replaced as `\n` * Refactorize Serial service code to avoid redondant code between esp32 and esp8266 * Implement isrealtimeCommand check for serial and centralize function in string helper * Add new type message : realtimecmd * Update simulator to handle commands and realtime commands * Add simple serial test tool * Generate error if use HAS_DISPLAY with grbl/grblHAL * Implement isRealTimeCommand for BT client * Simplify BT push2buffer code * Implement support for realtimecommand in telnet * Implement isRealTimeCommand on websocket RX * Simplify push2RXbuffer for websocket * Implement isRealTimeCommand for USB serial * Bump version
278 lines
8.2 KiB
C++
278 lines
8.2 KiB
C++
/*
|
|
esp3d_serial_service.cpp - serial services functions class
|
|
|
|
Copyright (c) 2014 Luc Lebosse. All rights reserved.
|
|
|
|
This code 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 code 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 code; if not, write to the Free Software
|
|
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
#if defined(ARDUINO_ARCH_ESP8266)
|
|
#include "../../include/esp3d_config.h"
|
|
#if COMMUNICATION_PROTOCOL == MKS_SERIAL || COMMUNICATION_PROTOCOL == RAW_SERIAL
|
|
#include "../../core/esp3d_commands.h"
|
|
#include "../../core/esp3d_settings.h"
|
|
#include "../../core/esp3d_string.h"
|
|
#include "serial_service.h"
|
|
|
|
#if COMMUNICATION_PROTOCOL == MKS_SERIAL
|
|
#include "../mks/mks_service.h"
|
|
#endif // COMMUNICATION_PROTOCOL == MKS_SERIAL
|
|
#include "../authentication/authentication_service.h"
|
|
#define MAX_SERIAL 2
|
|
HardwareSerial *Serials[MAX_SERIAL] = {&Serial, &Serial1};
|
|
|
|
#define TIMEOUT_SERIAL_FLUSH 1500
|
|
|
|
// Serial Parameters
|
|
|
|
// Constructor
|
|
ESP3DSerialService::ESP3DSerialService(uint8_t id) {
|
|
_buffer_size = 0;
|
|
_started = false;
|
|
#if defined(AUTHENTICATION_FEATURE)
|
|
_needauthentication = true;
|
|
#else
|
|
_needauthentication = false;
|
|
#endif // AUTHENTICATION_FEATURE
|
|
_id = id;
|
|
|
|
_rxPin = ESP_RX_PIN;
|
|
_txPin = ESP_TX_PIN;
|
|
_origin = ESP3DClientType::serial;
|
|
}
|
|
|
|
// Setup Serial
|
|
bool ESP3DSerialService::begin(uint8_t serialIndex) {
|
|
_serialIndex = serialIndex - 1;
|
|
esp3d_log("Serial %d begin for %d", _serialIndex, _id);
|
|
if (_serialIndex >= MAX_SERIAL) {
|
|
esp3d_log_e("Serial %d begin for %d failed, index out of range",
|
|
_serialIndex, _id);
|
|
return false;
|
|
}
|
|
_lastflush = millis();
|
|
// read from settings
|
|
uint32_t br = 0;
|
|
uint32_t defaultBr = 0;
|
|
|
|
br = ESP3DSettings::readUint32(ESP_BAUD_RATE);
|
|
defaultBr = ESP3DSettings::getDefaultIntegerSetting(ESP_BAUD_RATE);
|
|
setParameters();
|
|
esp3d_log("Baud rate is %d , default is %d", br, defaultBr);
|
|
_buffer_size = 0;
|
|
// change only if different from current
|
|
if (br != baudRate() || (_rxPin != -1) || (_txPin != -1)) {
|
|
if (!ESP3DSettings::isValidIntegerSetting(br, ESP_BAUD_RATE)) {
|
|
br = defaultBr;
|
|
}
|
|
Serials[_serialIndex]->setRxBufferSize(SERIAL_RX_BUFFER_SIZE);
|
|
Serials[_serialIndex]->begin(br, ESP_SERIAL_PARAM, SERIAL_FULL,
|
|
(_txPin == -1) ? 1 : _txPin);
|
|
if (_rxPin != -1) {
|
|
Serials[_serialIndex]->pins((_txPin == -1) ? 1 : _txPin, _rxPin);
|
|
}
|
|
}
|
|
_started = true;
|
|
esp3d_log("Serial %d for %d is started", _serialIndex, _id);
|
|
return true;
|
|
}
|
|
// End serial
|
|
bool ESP3DSerialService::end() {
|
|
flush();
|
|
delay(100);
|
|
swap();
|
|
Serials[_serialIndex]->end();
|
|
_buffer_size = 0;
|
|
_started = false;
|
|
initAuthentication();
|
|
return true;
|
|
}
|
|
|
|
void ESP3DSerialService::flushData(const uint8_t *data, size_t size, ESP3DMessageType type) {
|
|
ESP3DMessage *message = esp3d_message_manager.newMsg(
|
|
_origin,
|
|
_id == MAIN_SERIAL ? ESP3DClientType::all_clients
|
|
: esp3d_commands.getOutputClient(),
|
|
data, size, getAuthentication());
|
|
|
|
if (message) {
|
|
message->type = type;
|
|
esp3d_log("Process Message");
|
|
esp3d_commands.process(message);
|
|
} else {
|
|
esp3d_log_e("Cannot create message");
|
|
}
|
|
_lastflush = millis();
|
|
}
|
|
|
|
// Function which could be called in other loop
|
|
void ESP3DSerialService::handle() {
|
|
if (!_started) {
|
|
return;
|
|
}
|
|
// Do we have some data waiting
|
|
size_t len = Serials[_serialIndex]->available();
|
|
if (len > 0) {
|
|
// if yes read them
|
|
esp3d_log("Got %d chars in serial", len);
|
|
uint8_t *sbuf = (uint8_t *)malloc(len);
|
|
if (sbuf) {
|
|
size_t count = readBytes(sbuf, len);
|
|
// push to buffer
|
|
if (count > 0) {
|
|
push2buffer(sbuf, count);
|
|
}
|
|
// freen buffer
|
|
free(sbuf);
|
|
}
|
|
}
|
|
// we cannot left data in buffer too long
|
|
// in case some commands "forget" to add \n
|
|
if (((millis() - _lastflush) > TIMEOUT_SERIAL_FLUSH) && (_buffer_size > 0)) {
|
|
flushBuffer();
|
|
}
|
|
}
|
|
|
|
// push collected data to buffer and proceed accordingly
|
|
void ESP3DSerialService::push2buffer(uint8_t *sbuf, size_t len) {
|
|
if (!_started || !_buffer) {
|
|
return;
|
|
}
|
|
esp3d_log("buffer get %d data ", len);
|
|
#if COMMUNICATION_PROTOCOL == MKS_SERIAL
|
|
static bool isFrameStarted = false;
|
|
static bool isCommandFrame = false;
|
|
static uint8_t type;
|
|
// expected size
|
|
static int16_t framePos = -1;
|
|
// currently received
|
|
static uint datalen = 0;
|
|
for (size_t i = 0; i < len; i++) {
|
|
esp3d_log("Data : %c %x", sbuf[i], sbuf[i]);
|
|
framePos++;
|
|
_lastflush = millis();
|
|
// so frame head was detected
|
|
if (isFrameStarted) {
|
|
// checking it is a valid Frame header
|
|
if (framePos == 1) {
|
|
esp3d_log("type = %x", sbuf[i]);
|
|
if (MKSService::isFrame(char(sbuf[i]))) {
|
|
if (MKSService::isCommand(char(sbuf[i]))) {
|
|
isCommandFrame = true;
|
|
esp3d_log("type: Command");
|
|
} else {
|
|
esp3d_log("type: other");
|
|
type = sbuf[i];
|
|
isCommandFrame = false;
|
|
}
|
|
} else {
|
|
esp3d_log_e("wrong frame type");
|
|
isFrameStarted = false;
|
|
_buffer_size = 0;
|
|
}
|
|
} else if ((framePos == 2) || (framePos == 3)) {
|
|
// add size to int
|
|
if (framePos == 2) {
|
|
datalen = sbuf[i];
|
|
} else {
|
|
datalen += (sbuf[i] << 8);
|
|
esp3d_log("Data len: %d", datalen);
|
|
if (datalen > (ESP3D_SERIAL_BUFFER_SIZE - 5)) {
|
|
esp3d_log_e("Overflow in data len");
|
|
isFrameStarted = false;
|
|
_buffer_size = 0;
|
|
}
|
|
}
|
|
} else if (MKSService::isTail(char(sbuf[i]))) {
|
|
esp3d_log("got tail");
|
|
_buffer[_buffer_size] = '\0';
|
|
esp3d_log("size is %d", _buffer_size);
|
|
// let check integrity
|
|
if (_buffer_size == datalen) {
|
|
esp3d_log("Flushing buffer");
|
|
if (isCommandFrame) {
|
|
flushBuffer();
|
|
} else {
|
|
MKSService::handleFrame(type, (const uint8_t *)_buffer,
|
|
_buffer_size);
|
|
}
|
|
} else {
|
|
esp3d_log_e("Error in data len");
|
|
}
|
|
// clear frame infos
|
|
_buffer_size = 0;
|
|
isFrameStarted = false;
|
|
|
|
} else {
|
|
// it is data
|
|
if (_buffer_size < ESP3D_SERIAL_BUFFER_SIZE - 5) {
|
|
_buffer[_buffer_size] = sbuf[i];
|
|
_buffer_size++;
|
|
} else {
|
|
esp3d_log_e("Overflow in data len");
|
|
isFrameStarted = false;
|
|
_buffer_size = 0;
|
|
}
|
|
}
|
|
} else {
|
|
// frame is not started let see if it is a head
|
|
if (MKSService::isHead(char(sbuf[i]))) {
|
|
esp3d_log("got head");
|
|
// yes it is
|
|
isFrameStarted = true;
|
|
framePos = 0;
|
|
_buffer_size = 0;
|
|
} else {
|
|
// no so let reset all and just ignore it
|
|
// TODO should we handle these data ?
|
|
esp3d_log_e("Unidentified data : %c %x", sbuf[i], sbuf[i]);
|
|
isCommandFrame = false;
|
|
framePos = -1;
|
|
datalen = 0;
|
|
}
|
|
}
|
|
}
|
|
#else
|
|
for (size_t i = 0; i < len; i++) {
|
|
_lastflush = millis();
|
|
if (esp3d_string::isRealTimeCommand(sbuf[i])) {
|
|
flushChar(sbuf[i]);
|
|
} else {
|
|
_buffer[_buffer_size] = sbuf[i];
|
|
_buffer_size++;
|
|
if (_buffer_size > ESP3D_SERIAL_BUFFER_SIZE ||
|
|
_buffer[_buffer_size - 1] == '\n') {
|
|
flushBuffer();
|
|
}
|
|
}
|
|
}
|
|
#endif
|
|
}
|
|
|
|
// Reset Serial Setting (baud rate)
|
|
bool ESP3DSerialService::reset() {
|
|
esp3d_log("Reset serial");
|
|
return ESP3DSettings::writeUint32(
|
|
ESP_BAUD_RATE, ESP3DSettings::getDefaultIntegerSetting(ESP_BAUD_RATE));
|
|
}
|
|
|
|
void ESP3DSerialService::swap() {
|
|
#ifdef ARDUINO_ARCH_ESP8266
|
|
Serials[_serialIndex]->swap();
|
|
#endif // ARDUINO_ARCH_ESP8266
|
|
}
|
|
|
|
#endif // COMMUNICATION_PROTOCOL == MKS_SERIAL || COMMUNICATION_PROTOCOL ==
|
|
// RAW_SERIAL
|
|
#endif // ARDUINO_ARCH_ESP8266
|