Skip to content

Commit 060c096

Browse files
committed
1628 rings
1 parent ed440d4 commit 060c096

7 files changed

+92
-438
lines changed

ColorWavesPlayground.h

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
// Modified by Jason Coon to replace "magic numbers" with customizable inputs via sliders in the web app.
66

7-
void colorwavesPlayground( CRGB* ledarray, uint16_t numleds, CRGBPalette16& palette, bool useFibonacciOrder)
7+
void colorwavesPlayground( CRGB* ledarray, uint16_t numleds, CRGBPalette16& palette)
88
{
99
static uint16_t sPseudotime = 0;
1010
static uint16_t sLastMillis = 0;
@@ -50,8 +50,6 @@ void colorwavesPlayground( CRGB* ledarray, uint16_t numleds, CRGBPalette16& pale
5050
CRGB newcolor = ColorFromPalette( palette, index, bri8);
5151

5252
uint16_t pixelnumber = i;
53-
54-
if (useFibonacciOrder) pixelnumber = fibonacciToPhysical[i];
5553

5654
pixelnumber = (numleds - 1) - pixelnumber;
5755

@@ -61,10 +59,5 @@ void colorwavesPlayground( CRGB* ledarray, uint16_t numleds, CRGBPalette16& pale
6159

6260
void colorWavesPlayground()
6361
{
64-
colorwavesPlayground(leds, NUM_LEDS, gCurrentPalette, false);
65-
}
66-
67-
void colorWavesPlaygroundFibonacci()
68-
{
69-
colorwavesPlayground(leds, NUM_LEDS, gCurrentPalette, true);
62+
colorwavesPlayground(leds, NUM_LEDS, gCurrentPalette);
7063
}

Map.h

Lines changed: 39 additions & 142 deletions
Large diffs are not rendered by default.

Noise.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ void SetupBlackAndBlueStripedPalette()
8989

9090
void drawNoise(CRGBPalette16 palette, uint8_t hueReduce = 0)
9191
{
92-
for (uint8_t i = 0; i < NUM_LEDS; i++) {
92+
for (uint16_t i = 0; i < NUM_LEDS; i++) {
9393
uint8_t x = coordsX[i];
9494
uint8_t y = coordsY[i];
9595

PacificaFibonacci.h

Lines changed: 0 additions & 116 deletions
This file was deleted.

PridePlayground.h

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ uint8_t sHueBpm = 2;
2828
uint8_t sHueMin = 5;
2929
uint8_t sHueMax = 9;
3030

31-
void fillWithPridePlayground(bool useFibonacciOrder)
31+
void fillWithPridePlayground()
3232
{
3333
static uint16_t sPseudotime = 0;
3434
static uint16_t sLastMillis = 0;
@@ -67,18 +67,12 @@ void fillWithPridePlayground(bool useFibonacciOrder)
6767

6868
uint16_t pixelnumber = i;
6969

70-
if (useFibonacciOrder) pixelnumber = fibonacciToPhysical[i];
71-
7270
pixelnumber = (NUM_LEDS - 1) - pixelnumber;
7371

7472
nblend(leds[pixelnumber], newcolor, 64);
7573
}
7674
}
7775

7876
void pridePlayground() {
79-
fillWithPridePlayground(false);
80-
}
81-
82-
void pridePlaygroundFibonacci() {
83-
fillWithPridePlayground(true);
77+
fillWithPridePlayground();
8478
}

data/index.htm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta charset="utf-8">
66
<meta http-equiv="X-UA-Compatible" content="IE=edge">
77
<meta name="viewport" content="width=device-width, initial-scale=1">
8-
<title>Fibonacci256 by Evil Genius Labs</title>
8+
<title>ESP8266 FastLED Webserver by Evil Genius Labs</title>
99

1010
<!-- request CSS from internet CDN -->
1111
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
@@ -36,7 +36,7 @@
3636
</div>
3737
<div class="collapse navbar-collapse" id="navbar-collapse-1">
3838
<ul class="nav navbar-nav">
39-
<li class="active"><a href="/">Fibonacci256 <span class="sr-only">(current)</span></a></li>
39+
<li class="active"><a href="/">ESP8266 FastLED Webserver <span class="sr-only">(current)</span></a></li>
4040
<li><a href="/simple.htm" target="_blank" title="Simple Mode">Simple</a></li>
4141
<li><a href="/edit.htm" target="_blank" title="Edit Files">Files</a></li>
4242
<li><a href="/update" target="_blank" title="Update Firmware">Firmware</a></li>

0 commit comments

Comments
 (0)