add:add rotation support for sprites in 4bpp format.

Author: xcjk-tofuture

Extensions/Sprite.cpp

@@ -919,6 +919,24 @@ uint16_t TFT_eSprite::readPixelValue(int32_t x, int32_t y)
 
   if (_bpp == 4)
   {
+    if (rotation == 1)
+    {
+      uint16_t tx = x;
+      x = _dheight - y - 1;
+      y = tx;
+    }
+    else if (rotation == 2)
+    {
+      x = _dwidth - x - 1;
+      y = _dheight - y - 1;
+    }
+    else if (rotation == 3)
+    {
+      uint16_t tx = x;
+      x = y;
+      y = _dwidth - tx - 1;
+    }
+
     if (x >= _dwidth) return 0xFF;
     if ((x & 0x01) == 0)
       return _img4[((x+y*_iwidth)>>1)] >> 4;   // even index = bits 7 .. 4
@@ -988,6 +1006,24 @@ uint16_t TFT_eSprite::readPixel(int32_t x, int32_t y)
 
   if (_bpp == 4)
   {
+    if (rotation == 1)
+    {
+      uint16_t tx = x;
+      x = _dheight - y - 1;
+      y = tx;
+    }
+    else if (rotation == 2)
+    {
+      x = _dwidth - x - 1;
+      y = _dheight - y - 1;
+    }
+    else if (rotation == 3)
+    {
+      uint16_t tx = x;
+      x = y;
+      y = _dwidth - tx - 1;
+    }
+
     if (x >= _dwidth) return 0xFFFF;
     uint16_t color;
     if ((x & 0x01) == 0)
@@ -1111,7 +1147,7 @@ void  TFT_eSprite::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, uint16_
     int sWidth = (_iwidth >> 1);
     uint8_t *ptr = (uint8_t *)data;
 
-    if ((x & 0x01) == 0 && (dx & 0x01) == 0 && (dw & 0x01) == 0)
+    if (!rotation && (x & 0x01) == 0 && (dx & 0x01) == 0 && (dw & 0x01) == 0)
     {
       x = (x >> 1) + y * sWidth;
       dw = (dw >> 1);
@@ -1555,7 +1591,7 @@ int16_t TFT_eSprite::width(void)
 {
   if (!_created ) return 0;
 
-  if (_bpp > 1) {
+  if (_bpp > 1 && _bpp != 4) {
     if (_vpDatum) return _xWidth;
     return _dwidth;
   }
@@ -1578,7 +1614,7 @@ int16_t TFT_eSprite::height(void)
 {
   if (!_created ) return 0;
 
-  if (_bpp > 1) {
+  if (_bpp > 1 && _bpp != 4) {
     if (_vpDatum) return _yHeight;
     return _dheight;
   }
@@ -1595,12 +1631,12 @@ int16_t TFT_eSprite::height(void)
 
 /***************************************************************************************
 ** Function name:           setRotation
-** Description:             Rotate coordinate frame for 1bpp sprite
+** Description:             Rotate coordinate frame for 1bpp and 4bpp sprite
 ***************************************************************************************/
-// Does nothing for 4, 8 and 16 bpp sprites.
+// Does nothing for 8 and 16 bpp sprites.
 void TFT_eSprite::setRotation(uint8_t r)
 {
-  if (_bpp != 1) return;
+  if (_bpp != 1 && _bpp != 4) return;
 
   rotation = r;
 
@@ -1648,6 +1684,24 @@ void TFT_eSprite::drawPixel(int32_t x, int32_t y, uint32_t color)
   }
   else if (_bpp == 4)
   {
+    if (rotation == 1)
+    {
+      uint16_t tx = x;
+      x = _dwidth - y - 1;
+      y = tx;
+    }
+    else if (rotation == 2)
+    {
+      x = _dwidth - x - 1;
+      y = _dheight - y - 1;
+    }
+    else if (rotation == 3)
+    {
+      uint16_t tx = x;
+      x = y;
+      y = _dheight - tx - 1;
+    }
+
     uint8_t c = color & 0x0F;
     int index = (x+y*_iwidth)>>1;;
     if ((x & 0x01) == 0) {
@@ -1774,6 +1828,13 @@ void TFT_eSprite::drawFastVLine(int32_t x, int32_t y, int32_t h, uint32_t color)
   }
   else if (_bpp == 4)
   {
+      if (rotation)
+    {
+      if (h < 1) return;
+      while (h--) drawPixel(x, y++, color);
+      return;
+    }
+
     if ((x & 0x01) == 0)
     {
       uint8_t c = (uint8_t) (color & 0xF) << 4;
@@ -1834,6 +1895,12 @@ void TFT_eSprite::drawFastHLine(int32_t x, int32_t y, int32_t w, uint32_t color)
   }
   else if (_bpp == 4)
   {
+    if(rotation)
+    {
+      if (w < 1) return;
+      while (w--) drawPixel(x++, y, color);
+      return;
+    }
     uint8_t c = (uint8_t)color & 0x0F;
     uint8_t c2 = (c | ((c << 4) & 0xF0));
     if ((x & 0x01) == 1)
@@ -1913,6 +1980,18 @@ void TFT_eSprite::fillRect(int32_t x, int32_t y, int32_t w, int32_t h, uint32_t
   }
   else if (_bpp == 4)
   {
+      if (rotation)
+  {
+    if (w < 1 || h < 1) return;
+    for (int32_t yy = 0; yy < h; yy++)
+    {
+      for (int32_t xx = 0; xx < w; xx++)
+      {
+        drawPixel(x + xx, y + yy, color);
+      }
+    }
+    return;
+  }
     uint8_t c1 = (uint8_t)color & 0x0F;
     uint8_t c2 = c1 | ((c1 << 4) & 0xF0);
     if ((x & 0x01) == 0 && (w & 0x01) == 0)

TFT_Drivers/JD79676_Rotation.h

@@ -3,22 +3,22 @@ rotation = m % 4;
 writecommand(EPD_PNLSET);
 switch (rotation) {
     case 0: // Portrait
-        writedata(0x1F); // 0b00011111
+        writedata(0x0F); // 0b00011111
         _width = _init_width;
         _height = _init_height;
         break;
     case 1: // Landscape (Portrait + 90)
-        writedata(0x1B); // 0b00011011
+        writedata(0x0B); // 0b00011011
         _width = _init_height;
         _height = _init_width;
         break;
     case 2: // Inverted Portrait
-        writedata(0x13); // 0b00010011
+        writedata(0x03); // 0b00010011
         _width = _init_width;
         _height = _init_height;
         break;
     case 3: // Landscape (Portrait + 270)
-        writedata(0x17); // 0b00010111
+        writedata(0x07); // 0b00010111
         _width = _init_height;
         _height = _init_width;
         break;