diff --git a/android/LedLamp.aia b/android/LedLamp.aia index c7f628d..265e8e8 100644 Binary files a/android/LedLamp.aia and b/android/LedLamp.aia differ diff --git a/android/LedLamp.apk b/android/LedLamp.apk index 879e090..5057391 100644 Binary files a/android/LedLamp.apk and b/android/LedLamp.apk differ diff --git a/firmware/GyverLamp_v1.4/GyverLamp_v1.4.ino b/firmware/GyverLamp_v1.4/GyverLamp_v1.4.ino index 0de8045..3d950c2 100644 --- a/firmware/GyverLamp_v1.4/GyverLamp_v1.4.ino +++ b/firmware/GyverLamp_v1.4/GyverLamp_v1.4.ino @@ -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) // количество режимов diff --git a/firmware/GyverLamp_v1.4/effectTicker.ino b/firmware/GyverLamp_v1.4/effectTicker.ino index d7e3a8a..d8fdcf8 100644 --- a/firmware/GyverLamp_v1.4/effectTicker.ino +++ b/firmware/GyverLamp_v1.4/effectTicker.ino @@ -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; diff --git a/firmware/GyverLamp_v1.4/effects.ino b/firmware/GyverLamp_v1.4/effects.ino index cf714f0..c9ef89f 100644 --- a/firmware/GyverLamp_v1.4/effects.ino +++ b/firmware/GyverLamp_v1.4/effects.ino @@ -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); } }