Extend ESP32 HardwareSerial with flushTX. (#13588)
This commit is contained in:
parent
3c47e1b4d1
commit
27693cec29
3 changed files with 71 additions and 1 deletions
33
Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.cpp
Normal file
33
Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.cpp
Normal file
|
@ -0,0 +1,33 @@
|
||||||
|
/**
|
||||||
|
* Marlin 3D Printer Firmware
|
||||||
|
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
||||||
|
*
|
||||||
|
* Based on Sprinter and grbl.
|
||||||
|
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program 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 General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "FlushableHardwareSerial.h"
|
||||||
|
|
||||||
|
#ifdef ARDUINO_ARCH_ESP32
|
||||||
|
|
||||||
|
FlushableHardwareSerial::FlushableHardwareSerial(int uart_nr)
|
||||||
|
: HardwareSerial(uart_nr)
|
||||||
|
{}
|
||||||
|
|
||||||
|
FlushableHardwareSerial flushableSerial(0);
|
||||||
|
|
||||||
|
#endif // ARDUINO_ARCH_ESP32
|
36
Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.h
Normal file
36
Marlin/src/HAL/HAL_ESP32/FlushableHardwareSerial.h
Normal file
|
@ -0,0 +1,36 @@
|
||||||
|
/**
|
||||||
|
* Marlin 3D Printer Firmware
|
||||||
|
* Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
||||||
|
*
|
||||||
|
* Based on Sprinter and grbl.
|
||||||
|
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program 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 General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifdef ARDUINO_ARCH_ESP32
|
||||||
|
|
||||||
|
#include <HardwareSerial.h>
|
||||||
|
|
||||||
|
class FlushableHardwareSerial : public HardwareSerial {
|
||||||
|
public:
|
||||||
|
FlushableHardwareSerial(int uart_nr);
|
||||||
|
|
||||||
|
inline void flushTX(void) { /* No need to flush the hardware serial, but defined here for compatibility. */ }
|
||||||
|
};
|
||||||
|
|
||||||
|
extern FlushableHardwareSerial flushableSerial;
|
||||||
|
|
||||||
|
#endif // ARDUINO_ARCH_ESP32
|
|
@ -48,6 +48,7 @@
|
||||||
#include "HAL_timers_ESP32.h"
|
#include "HAL_timers_ESP32.h"
|
||||||
|
|
||||||
#include "WebSocketSerial.h"
|
#include "WebSocketSerial.h"
|
||||||
|
#include "FlushableHardwareSerial.h"
|
||||||
|
|
||||||
// --------------------------------------------------------------------------
|
// --------------------------------------------------------------------------
|
||||||
// Defines
|
// Defines
|
||||||
|
@ -55,7 +56,7 @@
|
||||||
|
|
||||||
extern portMUX_TYPE spinlock;
|
extern portMUX_TYPE spinlock;
|
||||||
|
|
||||||
#define MYSERIAL0 Serial
|
#define MYSERIAL0 flushableSerial
|
||||||
|
|
||||||
#if ENABLED(WIFISUPPORT)
|
#if ENABLED(WIFISUPPORT)
|
||||||
#define NUM_SERIAL 2
|
#define NUM_SERIAL 2
|
||||||
|
|
Reference in a new issue