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

Скорректированы настройки некоторых эффектов

Browse Source
This commit is contained in:
gunner47
2019-08-31 13:55:51 +03:00
parent 774bff0bb4
commit 7bb8526485
5 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/LedLamp.aia
View File

Binary file not shown.

BIN
android/LedLamp.apk
View File

Binary file not shown.

2
firmware/GyverLamp_v1.4/GyverLamp_v1.4.ino
View File

@@ -134,7 +134,7 @@ uint8_t AP_STATIC_IP[] = {192, 168, 4, 1}; // статичес
#define EFF_MATRIX (19U) // Матрица
#define EFF_LIGHTERS (20U) // Светлячки
#define EFF_LIGHTER_TRACES (21U) // Светлячки со шлейфом
#define EFF_FADING_PIXELS (22U) // Угасающие пиксели
#define EFF_PAINTBALL (22U) // Пейнтбол
#define EFF_CUBE (23U) // Блуждающий кубик
#define EFF_WHITE_COLOR (24U) // Белый свет
#define MODE_AMOUNT (25U) // количество режимов

2
firmware/GyverLamp_v1.4/effectTicker.ino
View File

@@ -31,7 +31,7 @@ void effectsTick()
case EFF_MATRIX: matrixRoutine(); break;
case EFF_LIGHTERS: lightersRoutine(); break;
case EFF_LIGHTER_TRACES: ballsRoutine(); break;
case EFF_FADING_PIXELS: lightBallsRoutine(); break;
case EFF_PAINTBALL: lightBallsRoutine(); break;
case EFF_CUBE: ballRoutine(); break;
case EFF_WHITE_COLOR: whiteColorRoutine(); break;
default: break;

5
firmware/GyverLamp_v1.4/effects.ino
View File

@@ -223,12 +223,13 @@ void rainbowDiagonalRoutine()
FastLED.clear();
}
hue += 4;
hue += 8;
for (uint8_t i = 0; i < WIDTH; i++)
{
for (uint8_t j = 0; j < HEIGHT; j++)
{
CRGB thisColor = CHSV(constrain((uint8_t)(hue + (float)(100 / modes[EFF_RAINBOW_DIAG].Scale) * (float)(WIDTH / HEIGHT * i + j) * (float)(255 / maxDim)), 0, 255), 255, 255);
float twirlFactor = 3.0F * (modes[EFF_RAINBOW_DIAG].Scale / 100.0F); // на сколько оборотов будет закручена матрица, [0..3]
CRGB thisColor = CHSV(constrain((uint8_t)(hue + (float)(WIDTH / HEIGHT * i + j * twirlFactor) * (float)(255 / maxDim)), 0, 255), 255, 255);
drawPixelXY(i, j, thisColor);
}
}