diff --git a/Android/GyverLamp2.apk b/Android/GyverLamp2.apk index 89b2f1b..1520583 100644 Binary files a/Android/GyverLamp2.apk and b/Android/GyverLamp2.apk differ diff --git a/docs/GyverLamp2_doc.pdf b/docs/GyverLamp2_doc.pdf index a81895c..cd29991 100644 Binary files a/docs/GyverLamp2_doc.pdf and b/docs/GyverLamp2_doc.pdf differ diff --git a/firmware/GyverLamp2_v0.6b/Button.h b/firmware/GyverLamp2_v0.7b/Button.h similarity index 100% rename from firmware/GyverLamp2_v0.6b/Button.h rename to firmware/GyverLamp2_v0.7b/Button.h diff --git a/firmware/GyverLamp2_v0.6b/FFT_C.h b/firmware/GyverLamp2_v0.7b/FFT_C.h similarity index 100% rename from firmware/GyverLamp2_v0.6b/FFT_C.h rename to firmware/GyverLamp2_v0.7b/FFT_C.h diff --git a/firmware/GyverLamp2_v0.6b/FastFilter.h b/firmware/GyverLamp2_v0.7b/FastFilter.h similarity index 100% rename from firmware/GyverLamp2_v0.6b/FastFilter.h rename to firmware/GyverLamp2_v0.7b/FastFilter.h diff --git a/firmware/GyverLamp2_v0.6b/GyverLamp2_v0.6b.ino b/firmware/GyverLamp2_v0.7b/GyverLamp2_v0.7b.ino similarity index 100% rename from firmware/GyverLamp2_v0.6b/GyverLamp2_v0.6b.ino rename to firmware/GyverLamp2_v0.7b/GyverLamp2_v0.7b.ino diff --git a/firmware/GyverLamp2_v0.6b/NTPClient-Gyver.cpp b/firmware/GyverLamp2_v0.7b/NTPClient-Gyver.cpp similarity index 100% rename from firmware/GyverLamp2_v0.6b/NTPClient-Gyver.cpp rename to firmware/GyverLamp2_v0.7b/NTPClient-Gyver.cpp diff --git a/firmware/GyverLamp2_v0.6b/NTPClient-Gyver.h b/firmware/GyverLamp2_v0.7b/NTPClient-Gyver.h similarity index 100% rename from firmware/GyverLamp2_v0.6b/NTPClient-Gyver.h rename to firmware/GyverLamp2_v0.7b/NTPClient-Gyver.h diff --git a/firmware/GyverLamp2_v0.6b/Time.h b/firmware/GyverLamp2_v0.7b/Time.h similarity index 100% rename from firmware/GyverLamp2_v0.6b/Time.h rename to firmware/GyverLamp2_v0.7b/Time.h diff --git a/firmware/GyverLamp2_v0.6b/VolAnalyzer.h b/firmware/GyverLamp2_v0.7b/VolAnalyzer.h similarity index 100% rename from firmware/GyverLamp2_v0.6b/VolAnalyzer.h rename to firmware/GyverLamp2_v0.7b/VolAnalyzer.h diff --git a/firmware/GyverLamp2_v0.6b/analog.ino b/firmware/GyverLamp2_v0.7b/analog.ino similarity index 100% rename from firmware/GyverLamp2_v0.6b/analog.ino rename to firmware/GyverLamp2_v0.7b/analog.ino diff --git a/firmware/GyverLamp2_v0.6b/button.ino b/firmware/GyverLamp2_v0.7b/button.ino similarity index 100% rename from firmware/GyverLamp2_v0.6b/button.ino rename to firmware/GyverLamp2_v0.7b/button.ino diff --git a/firmware/GyverLamp2_v0.6b/data.h b/firmware/GyverLamp2_v0.7b/data.h similarity index 100% rename from firmware/GyverLamp2_v0.6b/data.h rename to firmware/GyverLamp2_v0.7b/data.h diff --git a/firmware/GyverLamp2_v0.6b/eeprom.ino b/firmware/GyverLamp2_v0.7b/eeprom.ino similarity index 100% rename from firmware/GyverLamp2_v0.6b/eeprom.ino rename to firmware/GyverLamp2_v0.7b/eeprom.ino diff --git a/firmware/GyverLamp2_v0.6b/effects.ino b/firmware/GyverLamp2_v0.7b/effects.ino similarity index 98% rename from firmware/GyverLamp2_v0.6b/effects.ino rename to firmware/GyverLamp2_v0.7b/effects.ino index 2035d7c..f0555f2 100644 --- a/firmware/GyverLamp2_v0.6b/effects.ino +++ b/firmware/GyverLamp2_v0.7b/effects.ino @@ -88,13 +88,14 @@ void effectsRoutine() { } break; case 5: // =================================== ЧАСТИЦЫ =================================== - FastLED.clear(); + //FastLED.clear(); + FOR_i(0, cfg.length * cfg.width) leds[i].fadeToBlackBy(70); if (cfg.deviceType > 1) { uint16_t rndVal = 0; FOR_i(0, thisScale / 8) { - int thisY = inoise16(i * 100000000ul + (now.weekMs << 5) * CUR_PRES.speed / 255); + int thisY = inoise16(i * 100000000ul + (now.weekMs << 6) * CUR_PRES.speed / 255); thisY = map(thisY, 20000, 45000, 0, cfg.length); - int thisX = inoise16(i * 100000000ul + 2000000000ul + (now.weekMs << 5) * CUR_PRES.speed / 255); + int thisX = inoise16(i * 100000000ul + 2000000000ul + (now.weekMs << 6) * CUR_PRES.speed / 255); thisX = map(thisX, 20000, 45000, 0, cfg.width); rndVal = rndVal * 2053 + 13849; // random2053 алгоритм @@ -104,7 +105,7 @@ void effectsRoutine() { } else { uint16_t rndVal = 0; FOR_i(0, thisScale / 8) { - int thisPos = inoise16(i * 100000000ul + (now.weekMs << 5) * CUR_PRES.speed / 255); + int thisPos = inoise16(i * 100000000ul + (now.weekMs << 6) * CUR_PRES.speed / 255); thisPos = map(thisPos, 20000, 45000, 0, cfg.length); rndVal = rndVal * 2053 + 13849; // random2053 алгоритм if (thisPos >= 0 && thisPos < cfg.length) leds[thisPos] = CHSV(CUR_PRES.rnd ? rndVal : CUR_PRES.color, 255, 255); diff --git a/firmware/GyverLamp2_v0.6b/fastRandom.h b/firmware/GyverLamp2_v0.7b/fastRandom.h similarity index 100% rename from firmware/GyverLamp2_v0.6b/fastRandom.h rename to firmware/GyverLamp2_v0.7b/fastRandom.h diff --git a/firmware/GyverLamp2_v0.6b/fire2D.ino b/firmware/GyverLamp2_v0.7b/fire2D.ino similarity index 100% rename from firmware/GyverLamp2_v0.6b/fire2D.ino rename to firmware/GyverLamp2_v0.7b/fire2D.ino diff --git a/firmware/GyverLamp2_v0.6b/palettes.h b/firmware/GyverLamp2_v0.7b/palettes.h similarity index 100% rename from firmware/GyverLamp2_v0.6b/palettes.h rename to firmware/GyverLamp2_v0.7b/palettes.h diff --git a/firmware/GyverLamp2_v0.6b/parsing.ino b/firmware/GyverLamp2_v0.7b/parsing.ino similarity index 100% rename from firmware/GyverLamp2_v0.6b/parsing.ino rename to firmware/GyverLamp2_v0.7b/parsing.ino diff --git a/firmware/GyverLamp2_v0.6b/presetManager.ino b/firmware/GyverLamp2_v0.7b/presetManager.ino similarity index 100% rename from firmware/GyverLamp2_v0.6b/presetManager.ino rename to firmware/GyverLamp2_v0.7b/presetManager.ino diff --git a/firmware/GyverLamp2_v0.6b/startup.ino b/firmware/GyverLamp2_v0.7b/startup.ino similarity index 100% rename from firmware/GyverLamp2_v0.6b/startup.ino rename to firmware/GyverLamp2_v0.7b/startup.ino diff --git a/firmware/GyverLamp2_v0.6b/time.ino b/firmware/GyverLamp2_v0.7b/time.ino similarity index 100% rename from firmware/GyverLamp2_v0.6b/time.ino rename to firmware/GyverLamp2_v0.7b/time.ino diff --git a/firmware/GyverLamp2_v0.6b/timeRandom.h b/firmware/GyverLamp2_v0.7b/timeRandom.h similarity index 100% rename from firmware/GyverLamp2_v0.6b/timeRandom.h rename to firmware/GyverLamp2_v0.7b/timeRandom.h diff --git a/firmware/GyverLamp2_v0.6b/timerMillis.h b/firmware/GyverLamp2_v0.7b/timerMillis.h similarity index 100% rename from firmware/GyverLamp2_v0.6b/timerMillis.h rename to firmware/GyverLamp2_v0.7b/timerMillis.h