Merge remote-tracking branch 'upstream/master'

Author: HendrikVE

cores/esp32/Esp.cpp

@@ -112,9 +112,48 @@ void EspClass::restart(void)
     esp_restart();
 }
 
+uint32_t EspClass::getHeapSize(void)
+{
+    multi_heap_info_t info;
+    heap_caps_get_info(&info, MALLOC_CAP_INTERNAL);
+    return info.total_free_bytes + info.total_allocated_bytes;
+}
+
 uint32_t EspClass::getFreeHeap(void)
 {
-    return esp_get_free_heap_size();
+    return heap_caps_get_free_size(MALLOC_CAP_INTERNAL);
+}
+
+uint32_t EspClass::getMinFreeHeap(void)
+{
+    return heap_caps_get_minimum_free_size(MALLOC_CAP_INTERNAL);
+}
+
+uint32_t EspClass::getMaxAllocHeap(void)
+{
+    return heap_caps_get_largest_free_block(MALLOC_CAP_INTERNAL);
+}
+
+uint32_t EspClass::getPsramSize(void)
+{
+    multi_heap_info_t info;
+    heap_caps_get_info(&info, MALLOC_CAP_SPIRAM);
+    return info.total_free_bytes + info.total_allocated_bytes;
+}
+
+uint32_t EspClass::getFreePsram(void)
+{
+    return heap_caps_get_free_size(MALLOC_CAP_SPIRAM);
+}
+
+uint32_t EspClass::getMinFreePsram(void)
+{
+    return heap_caps_get_minimum_free_size(MALLOC_CAP_SPIRAM);
+}
+
+uint32_t EspClass::getMaxAllocPsram(void)
+{
+    return heap_caps_get_largest_free_block(MALLOC_CAP_SPIRAM);
 }
 
 uint8_t EspClass::getChipRevision(void)

cores/esp32/Esp.h

@@ -56,7 +56,19 @@ class EspClass
     EspClass() {}
     ~EspClass() {}
     void restart();
-    uint32_t getFreeHeap();
+
+    //Internal RAM
+    uint32_t getHeapSize(); //total heap size
+    uint32_t getFreeHeap(); //available heap
+    uint32_t getMinFreeHeap(); //lowest level of free heap since boot
+    uint32_t getMaxAllocHeap(); //largest block of heap that can be allocated at once
+
+    //SPI RAM
+    uint32_t getPsramSize();
+    uint32_t getFreePsram();
+    uint32_t getMinFreePsram();
+    uint32_t getMaxAllocPsram();
+
     uint8_t getChipRevision();
     uint8_t getCpuFreqMHz(){ return CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ; }
     uint32_t getCycleCount();

cores/esp32/esp32-hal-i2c.c

@@ -1350,33 +1350,32 @@ static void i2cReleaseISR(i2c_t * i2c)
 }
 
 static bool i2cCheckLineState(int8_t sda, int8_t scl){
-    if(sda < 0 || scl < 0){
-        return true;//return true since there is nothing to do
+     if(sda < 0 || scl < 0){
+        return false;//return false since there is nothing to do
     }
-    // if the bus is not 'clear' try the recommended recovery sequence, START, 9 Clocks, STOP
+    // if the bus is not 'clear' try the cycling SCL until SDA goes High or 9 cycles
     digitalWrite(sda, HIGH);
     digitalWrite(scl, HIGH);
-    pinMode(sda, PULLUP|OPEN_DRAIN|OUTPUT|INPUT);
-    pinMode(scl, PULLUP|OPEN_DRAIN|OUTPUT|INPUT);
+    pinMode(sda, PULLUP|OPEN_DRAIN|INPUT);
+    pinMode(scl, PULLUP|OPEN_DRAIN|OUTPUT);
 
     if(!digitalRead(sda) || !digitalRead(scl)) { // bus in busy state
-        log_w("invalid state sda=%d, scl=%d\n", digitalRead(sda), digitalRead(scl));
-        digitalWrite(sda, HIGH);
+        log_w("invalid state sda(%d)=%d, scl(%d)=%d", sda, digitalRead(sda), scl, digitalRead(scl));
         digitalWrite(scl, HIGH);
-        delayMicroseconds(5);
-        digitalWrite(sda, LOW);
         for(uint8_t a=0; a<9; a++) {
             delayMicroseconds(5);
             digitalWrite(scl, LOW);
             delayMicroseconds(5);
             digitalWrite(scl, HIGH);
+            if(digitalRead(sda)){ // bus recovered
+                log_d("Recovered after %d Cycles",a+1);
+                break;
+            }
         }
-        delayMicroseconds(5);
-        digitalWrite(sda, HIGH);
     }
 
     if(!digitalRead(sda) || !digitalRead(scl)) { // bus in busy state
-        log_e("Bus Invalid State, TwoWire() Can't init");
+        log_e("Bus Invalid State, TwoWire() Can't init sda=%d, scl=%d",digitalRead(sda),digitalRead(scl));
         return false; // bus is busy
     }
     return true;

docs/arduino-ide/mac.md

@@ -11,7 +11,7 @@ Installation instructions for Mac OS
   cd esp32 && \
   git submodule update --init --recursive && \
   cd tools && \
-  python get.py
+  python get.py 
   ```
   Where `~/Documents/Arduino` represents your sketch book location as per "Arduino" > "Preferences" > "Sketchbook location" (in the IDE once started). Adjust the command above accordingly if necessary!
 
@@ -20,6 +20,8 @@ Installation instructions for Mac OS
   ```xcrun: error: invalid active developer path (/Library/Developer/CommandLineTools), missing xcrun at: /Library/Developer/CommandLineTools/usr/bin/xcrun```
 
   ```xcode-select --install```
+  
+- Try `python3` instead of `python` if you get the error: `IOError: [Errno socket error] [SSL: TLSV1_ALERT_PROTOCOL_VERSION] tlsv1 alert protocol version (_ssl.c:590)` when running `python get.py`
 
 - Restart Arduino IDE
 

variants/heltec_wifi_lora_32/pins_arduino.h

@@ -19,8 +19,8 @@ static const uint8_t KEY_BUILTIN = 0;
 static const uint8_t TX = 1;
 static const uint8_t RX = 3;
 
-static const uint8_t SDA = 21;
-static const uint8_t SCL = 22;
+static const uint8_t SDA = 4;
+static const uint8_t SCL = 15;
 
 static const uint8_t SS    = 18;
 static const uint8_t MOSI  = 27;
@@ -61,4 +61,17 @@ static const uint8_t T9 = 33;
 static const uint8_t DAC1 = 26;
 static const uint8_t DAC2 = 25;
 
+// OLed
+static const uint8_t OLED_SCL = 15;
+static const uint8_t OLED_SDA = 4;
+static const uint8_t OLED_RST = 16;
+
+// LoRA
+static const uint8_t LORA_SCK = 5;
+static const uint8_t LORA_MOSI = 27;
+static const uint8_t LORA_MISO = 19;
+static const uint8_t LORA_CS = 18;
+static const uint8_t LORA_RST = 14;
+static const uint8_t LORA_IRQ = 26;
+
 #endif /* Pins_Arduino_h */