Skip to content

Commit 65030e5

Browse files
pr3ypr3y
authored
Merge pull request #2472 from emericklaw/misc-fixes
Misc fixes
2 parents e9807ed + f439867 commit 65030e5

12 files changed

Lines changed: 50 additions & 228 deletions

File tree

‎src/core/app_launcher.cpp‎

Lines changed: 0 additions & 88 deletions
This file was deleted.

‎src/core/app_launcher.h‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎src/core/led_control.cpp‎

Lines changed: 34 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -249,24 +249,38 @@ void ledEffectTask(void *pvParameters) {
249249
}
250250
#endif
251251

252-
} else if (ledEffect == LED_EFFECT_FIRE) {
253-
for (int i = 0; i < LED_COUNT; i++) {
254-
uint8_t flicker = random(150, 255);
255-
uint8_t isRed = random(0, 2);
256-
if (isRed) {
257-
leds[i] = CRGB(flicker, random(0, flicker / 3), 0);
258-
} else {
259-
leds[i] = CRGB(255, random(flicker / 2, flicker), 0);
252+
} else if (ledEffect == LED_EFFECT_DISCO) {
253+
uint8_t cycleFrames = 11 - ledEffectSpeed;
254+
#ifdef HAS_ENCODER_LED
255+
if ((ledEffectSpeed == 11 && EncoderLedChange != 0) ||
256+
(ledEffectSpeed < 11 && frame % cycleFrames == 0)) {
257+
if (ledEffectSpeed == 11 && EncoderLedChange != 0) { EncoderLedChange = 0; }
258+
#else
259+
if (frame % cycleFrames == 0) {
260+
#endif
261+
for (int i = 0; i < LED_COUNT; i++) {
262+
short randomHue = random(0, 360);
263+
leds[i] = hsvToRgb(randomHue, 255, 255);
260264
}
261265
}
262266
frame++;
263-
264-
} else if (ledEffect == LED_EFFECT_DISCO) {
265-
uint8_t cycleFrames = 12 - ledEffectSpeed;
267+
} else if (ledEffect == LED_EFFECT_FIRE) {
268+
uint8_t cycleFrames = 11 - ledEffectSpeed;
269+
#ifdef HAS_ENCODER_LED
270+
if ((ledEffectSpeed == 11 && EncoderLedChange != 0) ||
271+
(ledEffectSpeed < 11 && frame % cycleFrames == 0)) {
272+
if (ledEffectSpeed == 11 && EncoderLedChange != 0) { EncoderLedChange = 0; }
273+
#else
266274
if (frame % cycleFrames == 0) {
275+
#endif
267276
for (int i = 0; i < LED_COUNT; i++) {
268-
short randomHue = random(0, 360);
269-
leds[i] = hsvToRgb(randomHue, 200, 255);
277+
uint8_t flicker = random(150, 255);
278+
uint8_t isRed = random(0, 2);
279+
if (isRed) {
280+
leds[i] = CRGB(flicker, random(0, flicker / 3), 0);
281+
} else {
282+
leds[i] = CRGB(255, random(flicker / 2, flicker), 0);
283+
}
270284
}
271285
}
272286
frame++;
@@ -591,20 +605,20 @@ void setLedEffectConfig() {
591605
setLedEffect(LED_EFFECT_RAINBOW_BREATHE);
592606
return false;
593607
} },
594-
{"Fire",
595-
[=]() { bruceConfig.setLedEffect(LED_EFFECT_FIRE); },
596-
bruceConfig.ledEffect == LED_EFFECT_FIRE,
597-
[](void *pointer, bool shouldRender) {
598-
setLedEffect(LED_EFFECT_FIRE);
599-
return false;
600-
} },
601608
{"Disco",
602609
[=]() { bruceConfig.setLedEffect(LED_EFFECT_DISCO); },
603610
bruceConfig.ledEffect == LED_EFFECT_DISCO,
604611
[](void *pointer, bool shouldRender) {
605612
setLedEffect(LED_EFFECT_DISCO);
606613
return false;
607614
} },
615+
{"Fire",
616+
[=]() { bruceConfig.setLedEffect(LED_EFFECT_FIRE); },
617+
bruceConfig.ledEffect == LED_EFFECT_FIRE,
618+
[](void *pointer, bool shouldRender) {
619+
setLedEffect(LED_EFFECT_FIRE);
620+
return false;
621+
} },
608622
#endif
609623
{"Config - Speed",
610624
setLedEffectSpeedConfig, false,

‎src/core/led_control.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
#define LED_EFFECT_CHASE 4
1414
#define LED_EFFECT_CHASE_TAIL 5
1515
#define LED_EFFECT_RAINBOW_CHASE 6
16-
#define LED_EFFECT_DISCO 7
17-
#define LED_EFFECT_FIRE 8
18-
#define LED_EFFECT_RAINBOW_BREATHE 9
16+
#define LED_EFFECT_RAINBOW_BREATHE 7
17+
#define LED_EFFECT_DISCO 8
18+
#define LED_EFFECT_FIRE 9
1919

2020
CRGB hsvToRgb(uint16_t h, uint8_t s, uint8_t v);
2121
uint32_t alterOneColorChannel(uint32_t color, uint16_t newR, uint16_t newG, uint16_t newB);

‎src/core/main_menu.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ MainMenu::MainMenu() {
2727
#endif
2828
&clockMenu,
2929
&othersMenu,
30-
#if !defined(LITE_VERSION) && !defined(DISABLE_INTERPRETER)
31-
&appsMenu,
32-
#endif
3330
&configMenu,
3431
};
3532

‎src/core/main_menu.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@
1919
#include "menu_items/RFMenu.h"
2020
#include "menu_items/ScriptsMenu.h"
2121
#include "menu_items/WifiMenu.h"
22-
#include "menu_items/AppsMenu.h"
2322
class MainMenu {
2423
public:
25-
AppsMenu appsMenu;
2624
FileMenu fileMenu;
2725
BleMenu bleMenu;
2826
ClockMenu clockMenu;

‎src/core/menu_items/AppsMenu.cpp‎

Lines changed: 0 additions & 61 deletions
This file was deleted.

‎src/core/menu_items/AppsMenu.h‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎src/core/menu_items/ConfigMenu.cpp‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#include "ConfigMenu.h"
2+
#include "../mykeyboard.h"
23
#include "core/display.h"
34
#include "core/i2c_finder.h"
45
#include "core/main_menu.h"
56
#include "core/settings.h"
67
#include "core/utils.h"
78
#include "core/wifi/wifi_common.h"
8-
#include "../mykeyboard.h"
99
#ifdef HAS_RGB_LED
1010
#include "core/led_control.h"
1111
#endif
@@ -33,6 +33,12 @@ void ConfigMenu::optionsMenu() {
3333
{"Power", [this]() { powerMenu(); } },
3434
};
3535

36+
#if !defined(LITE_VERSION)
37+
if (!appStoreInstalled()) {
38+
localOptions.push_back({"Install App Store", []() { installAppStoreJS(); }});
39+
}
40+
#endif
41+
3642
if (bruceConfig.devMode) {
3743
localOptions.push_back({"Dev Mode", [this]() { devMenu(); }});
3844
}
@@ -165,7 +171,7 @@ void ConfigMenu::systemMenu() {
165171
{"Startup App", [this]() { setStartupApp(); } },
166172
{"Hide/Show Apps", [this]() { mainMenu.hideAppsMenu(); }},
167173
{"Clock", [this]() { setClock(); } },
168-
{String("Keyboard Language: ") + bruceConfig.keyboardLang, [this]() { setKeyboardLanguage(); } },
174+
{String("Keyboard Language: ") + bruceConfig.keyboardLang, [this]() { setKeyboardLanguage(); } },
169175
{"Advanced", [this]() { advancedMenu(); } },
170176
{"Back", []() {} },
171177
};

‎src/core/startup_app.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,9 @@ StartupApp::StartupApp() {
4141
_startupApps["WebUI"] = []() { startWebUi(!wifiConnecttoKnownNet()); };
4242
#if !defined(LITE_VERSION) && !defined(DISABLE_INTERPRETER)
4343
_startupApps["JS Interpreter"] = []() {
44-
FS *fs;
45-
String folder = getScriptsFolder(fs);
44+
FS *fs = nullptr;
45+
getScriptsFolder(fs);
46+
if (fs == nullptr) return;
4647
run_bjs_script_headless(*fs, bruceConfig.startupAppJSInterpreterFile);
4748
};
4849
#endif

0 commit comments

Comments
 (0)