File tree Expand file tree Collapse file tree 16 files changed +3
-52
lines changed
esp8266-fastled-webserver Expand file tree Collapse file tree 16 files changed +3
-52
lines changed Original file line number Diff line number Diff line change 1
1
#include " common.h"
2
2
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
4
4
5
5
// Each Fibonacci board must define the following arrays:
6
6
//
Original file line number Diff line number Diff line change @@ -259,7 +259,7 @@ void paletteNoise() {
259
259
drawNoise (palettes[currentPaletteIndex]);
260
260
}
261
261
262
- // drawPolarNoise() uses angles[] and radii []
262
+ // drawPolarNoise() uses angles[] and radiusProxy []
263
263
void drawPolarNoise (CRGBPalette16 palette, uint8_t hueReduce = 0 )
264
264
{
265
265
for (uint16_t i = 0 ; i < NUM_PIXELS; i++) {
Original file line number Diff line number Diff line change @@ -225,10 +225,6 @@ extern CRGB leds[NUM_PIXELS];
225
225
extern const uint8_t (&radiusProxy) [NUM_PIXELS];
226
226
#endif
227
227
228
- #if HAS_POLAR_COORDS
229
- extern const uint8_t radii[NUM_PIXELS]; // needed in noise.cpp
230
- #endif
231
-
232
228
#include " include/GradientPalettes.hpp"
233
229
#include " include/Fields.hpp"
234
230
#include " include/FSBrowser.hpp"
Original file line number Diff line number Diff line change 146
146
#if IS_FIBONACCI && (!HAS_COORDINATE_MAP )
147
147
#error "IS_FIBONACCI is true, so HAS_COORDINATE_MAP must also be true (but is not)"
148
148
#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
155
149
#if !defined(PARALLEL_OUTPUT_CHANNELS )
156
150
#error "PARALLEL_OUTPUT_CHANNELS must be defined"
157
151
#elif (PARALLEL_OUTPUT_CHANNELS == 1 )
Original file line number Diff line number Diff line change @@ -89,8 +89,7 @@ void dimAll(byte value)
89
89
90
90
// List of patterns to cycle through. Each is defined as a separate function below.
91
91
92
- // NOTE: HAS_POLAR_COORDS implies HAS_COORDINATE_MAP
93
- // IS_FIBONACCI implies HAS_COORDINATE_MAP
92
+ // NOTE: IS_FIBONACCI implies HAS_COORDINATE_MAP
94
93
95
94
const PatternAndName patterns[] = {
96
95
{ pride, " Pride" },
Original file line number Diff line number Diff line change 59
59
#if !defined(HAS_COORDINATE_MAP )
60
60
#define HAS_COORDINATE_MAP 1
61
61
#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
66
62
#if !defined(PARALLEL_OUTPUT_CHANNELS ) // WARNING: Refresh rate for 1628 pixels over single output is ~15 frames / second MAXIMUM....
67
63
#define PARALLEL_OUTPUT_CHANNELS 1
68
64
#endif
Original file line number Diff line number Diff line change 59
59
#if !defined(HAS_COORDINATE_MAP )
60
60
#define HAS_COORDINATE_MAP 1
61
61
#endif
62
- #if !defined(HAS_POLAR_COORDS )
63
- #define HAS_POLAR_COORDS 0
64
- #endif
65
62
#if !defined(PARALLEL_OUTPUT_CHANNELS )
66
63
#define PARALLEL_OUTPUT_CHANNELS 1
67
64
#endif
Original file line number Diff line number Diff line change 59
59
#if !defined(HAS_COORDINATE_MAP )
60
60
#define HAS_COORDINATE_MAP 0
61
61
#endif
62
- #if !defined(HAS_POLAR_COORDS )
63
- #define HAS_POLAR_COORDS 0
64
- #endif
65
62
#if !defined(PARALLEL_OUTPUT_CHANNELS )
66
63
#define PARALLEL_OUTPUT_CHANNELS 1
67
64
#endif
Original file line number Diff line number Diff line change 64
64
#if !defined(HAS_COORDINATE_MAP )
65
65
#define HAS_COORDINATE_MAP 0
66
66
#endif
67
- #if !defined(HAS_POLAR_COORDS )
68
- #define HAS_POLAR_COORDS 0
69
- #endif
70
67
#if !defined(PARALLEL_OUTPUT_CHANNELS )
71
68
#define PARALLEL_OUTPUT_CHANNELS 6
72
69
#endif
Original file line number Diff line number Diff line change 59
59
#if !defined(HAS_COORDINATE_MAP )
60
60
#define HAS_COORDINATE_MAP 1
61
61
#endif
62
- #if !defined(HAS_POLAR_COORDS )
63
- #define HAS_POLAR_COORDS 0
64
- #endif
65
62
#if !defined(PARALLEL_OUTPUT_CHANNELS )
66
63
#define PARALLEL_OUTPUT_CHANNELS 1
67
64
#endif
Original file line number Diff line number Diff line change 59
59
#if !defined(HAS_COORDINATE_MAP )
60
60
#define HAS_COORDINATE_MAP 1
61
61
#endif
62
- #if !defined(HAS_POLAR_COORDS )
63
- #define HAS_POLAR_COORDS 0
64
- #endif
65
62
#if !defined(PARALLEL_OUTPUT_CHANNELS )
66
63
#define PARALLEL_OUTPUT_CHANNELS 1
67
64
#endif
Original file line number Diff line number Diff line change 59
59
#if !defined(HAS_COORDINATE_MAP )
60
60
#define HAS_COORDINATE_MAP 1
61
61
#endif
62
- #if !defined(HAS_POLAR_COORDS )
63
- #define HAS_POLAR_COORDS 0
64
- #endif
65
62
#if !defined(PARALLEL_OUTPUT_CHANNELS )
66
63
#define PARALLEL_OUTPUT_CHANNELS 1
67
64
#endif
Original file line number Diff line number Diff line change 59
59
#if !defined(HAS_COORDINATE_MAP )
60
60
#define HAS_COORDINATE_MAP 1
61
61
#endif
62
- #if !defined(HAS_POLAR_COORDS )
63
- #define HAS_POLAR_COORDS 0
64
- #endif
65
62
#if !defined(PARALLEL_OUTPUT_CHANNELS )
66
63
#define PARALLEL_OUTPUT_CHANNELS 4
67
64
#endif
Original file line number Diff line number Diff line change 102
102
#if !defined(HAS_COORDINATE_MAP )
103
103
#define HAS_COORDINATE_MAP 1
104
104
#endif
105
- #if !defined(HAS_POLAR_COORDS )
106
- #define HAS_POLAR_COORDS 0
107
- #endif
108
105
#if !defined(PARALLEL_OUTPUT_CHANNELS )
109
106
#define PARALLEL_OUTPUT_CHANNELS 1
110
107
#endif
Original file line number Diff line number Diff line change 84
84
#if !defined(HAS_COORDINATE_MAP )
85
85
#define HAS_COORDINATE_MAP 1
86
86
#endif
87
- #if !defined(HAS_POLAR_COORDS )
88
- #define HAS_POLAR_COORDS 0
89
- #endif
90
87
#if !defined(PARALLEL_OUTPUT_CHANNELS )
91
88
#define PARALLEL_OUTPUT_CHANNELS 1
92
89
#endif
Original file line number Diff line number Diff line change 124
124
#define HAS_COORDINATE_MAP 1
125
125
#endif
126
126
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
-
134
127
// PARALLEL_OUTPUT_CHANNELS indicates the number of independent channels
135
128
// that should be configured. When this value == 1, DATA_PIN is used to
136
129
// control all pixels.
You can’t perform that action at this time.
0 commit comments