Skip to content

Commit 8ad29ca

Browse files
henrygabhenrygab
authored
Merge pull request #224 from jasoncoon/jcoon/add-chamaeleon64
Added Chamaeleon64 to main branch.
2 parents 0ada857 + 6424660 commit 8ad29ca

File tree

4 files changed

+90
-1
lines changed

4 files changed

+90
-1
lines changed

‎esp8266-fastled-webserver/Map.cpp

+9
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,15 @@
116116
// const uint8_t tentacle4[8] { 40, 41, 42, 43, 44, 45, 46, 47 };
117117
// const uint8_t tentacle5[8] { 48, 49, 50, 51, 52, 53, 54, 55 };
118118
// const uint8_t tentacle6[8] { 56, 57, 58, 59, 60, 61, 62, 63 };
119+
#elif defined(PRODUCT_CHAMAELEON64)
120+
const uint8_t coordsX[NUM_PIXELS] { 255, 240, 234, 216, 221, 224, 204, 204, 201, 185, 196, 214, 228, 187, 188, 178, 156, 138, 129, 124, 127, 167, 175, 161, 146, 153, 141, 124, 105, 121, 127, 106, 106, 94, 89, 80, 74, 65, 54, 44, 26, 33, 38, 59, 80, 93, 103, 112, 14, 15, 5, 0, 4, 17, 42, 66, 81, 76, 53, 33, 37, 59, 63, 47 };
121+
const uint8_t coordsY[NUM_PIXELS] { 127, 155, 121, 122, 155, 191, 209, 175, 139, 105, 82, 60, 43, 165, 193, 135, 144, 142, 110, 75, 36, 171, 225, 199, 172, 244, 211, 161, 150, 194, 244, 255, 219, 187, 237, 209, 173, 233, 192, 216, 233, 187, 155, 150, 138, 105, 74, 40, 184, 154, 124, 90, 53, 19, 0, 9, 39, 80, 96, 76, 33, 30, 63, 57 };
122+
const uint8_t angles[NUM_PIXELS] { 179, 192, 176, 175, 195, 212, 225, 210, 188, 158, 146, 141, 139, 211, 226, 187, 209, 233, 95, 85, 89, 226, 243, 244, 246, 256, 259, 274, 313, 274, 269, 278, 282, 298, 288, 299, 318, 299, 317, 312, 312, 326, 341, 340, 346, 31, 65, 79, 332, 345, 0, 15, 30, 43, 55, 61, 61, 41, 22, 27, 45, 54, 44, 40 };
123+
const uint8_t radii[NUM_PIXELS] { 206, 185, 168, 135, 150, 185, 178, 137, 107, 83, 122, 172, 213, 101, 134, 64, 32, 3, 0, 65, 137, 80, 172, 116, 59, 191, 126, 31, 28, 93, 186, 210, 144, 95, 185, 144, 99, 197, 150, 195, 241, 175, 141, 101, 57, 43, 77, 132, 204, 182, 196, 215, 236, 255, 253, 215, 153, 97, 118, 167, 210, 188, 137, 166 };
124+
static_assert(NUM_PIXELS == ARRAY_SIZE2(radii), "");
125+
static const uint8_t (&radiusProxy)[NUM_PIXELS] = radii;
126+
static const uint8_t RADII_SCALE_DIVISOR { 1 }; // radii[] values are already in range [0..255]
127+
static const uint8_t RADII_SCALE_MULTIPLIER { 1 }; // radii[] values are already in range [0..255]
119128
#elif defined(PRODUCT_1628_RINGS)
120129
// Yes, this is 1628 pixels ... all driven by one ESP8266
121130
// 20 concentric rings of pixel goodness!

‎esp8266-fastled-webserver/config.h

+3
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
// #define PRODUCT_FIBONACCI64_NANO // 33mm, SK6805-EC15, ~5mA/pixel
3636
// #define PRODUCT_FIBONACCI32
3737
// #define PRODUCT_KRAKEN64
38+
// #define PRODUCT_CHAMAELEON64
3839
// #define PRODUCT_ESP8266_THING // aka parallel (6-output)
3940
// #define PRODUCT_1628_RINGS
4041
#endif /// !defined(BUILDING_USING_PLATFORMIO)
@@ -59,6 +60,8 @@
5960
#include "./include/configs/product/1628rings.h"
6061
#elif defined(PRODUCT_KRAKEN64)
6162
#include "./include/configs/product/kraken64.h"
63+
#elif defined(PRODUCT_CHAMAELEON64)
64+
#include "./include/configs/product/chamaeleon64.h"
6265
#elif defined(PRODUCT_FIBONACCI32)
6366
#include "./include/configs/product/fibonacci32.h"
6467
#elif defined(PRODUCT_FIBONACCI64_FULL) || defined(PRODUCT_FIBONACCI64_MINI) || defined(PRODUCT_FIBONACCI64_MICRO) || defined(PRODUCT_FIBONACCI64_NANO)

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

