Fix header position and remove networkController dependency

Author: JosipKuci

src/graphics/Image/Image.cpp

@@ -15,9 +15,8 @@
  *
  * @authors     Soldered
  ***************************************************/
-
-#include "Image.h"
 #include "Inkplate.h"
+#include "Image.h"
 #include "TJpeg/TJpg_Decoder.h"
 #include "pgmspace.h"
 

src/graphics/Image/Image.h

@@ -20,16 +20,35 @@
 #define __IMAGE_H__
 
 #include "../../features/SdFat/SdFat.h"
-#include "../../system/NetworkController/NetworkController.h"
+#include "WiFi.h"
 
 class Inkplate;
 
+/**
+ * @brief       BitmapHeader structure that includes standard bitmap parameters
+ */
+struct bitmapHeader
+{
+    uint16_t signature;     // Is picture a legal BMP
+    uint32_t fileSize;      // Size of image in bytes
+    uint32_t startRAW;      // Address where raw data (pixel array) can be found/is started
+    uint32_t dibHeaderSize; // Size of the header in bytes
+    uint32_t width;         // Width of image
+    uint32_t height;        // Height of image
+    uint16_t color;         // The number of bits per pixel, which is the color depth of
+                            // the image. Typical values are 1, 4, 8, 16, 24 and 32
+    uint32_t compression;   // The compression method being used. See the next table
+                            // for a list of possible values
+};
+
 /**
  * @brief       Image basic class for work with images
  */
