Merge branch 'master' into 'master'

Pixelreihenfolge beim Plasma aktualisiert.

See merge request !2
This commit is contained in:
interfisch 2017-03-08 01:40:59 +01:00
commit 786356998e
3 changed files with 5 additions and 3 deletions

View File

@ -524,7 +524,8 @@ void NeoPatterns::PlasmaUpdate()
// Scale the color up to 0..7 . Max brightness is 7.
//strip.setPixelColor(col + (edge * row), strip.Color(color_4, 0, 0) );
setPixelColor(col + (edge * row), Color(color_1, color_2, color_3));
setPixelColor(xyToPos(row, col), Color(color_1, color_2, color_3));
}
}
show();

View File

@ -36,7 +36,7 @@ class NeoPatterns : public Adafruit_NeoPixel
void Icon(uint8_t fontchar, String iconcolor = "#FFFFFF", uint8_t interval = 30);
void IconUpdate();
void IconComplete();
void Plasma(float phase = 0, float phaseIncrement = 0.03, float colorStretch = 0.3, uint8_t interval = 60); // 0.08 and 0.11
void Plasma(float phase = 0, float phaseIncrement = 0.08, float colorStretch = 0.11, uint8_t interval = 60); // 0.08 and 0.11 // 0.03 und 0.3
void PlasmaUpdate();
void SetColor1(uint32_t color);

View File

@ -174,7 +174,8 @@ void setup() {
strip.begin();
strip.clear();
strip.setBrightness(64);
// strip.setBrightness(64);
strip.setBrightness(255); // HEEELLLLLLL :)
strip.show();
stopAfterCompletion = false; // Default