Undo project-specific changes

- Reduce increased precisions
- Switch back to Floyd-Steinberg

Author: TheHans255

src/include/Image.h

@@ -130,7 +130,7 @@ class Image : virtual public NetworkClient, virtual public Adafruit_GFX
 #endif
 
 #if defined(ARDUINO_INKPLATECOLOR) || defined(ARDUINO_INKPLATE4) || defined(ARDUINO_INKPLATE7)
-    int32_t ditherBuffer[3][8][E_INK_WIDTH + 20];
+    int16_t ditherBuffer[3][8][E_INK_WIDTH + 20];
 
     const int kernelWidth = _kernelWidth;
     const int kernelHeight = _kernelHeight;
@@ -140,7 +140,7 @@ class Image : virtual public NetworkClient, virtual public Adafruit_GFX
 
     const unsigned char (*kernel)[_kernelWidth] = _kernel;
 #elif ARDUINO_INKPLATE2
-    int32_t ditherBuffer[3][8][E_INK_WIDTH + 20];
+    int16_t ditherBuffer[3][8][E_INK_WIDTH + 20];
 
     const int kernelWidth = _kernelWidth;
     const int kernelHeight = _kernelHeight;

src/include/ImageDitherColor.cpp

@@ -66,7 +66,7 @@ uint8_t Image::findClosestPalette(int16_t r, int16_t g, int16_t b)
         int16_t pr = RED8(pallete[i]);
         int16_t pg = GREEN8(pallete[i]);
         int16_t pb = BLUE8(pallete[i]);
-        int64_t currentDistance = SQR(r - pr) + SQR(g - pg) + SQR(b - pb);
+        int32_t currentDistance = SQR(r - pr) + SQR(g - pg) + SQR(b - pb);
         if (currentDistance < minDistance) {
             minDistance = currentDistance;
             contenderList[0] = i;
@@ -110,10 +110,6 @@ uint8_t Image::ditherGetPixelBmp(uint32_t px, int i, int j, int w, bool paletted
     int16_t g = GREEN8(px) + ditherBuffer[1][j % 8][i] / coef;
     int16_t b = BLUE8(px) + ditherBuffer[2][j % 8][i] / coef;
 
-    // r = max((int16_t)0, min((int16_t)255, r));
-    // g = max((int16_t)0, min((int16_t)255, g));
-    // b = max((int16_t)0, min((int16_t)255, b));
-
     ditherBuffer[0][j % 8][i] = 0;
     ditherBuffer[1][j % 8][i] = 0;
     ditherBuffer[2][j % 8][i] = 0;

src/include/ImageDitherColorKernels.h

@@ -23,12 +23,12 @@
 // one you want below
 
 // Floyd Steinberg
-// const int _coef = 16;
-// const int _kernelX = 1;
-// const unsigned char _kernel[2][3] = {
-//     {0, 0, 7},
-//     {3, 5, 1},
-// };
+const int _coef = 16;
+const int _kernelX = 1;
+const unsigned char _kernel[2][3] = {
+    {0, 0, 7},
+    {3, 5, 1},
+};
 
 /*
 //J F Jarvis, C N Judice, and W H Ninke "Minimized Average Error"
@@ -41,7 +41,7 @@ const unsigned char _kernel[3][5] = {
 };
 */
 
-
+/*
 // Atkinson
 const int _coef = 8;
 const int _kernelX = 1;
@@ -50,6 +50,7 @@ const unsigned char _kernel[3][4] = {
     {1, 1, 1, 0},
     {0, 1, 0, 0},
 };
+*/
 
 
 /*
@@ -88,3 +89,4 @@ const int _kernelWidth = (sizeof _kernel[0] / sizeof _kernel[0][0]);
 const int _kernelHeight = (sizeof _kernel / sizeof _kernel[0]);
 
 #endif
+

src/include/defines.h

@@ -199,7 +199,7 @@
 
 #define DATA 0x0E8C0030
 
-#define SQR(a)             ((int64_t)(a) * (int64_t)(a))
+#define SQR(a)             ((int32_t)(a) * (int32_t)(a))
 #define COLORDISTSQR(x, y) (SQR(RED8(x) - RED8(y)) + SQR(GREEN8(x) - GREEN8(y)) + SQR(BLUE8(x) - BLUE8(y)))
 
 #endif