Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-09-14 10:35:30 +00:00
Code Issues Releases Activity

[ESP_IDF 5.1] Add support for ESP_IDF 5.1 (SP32 Arduino SDK 3.x)

Browse Source
This commit is contained in:
TD-er
2023-10-06 11:09:11 +02:00
parent 2a07cca66d
commit 8e7f4be212
70 changed files with 783 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/ESPSoftwareSerial/src/SoftwareSerial.cpp
+6 -10
View File
@@ -20,11 +20,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef USES_LATEST_SOFTWARE_SERIAL_LIBRARY
#define USES_LATEST_SOFTWARE_SERIAL_LIBRARY 1
#endif
#if USES_LATEST_SOFTWARE_SERIAL_LIBRARY
#include "SoftwareSerial.h"
#include <Arduino.h>
@@ -36,7 +31,7 @@ uint32_t UARTBase::m_savedPS = 0;
portMUX_TYPE UARTBase::m_interruptsMux = portMUX_INITIALIZER_UNLOCKED;
#endif
__attribute__((always_inline)) inline void IRAM_ATTR UARTBase::disableInterrupts()
ALWAYS_INLINE_ATTR inline void IRAM_ATTR UARTBase::disableInterrupts()
{
#ifndef ESP32
m_savedPS = xt_rsil(15);
@@ -45,7 +40,7 @@ __attribute__((always_inline)) inline void IRAM_ATTR UARTBase::disableInterrupts
#endif
}
__attribute__((always_inline)) inline void IRAM_ATTR UARTBase::restoreInterrupts()
ALWAYS_INLINE_ATTR inline void IRAM_ATTR UARTBase::restoreInterrupts()
{
#ifndef ESP32
xt_wsr_ps(m_savedPS);
@@ -309,7 +304,7 @@ void IRAM_ATTR UARTBase::writePeriod(
GPOS = m_txBitMask;
}
#else
*m_txReg |= m_txBitMask;
*m_txReg = *m_txReg | m_txBitMask;
#endif
m_periodDuration += dutyCycle;
if (offCycle || (withStopBit && !m_invert)) {
@@ -331,7 +326,7 @@ void IRAM_ATTR UARTBase::writePeriod(
GPOC = m_txBitMask;
}
#else
*m_txReg &= ~m_txBitMask;
*m_txReg = *m_txReg & ~m_txBitMask;
#endif
m_periodDuration += offCycle;
if (withStopBit && m_invert) lazyDelay();
@@ -611,6 +606,7 @@ void UARTBase::onReceive(Delegate<void(), void*>&& handler) {
restoreInterrupts();
}
#if __GNUC__ < 12
// The template member functions below must be in IRAM, but due to a bug GCC doesn't currently
// honor the attribute. Instead, it is possible to do explicit specialization and adorn
// these with the IRAM attribute:
@@ -621,5 +617,5 @@ template void IRAM_ATTR delegate::detail::DelegateImpl<void*, void>::operator()(
template size_t IRAM_ATTR circular_queue<uint32_t, UARTBase*>::available() const;
template bool IRAM_ATTR circular_queue<uint32_t, UARTBase*>::push(uint32_t&&);
template bool IRAM_ATTR circular_queue<uint32_t, UARTBase*>::push(const uint32_t&);
#endif // __GNUC__ < 12
#endif