Merge branch 'master' into docdocgoose

Author: devyte

Diff for: cores/esp8266/core_esp8266_si2c.c

@@ -293,24 +293,23 @@ unsigned char twi_readFrom(unsigned char address, unsigned char* buf, unsigned i
 }
 
 uint8_t twi_status() {
-    if (SCL_READ()==0) {
+    if (SCL_READ() == 0)
       return I2C_SCL_HELD_LOW; // SCL held low by another device, no procedure available to recover
-    }
+
     int clockCount = 20;
-    while (SDA_READ()==0 && clockCount>0) { // if SDA low, read the bits slaves have to sent to a max
+    while (SDA_READ() == 0 && clockCount-- > 0) { // if SDA low, read the bits slaves have to sent to a max
         twi_read_bit();
-        if (SCL_READ()==0) {
+        if (SCL_READ() == 0) {
           return I2C_SCL_HELD_LOW_AFTER_READ; // I2C bus error. SCL held low beyond slave clock stretch time
         }
     }
-    if (SDA_READ()==0) {
+    if (SDA_READ() == 0)
       return I2C_SDA_HELD_LOW; // I2C bus error. SDA line held low by slave/another_master after n bits.
-    }
-    if (!twi_write_start()) {
+    
+    if (!twi_write_start())
       return I2C_SDA_HELD_LOW_AFTER_INIT;  // line busy. SDA again held low by another device. 2nd master?
-    } else {
-      return I2C_OK;
-    }
+
+    return I2C_OK;
 }
 
 uint8_t twi_transmit(const uint8_t* data, uint8_t length)

Diff for: cores/esp8266/core_esp8266_waveform.c

@@ -282,7 +282,7 @@ static ICACHE_RAM_ATTR void timer1Interrupt() {
   // Check for timed-out waveforms out of the high-frequency toggle loop
   for (size_t i = 0; i < countof(waveform); i++) {
     Waveform *wave = &waveform[i];
-    if (wave->timeLeftCycles) {
+    if (wave->enabled && wave->timeLeftCycles) {
       // Check for unsigned underflow with new > old
       if (deltaCycles >= wave->timeLeftCycles) {
         // Done, remove!

Diff for: tools/platformio-build.py

@@ -135,11 +135,10 @@ def scons_patched_match_splitext(path, suffixes=None):
 #
 # lwIP
 #
-if "PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY" in flatten_cppdefines:
+if "PIO_FRAMEWORK_ARDUINO_LWIP_HIGHER_BANDWIDTH" in flatten_cppdefines:
     env.Append(
-        CPPDEFINES=[("TCP_MSS", 536), ("LWIP_FEATURES", 1)],
-        CPPPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lwip2", "include")],
-        LIBS=["lwip2-536-feat"]
+        CPPPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lwip", "include")],
+        LIBS=["lwip_gcc"]
     )
 elif "PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH" in flatten_cppdefines:
     env.Append(
@@ -159,10 +158,12 @@ def scons_patched_match_splitext(path, suffixes=None):
         CPPPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lwip2", "include")],
         LIBS=["lwip2-1460"]
     )
+# PIO_FRAMEWORK_ARDUINO_LWIP2_LOW_MEMORY (default)
 else:
     env.Append(
-        CPPPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lwip", "include")],
-        LIBS=["lwip_gcc"]
+        CPPDEFINES=[("TCP_MSS", 536), ("LWIP_FEATURES", 1)],
+        CPPPATH=[join(FRAMEWORK_DIR, "tools", "sdk", "lwip2", "include")],
+        LIBS=["lwip2-536-feat"]
     )
 
 #