psram for sprites is now optional (default enabled)

Author: tobozo

src/utility/CommUtil.cpp

@@ -151,37 +151,3 @@ void CommUtil::scanID(bool *result) {
     *(result+i)=writeCommand(i,0x00);
   }
 }
-
-// I2C Scanner, scavengered from https://github.com/MartyMacGyver/Arduino_I2C_Scanner
-void CommUtil::scan() {
-  Serial.println();
-  Serial.println("Scanning I2C Bus: ");
-  Serial.println();
-  Serial.print("   ");
-  for (int i = 0; i < 0x10; i++) {
-    Serial.printf(" %2x", i);
-  }
-  Serial.println();
-  Serial.print("            ");
-  for(uint8_t addr = 0x03; addr <= 0x77; addr++ ) {
-    // Address the device
-    Wire.beginTransmission(addr);
-    // Check for ACK (detection of device), NACK or error
-    uint8_t deviceStatus = Wire.endTransmission();
-
-    if (!(addr % 0x10)) { // Start of a line
-      Serial.printf("%02x:", addr / 0x10);
-    }
-    if (deviceStatus == 0) {
-      Serial.printf(" %02x", addr);
-    } else if (deviceStatus == 4) {
-      Serial.printf(" %02s", "??");
-    } else {
-      Serial.printf(" %02s", "--");
-    }
-    if (!((addr+1) % 0x10) ) {
-      Serial.println();
-    }
-  }
-  Serial.println();
-}

src/utility/CommUtil.h

@@ -22,7 +22,6 @@ class CommUtil {
     bool readBytes(uint8_t address, uint8_t count,uint8_t * dest);
     bool readBytes(uint8_t address, uint8_t subAddress, uint8_t count, uint8_t * dest);
     void scanID(bool *result);
-    void scan();
   private:
 };
 #endif

src/utility/Sprite.cpp

@@ -107,7 +107,7 @@ void* TFT_eSprite::callocSprite(int16_t w, int16_t h, uint8_t frames)
   {
 
 #if defined (ESP32) && defined (CONFIG_SPIRAM_SUPPORT)
-    if ( psramFound() ) ptr8 = ( uint8_t*) ps_calloc(w * h + 1, sizeof(uint16_t));
+    if ( psramFound() && _usePsram  ) ptr8 = ( uint8_t*) ps_calloc(w * h + 1, sizeof(uint16_t));
     else
 #endif
     ptr8 = ( uint8_t*) calloc(w * h + 1, sizeof(uint16_t));
@@ -116,7 +116,7 @@ void* TFT_eSprite::callocSprite(int16_t w, int16_t h, uint8_t frames)
   else if (_bpp == 8)
   {
 #if defined (ESP32) && defined (CONFIG_SPIRAM_SUPPORT)
-    if ( psramFound() ) ptr8 = ( uint8_t*) ps_calloc(w * h + 1, sizeof(uint8_t));
+    if ( psramFound() && _usePsram  ) ptr8 = ( uint8_t*) ps_calloc(w * h + 1, sizeof(uint8_t));
     else
 #endif
     ptr8 = ( uint8_t*) calloc(w * h + 1, sizeof(uint8_t));
@@ -135,7 +135,7 @@ void* TFT_eSprite::callocSprite(int16_t w, int16_t h, uint8_t frames)
     if (frames > 2) frames = 2; // Currently restricted to 2 frame buffers
     if (frames < 1) frames = 1;
 #if defined (ESP32) && defined (CONFIG_SPIRAM_SUPPORT)
-    if ( psramFound() ) ptr8 = ( uint8_t*) ps_calloc(frames * (w>>3) * h + frames, sizeof(uint8_t));
+    if ( psramFound() && _usePsram  ) ptr8 = ( uint8_t*) ps_calloc(frames * (w>>3) * h + frames, sizeof(uint8_t));
     else
 #endif
     ptr8 = ( uint8_t*) calloc(frames * (w>>3) * h + frames, sizeof(uint8_t));

src/utility/Sprite.h

@@ -109,6 +109,7 @@ class TFT_eSprite : public TFT_eSPI {
   void     printToSprite(String string);
   void     printToSprite(char *cbuffer, uint16_t len);
   int16_t  printToSprite(int16_t x, int16_t y, uint16_t index);
+  void     setPsram( bool enabled );
 
  private:
 
@@ -129,7 +130,8 @@ class TFT_eSprite : public TFT_eSPI {
   int16_t _ypivot;   // y pivot point coordinate
 
   bool     _created;    // A Sprite has been created and memory reserved
-  bool     _gFont = false; 
+  bool     _gFont = false;
+  bool     _usePsram = true; // use Psram if available  
 
 //  int32_t  _icursor_x, _icursor_y;
   uint8_t  _rotation = 0;