Mirrors/espurna
2
0
Fork 0
mirror of https://github.com/xoseperez/espurna.git synced 2026-03-11 10:47:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

crash,lights: ensure that settings contain positive value

Browse Source
This commit is contained in:
Maxim Prokhorov
2019-10-17 17:45:28 +03:00
parent b36e5ee396
commit 01b76adff0
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/espurna/crash.ino
View File

@@ -190,7 +190,7 @@ void crashSetup() {
// Minumum of 16 and align for column formatter in crashDump()
// Maximum of flash sector size minus reserved space at the beginning
const uint16_t trace_max = constrain(
((getSetting("sysTraceMax", SAVE_CRASH_STACK_TRACE_MAX).toInt() + 15) & -16),
abs((getSetting("sysTraceMax", SAVE_CRASH_STACK_TRACE_MAX).toInt() + 15) & -16),
0, (SPI_FLASH_SEC_SIZE - crashUsedSpace())
);

22
code/espurna/light.ino
View File

@@ -1172,6 +1172,10 @@ void _lightAPISetup() {
#if TERMINAL_SUPPORT
void _lightChannelDebug(unsigned char id) {
DEBUG_MSG_P(PSTR("Channel #%u (%s): %d\n"), id, lightDesc(id).c_str(), lightChannel(id));
}
void _lightInitCommands() {
terminalRegisterCommand(F("BRIGHTNESS"), [](Embedis* e) {
@@ -1184,14 +1188,17 @@ void _lightInitCommands() {
});
terminalRegisterCommand(F("CHANNEL"), [](Embedis* e) {
if (e->argc < 2) {
terminalError(F("CHANNEL <ID> [<VALUE>]"));
return;
if (!lightChannels()) return;
auto id = -1;
if (e->argc > 1) {
id = String(e->argv[1]).toInt();
}
const int id = String(e->argv[1]).toInt();
if (id < 0 || id >= lightChannels()) {
terminalError(F("Channel value out of range"));
if (id < 0 || id >= static_cast<decltype(id)>(lightChannels())) {
for (unsigned char index = 0; index < lightChannels(); ++index) {
_lightChannelDebug(index);
}
return;
}
@@ -1200,7 +1207,8 @@ void _lightInitCommands() {
lightUpdate(true, true);
}
DEBUG_MSG_P(PSTR("Channel #%u (%s): %d\n"), id, lightDesc(id).c_str(), lightChannel(id));
_lightChannelDebug(id);
terminalOK();
});