Skip to content

Commit fd22be8

Browse files
committed
Removed HAS_POLAR_COORDS
1 parent 1eb461f commit fd22be8

File tree

16 files changed

+3
-52
lines changed

16 files changed

+3
-52
lines changed

esp8266-fastled-webserver/Map.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "common.h"
22

3-
#if HAS_COORDINATE_MAP // IS_FIBONACCI and HAS_POLAR_COORDS each imply HAS_COORDINATE_MAP
3+
#if HAS_COORDINATE_MAP // IS_FIBONACCI implies HAS_COORDINATE_MAP
44

55
// Each Fibonacci board must define the following arrays:
66
//

esp8266-fastled-webserver/Noise.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ void paletteNoise() {
259259
drawNoise(palettes[currentPaletteIndex]);
260260
}
261261

262-
// drawPolarNoise() uses angles[] and radii[]
262+
// drawPolarNoise() uses angles[] and radiusProxy[]
263263
void drawPolarNoise(CRGBPalette16 palette, uint8_t hueReduce = 0)
264264
{
265265
for (uint16_t i = 0; i < NUM_PIXELS; i++) {

esp8266-fastled-webserver/common.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,10 +225,6 @@ extern CRGB leds[NUM_PIXELS];
225225
extern const uint8_t (&radiusProxy) [NUM_PIXELS];
226226
#endif
227227

228-
#if HAS_POLAR_COORDS
229-
extern const uint8_t radii[NUM_PIXELS]; // needed in noise.cpp
230-
#endif
231-
232228
#include "include/GradientPalettes.hpp"
233229
#include "include/Fields.hpp"
234230
#include "include/FSBrowser.hpp"

esp8266-fastled-webserver/config.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,6 @@
146146
#if IS_FIBONACCI && (!HAS_COORDINATE_MAP)
147147
#error "IS_FIBONACCI is true, so HAS_COORDINATE_MAP must also be true (but is not)"
148148
#endif
149-
#if !defined(HAS_POLAR_COORDS) || ((HAS_POLAR_COORDS != 0) && (HAS_POLAR_COORDS != 1))
150-
#error "HAS_POLAR_COORDS must be defined to zero or one"
151-
#endif
152-
#if HAS_POLAR_COORDS && (!HAS_COORDINATE_MAP)
153-
#error "HAS_POLAR_COORDS is true, so HAS_COORDINATE_MAP must also be true (but is not)"
154-
#endif
155149
#if !defined(PARALLEL_OUTPUT_CHANNELS)
156150
#error "PARALLEL_OUTPUT_CHANNELS must be defined"
157151
#elif (PARALLEL_OUTPUT_CHANNELS == 1)

esp8266-fastled-webserver/esp8266-fastled-webserver.ino

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ void dimAll(byte value)
8989

9090
// List of patterns to cycle through. Each is defined as a separate function below.
9191

92-
// NOTE: HAS_POLAR_COORDS implies HAS_COORDINATE_MAP
93-
// IS_FIBONACCI implies HAS_COORDINATE_MAP
92+
// NOTE: IS_FIBONACCI implies HAS_COORDINATE_MAP
9493

9594
const PatternAndName patterns[] = {
9695
{ pride, "Pride" },

esp8266-fastled-webserver/include/configs/product/1628rings.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,6 @@
5959
#if !defined(HAS_COORDINATE_MAP)
6060
#define HAS_COORDINATE_MAP 1
6161
#endif
62-
// TODO: combine HAS_POLAR_COORDS with HAS_COORDINATE_MAP
63-
#if !defined(HAS_POLAR_COORDS)
64-
#define HAS_POLAR_COORDS 1
65-
#endif
6662
#if !defined(PARALLEL_OUTPUT_CHANNELS) // WARNING: Refresh rate for 1628 pixels over single output is ~15 frames / second MAXIMUM....
6763
#define PARALLEL_OUTPUT_CHANNELS 1
6864
#endif

esp8266-fastled-webserver/include/configs/product/chamaeleon64.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@
5959
#if !defined(HAS_COORDINATE_MAP)
6060
#define HAS_COORDINATE_MAP 1
6161
#endif
62-
#if !defined(HAS_POLAR_COORDS)
63-
#define HAS_POLAR_COORDS 0
64-
#endif
6562
#if !defined(PARALLEL_OUTPUT_CHANNELS)
6663
#define PARALLEL_OUTPUT_CHANNELS 1
6764
#endif

esp8266-fastled-webserver/include/configs/product/default.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@
5959
#if !defined(HAS_COORDINATE_MAP)
6060
#define HAS_COORDINATE_MAP 0
6161
#endif
62-
#if !defined(HAS_POLAR_COORDS)
63-
#define HAS_POLAR_COORDS 0
64-
#endif
6562
#if !defined(PARALLEL_OUTPUT_CHANNELS)
6663
#define PARALLEL_OUTPUT_CHANNELS 1
6764
#endif

esp8266-fastled-webserver/include/configs/product/esp8266_thing.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,6 @@
6464
#if !defined(HAS_COORDINATE_MAP)
6565
#define HAS_COORDINATE_MAP 0
6666
#endif
67-
#if !defined(HAS_POLAR_COORDS)
68-
#define HAS_POLAR_COORDS 0
69-
#endif
7067
#if !defined(PARALLEL_OUTPUT_CHANNELS)
7168
#define PARALLEL_OUTPUT_CHANNELS 6
7269
#endif

esp8266-fastled-webserver/include/configs/product/fibonacci128.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@
5959
#if !defined(HAS_COORDINATE_MAP)
6060
#define HAS_COORDINATE_MAP 1
6161
#endif
62-
#if !defined(HAS_POLAR_COORDS)
63-
#define HAS_POLAR_COORDS 0
64-
#endif
6562
#if !defined(PARALLEL_OUTPUT_CHANNELS)
6663
#define PARALLEL_OUTPUT_CHANNELS 1
6764
#endif

esp8266-fastled-webserver/include/configs/product/fibonacci256.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@
5959
#if !defined(HAS_COORDINATE_MAP)
6060
#define HAS_COORDINATE_MAP 1
6161
#endif
62-
#if !defined(HAS_POLAR_COORDS)
63-
#define HAS_POLAR_COORDS 0
64-
#endif
6562
#if !defined(PARALLEL_OUTPUT_CHANNELS)
6663
#define PARALLEL_OUTPUT_CHANNELS 1
6764
#endif

esp8266-fastled-webserver/include/configs/product/fibonacci32.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@
5959
#if !defined(HAS_COORDINATE_MAP)
6060
#define HAS_COORDINATE_MAP 1
6161
#endif
62-
#if !defined(HAS_POLAR_COORDS)
63-
#define HAS_POLAR_COORDS 0
64-
#endif
6562
#if !defined(PARALLEL_OUTPUT_CHANNELS)
6663
#define PARALLEL_OUTPUT_CHANNELS 1
6764
#endif

esp8266-fastled-webserver/include/configs/product/fibonacci512.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,6 @@
5959
#if !defined(HAS_COORDINATE_MAP)
6060
#define HAS_COORDINATE_MAP 1
6161
#endif
62-
#if !defined(HAS_POLAR_COORDS)
63-
#define HAS_POLAR_COORDS 0
64-
#endif
6562
#if !defined(PARALLEL_OUTPUT_CHANNELS)
6663
#define PARALLEL_OUTPUT_CHANNELS 4
6764
#endif

esp8266-fastled-webserver/include/configs/product/fibonacci64.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,6 @@
102102
#if !defined(HAS_COORDINATE_MAP)
103103
#define HAS_COORDINATE_MAP 1
104104
#endif
105-
#if !defined(HAS_POLAR_COORDS)
106-
#define HAS_POLAR_COORDS 0
107-
#endif
108105
#if !defined(PARALLEL_OUTPUT_CHANNELS)
109106
#define PARALLEL_OUTPUT_CHANNELS 1
110107
#endif

esp8266-fastled-webserver/include/configs/product/kraken64.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,6 @@
8484
#if !defined(HAS_COORDINATE_MAP)
8585
#define HAS_COORDINATE_MAP 1
8686
#endif
87-
#if !defined(HAS_POLAR_COORDS)
88-
#define HAS_POLAR_COORDS 0
89-
#endif
9087
#if !defined(PARALLEL_OUTPUT_CHANNELS)
9188
#define PARALLEL_OUTPUT_CHANNELS 1
9289
#endif

esp8266-fastled-webserver/include/configs/product/product_template.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,6 @@
124124
#define HAS_COORDINATE_MAP 1
125125
#endif
126126

127-
// HAS_POLAR_COORDS is true when there are mappings to define
128-
// ... TODO: add definition for polar coordinates define ...
129-
#if !defined(HAS_POLAR_COORDS)
130-
#define HAS_POLAR_COORDS 0
131-
#endif
132-
133-
134127
// PARALLEL_OUTPUT_CHANNELS indicates the number of independent channels
135128
// that should be configured. When this value == 1, DATA_PIN is used to
136129
// control all pixels.

0 commit comments

Comments
 (0)