forks/RadioLibSmol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #41 from mmrein/master

Browse source 
STM32 - use HardwareSerial instead of SoftwareSerial
This commit is contained in:
Jan Gromeš 2019-09-10 18:47:45 +02:00 • committed by GitHub
commit 13b0eaf2b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/ISerial.cpp
View file

@ -9,7 +9,7 @@ void ISerial::begin(long speed) {
} }
bool ISerial::listen() { bool ISerial::listen() {
#if defined ( ESP32 ) || defined (SAMD_SERIES) #if defined ( ESP32 ) || defined (SAMD_SERIES) || defined (ARDUINO_ARCH_STM32)
return true; return true;
#else #else
return(_mod->ModuleSerial->listen()); return(_mod->ModuleSerial->listen());
@ -21,7 +21,7 @@ void ISerial::end() {
} }
bool ISerial::isListening() { bool ISerial::isListening() {
#if defined( ESP32 ) || defined ( SAMD_SERIES ) #if defined( ESP32 ) || defined ( SAMD_SERIES ) || defined (ARDUINO_ARCH_STM32)
return true; return true;
#else #else
return(_mod->ModuleSerial->isListening()); return(_mod->ModuleSerial->isListening());
@ -29,7 +29,7 @@ bool ISerial::isListening() {
} }
bool ISerial::stopListening() { bool ISerial::stopListening() {
#if defined( ESP32 ) || defined ( SAMD_SERIES ) #if defined( ESP32 ) || defined ( SAMD_SERIES ) || defined (ARDUINO_ARCH_STM32)
return true; return true;
#else #else
return(_mod->ModuleSerial->stopListening()); return(_mod->ModuleSerial->stopListening());
@ -37,7 +37,7 @@ bool ISerial::stopListening() {
} }
bool ISerial::overflow() { bool ISerial::overflow() {
#if defined( ESP32 ) || defined ( SAMD_SERIES ) #if defined( ESP32 ) || defined ( SAMD_SERIES ) || defined (ARDUINO_ARCH_STM32)
return false; return false;
#else #else
return(_mod->ModuleSerial->overflow()); return(_mod->ModuleSerial->overflow());
@ -155,4 +155,3 @@ size_t ISerial::println(const Printable& x) {
size_t ISerial::println(void) { size_t ISerial::println(void) {
return(_mod->ModuleSerial->println()); return(_mod->ModuleSerial->println());
} }

4
src/Module.cpp
View file

@ -7,7 +7,7 @@ Module::Module(int rx, int tx, HardwareSerial* useSer) {
_int0 = -1; _int0 = -1;
_int1 = -1; _int1 = -1;
#if defined(ESP32) || defined(SAMD_SERIES) #if defined(ESP32) || defined(SAMD_SERIES) || defined (ARDUINO_ARCH_STM32)
ModuleSerial = useSer; ModuleSerial = useSer;
#else #else
ModuleSerial = new SoftwareSerial(_rx, _tx); ModuleSerial = new SoftwareSerial(_rx, _tx);
@ -33,7 +33,7 @@ Module::Module(int cs, int int0, int int1, int rx, int tx, SPIClass& spi, SPISet
_spi = &spi; _spi = &spi;
_spiSettings = spiSettings; _spiSettings = spiSettings;
#if defined(ESP32) || defined(SAMD_SERIES) #if defined(ESP32) || defined(SAMD_SERIES) || defined (ARDUINO_ARCH_STM32)
ModuleSerial = useSer; ModuleSerial = useSer;
#else #else
ModuleSerial = new SoftwareSerial(_rx, _tx); ModuleSerial = new SoftwareSerial(_rx, _tx);

8
src/Module.h
View file

@ -3,7 +3,7 @@
#include <SPI.h> #include <SPI.h>
//#include <Wire.h> //#include <Wire.h>
#if defined(ESP32) || defined(SAMD_SERIES) #if defined(ESP32) || defined(SAMD_SERIES) || defined (ARDUINO_ARCH_STM32)
#else #else
#include <SoftwareSerial.h> #include <SoftwareSerial.h>
#endif #endif
@ -28,7 +28,7 @@ class Module {
\param serial HardwareSerial to be used on ESP32 and SAMD. Defaults to 1 \param serial HardwareSerial to be used on ESP32 and SAMD. Defaults to 1
*/ */
#if defined(ESP32) || defined(SAMD_SERIES) #if defined(ESP32) || defined(SAMD_SERIES) || defined (ARDUINO_ARCH_STM32)
Module(int tx, int rx, HardwareSerial* useSer = &Serial1); Module(int tx, int rx, HardwareSerial* useSer = &Serial1);
#else #else
Module(int tx, int rx, HardwareSerial* useSer = nullptr); Module(int tx, int rx, HardwareSerial* useSer = nullptr);
@ -85,7 +85,7 @@ class Module {
\param serial HardwareSerial to be used on ESP32 and SAMD. Defaults to 1 \param serial HardwareSerial to be used on ESP32 and SAMD. Defaults to 1
*/ */
#if defined(ESP32) || defined(SAMD_SERIES) #if defined(ESP32) || defined(SAMD_SERIES) || defined (ARDUINO_ARCH_STM32)
Module(int cs, int int0, int int1, int rx, int tx, SPIClass& spi = SPI, SPISettings spiSettings = SPISettings(2000000, MSBFIRST, SPI_MODE0), HardwareSerial* useSer = &Serial1); Module(int cs, int int0, int int1, int rx, int tx, SPIClass& spi = SPI, SPISettings spiSettings = SPISettings(2000000, MSBFIRST, SPI_MODE0), HardwareSerial* useSer = &Serial1);
#else #else
Module(int cs, int int0, int int1, int rx, int tx, SPIClass& spi = SPI, SPISettings spiSettings = SPISettings(2000000, MSBFIRST, SPI_MODE0), HardwareSerial* useSer = nullptr); Module(int cs, int int0, int int1, int rx, int tx, SPIClass& spi = SPI, SPISettings spiSettings = SPISettings(2000000, MSBFIRST, SPI_MODE0), HardwareSerial* useSer = nullptr);
@ -97,7 +97,7 @@ class Module {
/*! /*!
\brief Internal SoftwareSerial instance. \brief Internal SoftwareSerial instance.
*/ */
#if defined(ESP32) || defined(SAMD_SERIES) #if defined(ESP32) || defined(SAMD_SERIES) || defined (ARDUINO_ARCH_STM32)
HardwareSerial* ModuleSerial; HardwareSerial* ModuleSerial;
#else #else
SoftwareSerial* ModuleSerial; SoftwareSerial* ModuleSerial;