Fixes for compilation errors on '0_15' branch

Author: bandi13

wled00/FX.cpp

@@ -4861,6 +4861,7 @@ static const char _data_FX_MODE_FLOWSTRIPE[] PROGMEM = "Flow Stripe@Hue speed,Ef
 #define XY(x,y) SEGMENT.XY(x,y)
 
 
+#ifdef WLED_USE_AA_PIXELS
 /////////////////////////////
 //    2D Analog Clock      //
 /////////////////////////////
@@ -4893,14 +4894,15 @@ uint16_t mode_2DAnalogClock(void) {                  // By Andras Fekete (bandi1
   uint16_t second_y = centerY + second_len * sin_t(second_angle);
 
   SEGMENT.fill(BLACK);
-  SEGMENT.draw_circle_antialiased(centerX, centerY, radius, DARKSLATEGRAY);
+  SEGMENT.drawCircleAntialiased(centerX, centerY, radius, 0x333333);
   SEGMENT.drawLineAntialiased(centerX, centerY, second_x, second_y, BLUE);
   SEGMENT.drawLineAntialiased(centerX, centerY, minute_x, minute_y, GREEN);
   SEGMENT.drawLineAntialiased(centerX, centerY, hour_x, hour_y, RED);
 
   return (1000 / WLED_FPS); // calculate once per second
 } // mode_2DAnalogClock()
-static const char _data_FX_MODE_2DANALOGCLOCK[] PROGMEM = "AnalogClock2D@;";
+static const char _data_FX_MODE_2DANALOGCLOCK[] PROGMEM = "Analog Clock 2D@;";
+#endif
 
 // Black hole
 uint16_t mode_2DBlackHole(void) {            // By: Stepko https://editor.soulmatelights.com/gallery/1012 , Modified by: Andrew Tuline
@@ -8133,7 +8135,9 @@ void WS2812FX::setupEffectData() {
 
   addEffect(FX_MODE_2DGEQ, &mode_2DGEQ, _data_FX_MODE_2DGEQ); // audio
 
+#ifdef WLED_USE_AA_PIXELS
   addEffect(FX_MODE_2DANALOGCLOCK, &mode_2DAnalogClock, _data_FX_MODE_2DANALOGCLOCK);
+#endif
   addEffect(FX_MODE_2DNOISE, &mode_2Dnoise, _data_FX_MODE_2DNOISE);
 
   addEffect(FX_MODE_2DFIRENOISE, &mode_2Dfirenoise, _data_FX_MODE_2DFIRENOISE);

wled00/FX.h

@@ -626,7 +626,9 @@ typedef struct Segment {
     void moveY(int8_t delta, bool wrap = false);
     void move(uint8_t dir, uint8_t delta, bool wrap = false);
     void draw_circle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c);
-    void draw_circle_antialiased(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c);
+    #ifdef WLED_USE_AA_PIXELS
+    void drawCircleAntialiased(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c);
+    #endif
     void fill_circle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB c);
     void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, uint32_t c);
     inline void drawLine(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1, CRGB c) { drawLine(x0, y0, x1, y1, RGBW32(c.r,c.g,c.b,0)); } // automatic inline

wled00/FX_2Dfcn.cpp

@@ -370,7 +370,7 @@ void Segment::box_blur(uint16_t i, bool vertical, fract8 blur_amount) {
   for (unsigned j = 0; j < dim1; j++) {
     unsigned x = vertical ? i : j;
     unsigned y = vertical ? j : i;
-    setPixelColorXY(x, y, tmp[j]);
+    setPixelColorXY((int)x, (int)y, tmp[j]);
   }
 }
 
@@ -471,7 +471,8 @@ void Segment::draw_circle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB col) {
   }
 }
 
-void Segment::draw_circle_antialiased(uint16_t cx, uint16_t cy, uint8_t radius, CRGB col) {
+#ifdef WLED_USE_AA_PIXELS
+void Segment::drawCircleAntialiased(uint16_t cx, uint16_t cy, uint8_t radius, CRGB col) {
   if (!isActive() || radius == 0) return; // not active
   const uint16_t cols = virtualWidth();
   const uint16_t rows = virtualHeight();
@@ -496,6 +497,7 @@ void Segment::draw_circle_antialiased(uint16_t cx, uint16_t cy, uint8_t radius,
     }
   }
 }
+#endif
 
 // by stepko, taken from https://editor.soulmatelights.com/gallery/573-blobs
 void Segment::fill_circle(uint16_t cx, uint16_t cy, uint8_t radius, CRGB col) {
@@ -517,7 +519,7 @@ void Segment::nscale8(uint8_t scale) {
   const unsigned cols = virtualWidth();
   const unsigned rows = virtualHeight();
   for (unsigned y = 0; y < rows; y++) for (unsigned x = 0; x < cols; x++) {
-    setPixelColorXY(x, y, CRGB(getPixelColorXY(x, y)).nscale8(scale));
+    setPixelColorXY((int)x, (int)y, CRGB(getPixelColorXY(x, y)).nscale8(scale));
   }
 }