Imported-Repos/gunner47-GyverLamp
1
0
Fork 0
mirror of https://github.com/gunner47/GyverLamp.git synced 2025-08-08 09:20:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

add

Browse Source
This commit is contained in:
Alex
2019-06-14 10:29:09 +03:00
parent edb18a28c3
commit 2f9f6bffeb
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/GyverLamp_v1.1/effects.ino
View File

@@ -35,7 +35,6 @@ void fadePixel(byte i, byte j, byte step) { // новый фейдер
// -------------------------------------- огонь ---------------------------------------------
// эффект "огонь"
#define SPARKLES 1 // вылетающие угольки вкл выкл
unsigned char matrixValue[8][16];
unsigned char line[WIDTH];
int pcnt = 0;
@@ -67,9 +66,8 @@ const unsigned char hueMask[8][16] PROGMEM = {
void fireRoutine() {
if (loadingFlag) {
loadingFlag = false;
FastLED.clear();
generateLine();
memset(matrixValue, 0, sizeof(matrixValue));
//FastLED.clear();
generateLine();
}
if (pcnt >= 100) {
shiftUp();
@@ -123,7 +121,7 @@ void drawFrame(int pcnt) {
- pgm_read_byte(&(valueMask[y][newX]));
CRGB color = CHSV(
modes[1].scale + pgm_read_byte(&(hueMask[y][newX])), // H
modes[1].scale * 2.5 + pgm_read_byte(&(hueMask[y][newX])), // H
255, // S
(uint8_t)max(0, nextv) // V
);
@@ -148,7 +146,7 @@ void drawFrame(int pcnt) {
uint8_t newX = x;
if (x > 15) newX = x - 15;
CRGB color = CHSV(
modes[1].scale + pgm_read_byte(&(hueMask[0][newX])), // H
modes[1].scale * 2.5 + pgm_read_byte(&(hueMask[0][newX])), // H
255, // S
(uint8_t)(((100.0 - pcnt) * matrixValue[0][newX] + pcnt * line[newX]) / 100.0) // V
);