* Right interrupts implementation (more details: https://www.esp8266.c…

…om/viewtopic.php?p=16758&sid=464b2c4c09aeaafbd865ea46d9e40f8a#p16758)
slaff · Oct 10, 2016 · c0fc7cb · c0fc7cb
1 parent 25dbf7b
commit c0fc7cb
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 10 deletions.
diff --git a/Sming/Libraries/Adafruit_NeoPixel/Adafruit_NeoPixel.cpp b/Sming/Libraries/Adafruit_NeoPixel/Adafruit_NeoPixel.cpp
@@ -100,8 +100,8 @@ void IRAM_ATTR Adafruit_NeoPixel::show(void) {
  // state, computes 'pin high' and 'pin low' values, and writes these back
  // to the PORT register as needed.
 
- //noInterrupts(); // Need 100% focus on instruction timing
- ets_intr_lock();
+ noInterrupts(); // Need 100% focus on instruction timing
+ //ets_intr_lock();
 
  boolean is800KHz=true;
 
@@ -150,8 +150,9 @@ void IRAM_ATTR Adafruit_NeoPixel::show(void) {
  }
  }
  while((_getCycleCount() - startTime) < period); // Wait for last bit
- ets_intr_unlock();
- //interrupts();
+ //ets_intr_unlock();
+ interrupts();
+
  endTime = micros(); // Save EOD time for latch on next call
 }
 

diff --git a/Sming/Libraries/RCSwitch/RCSwitch.cpp b/Sming/Libraries/RCSwitch/RCSwitch.cpp
@@ -31,6 +31,8 @@
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 */
 
+#include <user_config.h>
+//#include <../../SmingCore/SmingCore.h>
 #include "RCSwitch.h"
 
 /* Format for protocol definitions:
@@ -462,6 +464,7 @@ char* RCSwitch::getCodeWordD(char sGroup, int nDevice, boolean bStatus){
  */
 void RCSwitch::sendTriState(const char* sCodeWord) {
  for (int nRepeat=0; nRepeat<nRepeatTransmit; nRepeat++) {
+ xt_disable_interrupts();
  int i = 0;
  while (sCodeWord[i] != '\0') {
  switch(sCodeWord[i]) {
@@ -477,7 +480,8 @@ void RCSwitch::sendTriState(const char* sCodeWord) {
  }
  i++;
  }
- this->sendSync(); 
+ this->sendSync();
+ xt_enable_interrupts();
  }
 }
 
@@ -487,6 +491,7 @@ void RCSwitch::send(unsigned long code, unsigned int length) {
 
 void RCSwitch::send(const char* sCodeWord) {
  for (int nRepeat=0; nRepeat<nRepeatTransmit; nRepeat++) {
+ xt_disable_interrupts();
  int i = 0;
  while (sCodeWord[i] != '\0') {
  switch(sCodeWord[i]) {
@@ -500,6 +505,7 @@ void RCSwitch::send(const char* sCodeWord) {
  i++;
  }
  this->sendSync();
+ xt_enable_interrupts();
  }
 }
 

diff --git a/Sming/SmingCore/Digital.h b/Sming/SmingCore/Digital.h
@@ -16,9 +16,6 @@
 #include "../SmingCore/ESP8266EX.h"
 #include "../Wiring/WiringFrameworkDependencies.h"
 
-//#define interrupts() sei()
-//#define noInterrupts() cli()
-
 /** @brief Set the mode of a GPIO pin
  * @param pin GPIO pin to configure
  * @param mode Mode of pin [INPUT | INPUT_PULLUP | OUTPUT]

diff --git a/Sming/SmingCore/Interrupts.cpp b/Sming/SmingCore/Interrupts.cpp
@@ -103,11 +103,13 @@ GPIO_INT_TYPE ConvertArduinoInterruptMode(uint8_t mode)
 
 void noInterrupts()
 {
- ETS_INTR_LOCK();
+ //ETS_INTR_LOCK();
+ xt_disable_interrupts(); // https://www.esp8266.com/viewtopic.php?p=16758
 }
 void interrupts()
 {
- ETS_INTR_UNLOCK();
+ //ETS_INTR_UNLOCK();
+ xt_enable_interrupts();
 }
 
 static void IRAM_ATTR interruptHandler(uint32 intr_mask, void *arg)

diff --git a/Sming/system/include/esp_systemapi.h b/Sming/system/include/esp_systemapi.h
@@ -90,6 +90,9 @@ extern void ets_intr_unlock();
 extern void ets_update_cpu_frequency(uint32_t frq);
 extern uint32_t ets_get_cpu_frequency();
 
+extern void xt_disable_interrupts();
+extern void xt_enable_interrupts();
+
 typedef signed short file_t;
 
 #endif
diff --git a/Sming/system/xt_interrupts.cpp b/Sming/system/xt_interrupts.cpp
@@ -0,0 +1,16 @@
+#include <user_config.h>
+
+static uint32_t interruptState = 0;
+
+void xt_disable_interrupts()
+{
+ __asm__ __volatile__("rsil %0,15":"=a" (interruptState));
+ __asm__("esync");
+ __asm__("isync");
+ __asm__("dsync");
+}
+void xt_enable_interrupts()
+{
+ __asm__ __volatile__("wsr %0,ps"::"a" (interruptState) : "memory");
+ __asm__("esync");
+}