-class Image : virtual public NetworkController
+class Image
 {
   public:
+  
+
     typedef enum
     {
         BMP,

src/graphics/Image/ImageDither.cpp

@@ -15,8 +15,9 @@
  *
  * @authors     Soldered
  ***************************************************/
-#include "Image.h"
 #include "Inkplate.h"
+#include "Image.h"
+
 
 /**
  * @brief       ditherGetPixelBmp calculates dither for given pixel in bmp

src/graphics/Image/bmpHelpers/ImageBMP.cpp

@@ -15,8 +15,9 @@
  *
  * @authors     Soldered.com
  ***************************************************/
-#include "../Image.h"
 #include "Inkplate.h"
+#include "../Image.h"
+
 
 
 /**
@@ -216,11 +217,11 @@ bool Image::drawBitmapFromWeb(const char *url, int x, int y, bool dither, bool i
 
     if (strncmp(url, "http://", 7) == 0)
     {
-        buf = downloadFile(url, &defaultLen);
+        buf = _inkplate->downloadFile(url, &defaultLen);
     }
     else if (strncmp(url, "https://", 8) == 0)
     {
-        buf = downloadFileHTTPS(url, &defaultLen);
+        buf = _inkplate->downloadFileHTTPS(url, &defaultLen);
     }
 
     // Image sometimes doesn't download, so
@@ -255,7 +256,7 @@ bool Image::drawBitmapFromWeb(const char *url, int x, int y, bool dither, bool i
 bool Image::drawBitmapFromWeb(WiFiClient *s, int x, int y, int32_t len, bool dither, bool invert)
 {
     bool ret = 0;
-    uint8_t *buf = downloadFile(s, len);
+    uint8_t *buf = _inkplate->downloadFile(s, len);
 
     // Image sometimes doesn't download, so
     // check if buffer is empty to avoid trying to draw an empty image
@@ -452,7 +453,7 @@ bool Image::drawBmpFromWebAtPosition(const char *url, const Position &position,
 {
     bool ret = 0;
     int32_t defaultLen = E_INK_WIDTH * E_INK_HEIGHT * 4 + 150;
-    uint8_t *buf = downloadFileHTTPS(url, &defaultLen);
+    uint8_t *buf = _inkplate->downloadFileHTTPS(url, &defaultLen);
 
     // Image sometimes doesn't download, so
     // check if buffer is empty to avoid trying to draw an empty image

src/graphics/Image/jpegHelpers/ImageJPEG.cpp

@@ -16,9 +16,10 @@
  * @authors     Soldered
  ***************************************************/
 #include "../../../system/defines.h"
+#include "Inkplate.h"
 #include "../Image.h"
 #include "../TJpeg/TJpg_Decoder.h"
-#include "Inkplate.h"
+
 
 extern Image *_imagePtrJpeg;
 
@@ -126,11 +127,11 @@ bool Image::drawJpegFromWeb(const char *url, int x, int y, bool dither, bool inv
 
     if (strncmp(url, "http://", 7) == 0)
     {
-        buf = downloadFile(url, &defaultLen);
+        buf = _inkplate->downloadFile(url, &defaultLen);
     }
     else if (strncmp(url, "https://", 8) == 0)
     {
-        buf = downloadFileHTTPS(url, &defaultLen);
+        buf = _inkplate->downloadFileHTTPS(url, &defaultLen);
     }
 
     // Image sometimes doesn't download, so
@@ -169,11 +170,11 @@ bool Image::drawJpegFromWebAtPosition(const char *url, const Position &position,
     uint8_t *buff = 0;
     if (strncmp(url, "http://", 7) == 0)
     {
-        buff = downloadFile(url, &defaultLen);
+        buff = _inkplate->downloadFile(url, &defaultLen);
     }
     else if (strncmp(url, "https://", 8) == 0)
     {
-        buff = downloadFileHTTPS(url, &defaultLen);
+        buff = _inkplate->downloadFileHTTPS(url, &defaultLen);
     }
 
     // Image sometimes doesn't download, so
@@ -296,7 +297,7 @@ bool Image::drawJpegFromSdAtPosition(const char *fileName, const Position &posit
 bool Image::drawJpegFromWeb(WiFiClient *s, int x, int y, int32_t len, bool dither, bool invert)
 {
     bool ret = 0;
-    uint8_t *buff = downloadFile(s, len);
+    uint8_t *buff = _inkplate->downloadFile(s, len);
 
     // Image sometimes doesn't download, so
     // check if buffer is empty to avoid trying to draw an empty image

src/graphics/Image/pngHelpers/ImagePNG.cpp

@@ -16,9 +16,10 @@
  * @authors     Soldered.com
  ***************************************************/
 #include "../../../system/defines.h"
+#include "Inkplate.h"
 #include "../Image.h"
 #include "../pngle/pngle.h"
-#include "Inkplate.h"
+
 
 extern Image *_imagePtrPng;
 
@@ -211,11 +212,11 @@ bool Image::drawPngFromWeb(const char *url, int x, int y, bool dither, bool inve
 
     if (strncmp(url, "http://", 7) == 0)
     {
-        buf = downloadFile(url, &defaultLen);
+        buf = _inkplate->downloadFile(url, &defaultLen);
     }
     else if (strncmp(url, "https://", 8) == 0)
     {
-        buf = downloadFileHTTPS(url, &defaultLen);
+        buf = _inkplate->downloadFileHTTPS(url, &defaultLen);
     }
 
     // Image sometimes doesn't download, so
@@ -265,7 +266,7 @@ bool Image::drawPngFromWeb(WiFiClient *s, int x, int y, int32_t len, bool dither
     _pngY = y;
     pngle_set_draw_callback(pngle, pngle_on_draw);
 
-    uint8_t *buff = downloadFile(s, len);
+    uint8_t *buff = _inkplate->downloadFile(s, len);
 
     // Image sometimes doesn't download, so
     // check if buffer is empty to avoid trying to draw an empty image
@@ -312,7 +313,7 @@ bool Image::drawPngFromWebAtPosition(const char *url, const Position &position,
     pngle_set_draw_callback(pngle, pngle_on_draw);
 
     int32_t defaultLen = E_INK_WIDTH * E_INK_HEIGHT * 4 + 100;
-    uint8_t *buff = downloadFile(url, &defaultLen);
+    uint8_t *buff = _inkplate->downloadFile(url, &defaultLen);
 
     // Image sometimes doesn't download, so
     // check if buffer is empty to avoid trying to draw an empty image