+70
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
/*
2+
ESP8266 FastLED WebServer: https://github.com/jasoncoon/esp8266-fastled-webserver
3+
Copyright (C) Jason Coon
4+
5+
This program is free software: you can redistribute it and/or modify
6+
it under the terms of the GNU General Public License as published by
7+
the Free Software Foundation, either version 3 of the License, or
8+
(at your option) any later version.
9+
10+
This program is distributed in the hope that it will be useful,
11+
but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
GNU General Public License for more details.
14+
15+
You should have received a copy of the GNU General Public License
16+
along with this program. If not, see <http://www.gnu.org/licenses/>.
17+
*/
18+
#pragma once
19+
20+
#if !defined(ESP8266_FASTLED_WEBSERVER_PRODUCT_CHAMAELEON64_H)
21+
#define ESP8266_FASTLED_WEBSERVER_PRODUCT_CHAMAELEON64_H
22+
23+
#if !defined(LED_TYPE)
24+
#define LED_TYPE WS2812B
25+
#endif
26+
#if !defined(COLOR_ORDER)
27+
#define COLOR_ORDER GRB
28+
#endif
29+
#if !defined(NUM_PIXELS)
30+
#define NUM_PIXELS 64
31+
#endif
32+
#if !defined(AVAILABLE_MILLI_AMPS)
33+
#define AVAILABLE_MILLI_AMPS 1400 // IMPORTANT: set the max milli-Amps of your power supply (4A = 4000mA)
34+
#endif
35+
#if !defined(MAX_MILLI_AMPS_PER_PIXEL)
36+
#define MAX_MILLI_AMPS_PER_PIXEL 60 // IMPORTANT: set to larger value if necessary
37+
#endif
38+
#if !defined(FRAMES_PER_SECOND)
39+
#define FRAMES_PER_SECOND 120
40+
#endif
41+
#if !defined(DEFAULT_PATTERN_INDEX)
42+
#define DEFAULT_PATTERN_INDEX 0
43+
#endif
44+
#if !defined(DEFAULT_BRIGHTNESS_INDEX)
45+
#define DEFAULT_BRIGHTNESS_INDEX 3
46+
#endif
47+
#if !defined(DEFAULT_COLOR_CORRECTION)
48+
#define DEFAULT_COLOR_CORRECTION TypicalSMD5050
49+
#endif
50+
#if !defined(NAME_PREFIX)
51+
#define NAME_PREFIX "Chamaeleon64-"
52+
#endif
53+
#if !defined(PRODUCT_FRIENDLY_NAME)
54+
#define PRODUCT_FRIENDLY_NAME "Chamaeleon64"
55+
#endif
56+
#if !defined(IS_FIBONACCI)
57+
#define IS_FIBONACCI 0
58+
#endif
59+
#if !defined(HAS_COORDINATE_MAP)
60+
#define HAS_COORDINATE_MAP 1
61+
#endif
62+
#if !defined(HAS_POLAR_COORDS)
63+
#define HAS_POLAR_COORDS 0
64+
#endif
65+
#if !defined(PARALLEL_OUTPUT_CHANNELS)
66+
#define PARALLEL_OUTPUT_CHANNELS 1
67+
#endif
68+
69+
70+
#endif // ESP8266_FASTLED_WEBSERVER_PRODUCT_CHAMAELEON64_H

‎platformio.ini

+8-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
[platformio]
1919
extra_configs = platformio_override.ini ; so users can easily override settings
20-
default_envs = fastled_webserver__d1_mini, fib512__d1_mini, fib256__d1_mini, fib128__d1_mini, fib64_full__d1_mini, fib64_mini__d1_mini, fib32__d1_mini, esp_thing__d1_mini, kraken64__d1_mini, esp_thing__d1_mini, 1628_rings__d1_mini
20+
default_envs = fastled_webserver__d1_mini, fib512__d1_mini, fib256__d1_mini, fib128__d1_mini, fib64_full__d1_mini, fib64_mini__d1_mini, fib32__d1_mini, esp_thing__d1_mini, kraken64__d1_mini, chamaeleon64__d1_mini, esp_thing__d1_mini, 1628_rings__d1_mini
2121
; default_envs = fastled_webserver
2222
; default_envs = fib512__d1_mini
2323
; default_envs = fib256__d1_mini
@@ -29,6 +29,7 @@ default_envs = fastled_webserver__d1_mini, fib512__d1_mini, fib256__d1_mini, fib
2929
; default_envs = fib32__d1_mini
3030
; default_envs = esp_thing__d1_mini
3131
; default_envs = kraken64__d1_mini
32+
; default_envs = chamaeleon64__d1_mini
3233
; default_envs = esp_thing__d1_mini
3334
; default_envs = 1628_rings__d1_mini
3435

@@ -224,6 +225,12 @@ build_flags =
224225
${common.build_flags_esp8266}
225226
-D PRODUCT_KRAKEN64
226227

228+
[env:chamaeleon64__d1_mini]
229+
extends = common__d1_mini
230+
build_flags =
231+
${common.build_flags_esp8266}
232+
-D PRODUCT_CHAMAELEON64
233+
227234
[env:esp_thing__d1_mini]
228235
extends = common__d1_mini
229236
build_flags =

0 commit comments

Comments
 (0)