Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-07-28 04:07:47 +00:00
Code Issues Releases Activity

[Commands] Change OK, FAILED and new error messages to uppercase

Browse Source
This commit is contained in:
Ton Huisman
2021-08-02 12:06:16 +02:00
parent 2ec2b64369
commit de1916a6f0
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/src/Commands/Common.cpp
+2 -2
View File
@@ -18,12 +18,12 @@
// Simple function to return "Ok", to avoid flash string duplication in the firmware.
const __FlashStringHelper * return_command_success()
{
return F("\nOk");
return F("\nOK");
}
const __FlashStringHelper * return_command_failed()
{
return F("\nFailed");
return F("\nFAILED");
}
const __FlashStringHelper * return_incorrect_nr_arguments()
src/src/Commands/Tasks.cpp
+10 -10
View File
@@ -77,15 +77,15 @@ const __FlashStringHelper * taskValueSet(struct EventStruct *event, const char *
if (!validateAndParseTaskValueArguments(event, Line, taskIndex, varNr)) {
success = false;
return F("Invalid parameters");
return F("INVALID_PARAMETERS");
}
if (getPluginID_from_TaskIndex(taskIndex) != 33) { // PluginID 33 = Dummy Device
success = false;
return F("Not a 'Dummy' task");
return F("NOT_A_DUMMY_TASK");
}
if (!Settings.TaskDeviceEnabled[taskIndex]) {
success = false;
return F("Task Not Enabled");
return F("TASK_NOT_ENABLED");
}
unsigned int uservarIndex = (VARS_PER_TASK * taskIndex) + varNr;
@@ -96,7 +96,7 @@ const __FlashStringHelper * taskValueSet(struct EventStruct *event, const char *
if (isError(Calculate(TmpStr1, result))) {
success = false;
return F("Calculation Error");
return F("CALCULATION_ERROR");
}
UserVar[uservarIndex] = result;
} else {
@@ -113,7 +113,7 @@ const __FlashStringHelper * Command_Task_Clear(struct EventStruct *event, const
unsigned int varNr;
if (!validateAndParseTaskValueArguments(event, Line, taskIndex, varNr)) {
return F("Invalid parameters");
return F("INVALID_PARAMETERS");
}
taskClear(taskIndex, true);
@@ -142,7 +142,7 @@ const __FlashStringHelper * Command_Task_EnableDisable(struct EventStruct *event
}
return return_command_failed();
}
return F("Invalid parameters");
return F("INVALID_PARAMETERS");
}
const __FlashStringHelper * Command_Task_Disable(struct EventStruct *event, const char *Line)
@@ -168,10 +168,10 @@ const __FlashStringHelper * Command_Task_ValueToggle(struct EventStruct *event,
unsigned int varNr;
if (!validateAndParseTaskValueArguments(event, Line, taskIndex, varNr)) {
return F("Invalid parameters");
return F("INVALID_PARAMETERS");
}
if (!Settings.TaskDeviceEnabled[taskIndex]) {
return F("Task Not Enabled");
return F("TASK_NOT_ENABLED");
}
unsigned int uservarIndex = (VARS_PER_TASK * taskIndex) + varNr;
@@ -202,10 +202,10 @@ const __FlashStringHelper * Command_Task_Run(struct EventStruct *event, const ch
unsigned int varNr;
if (!validateAndParseTaskValueArguments(event, Line, taskIndex, varNr)) {
return F("Invalid parameters");
return F("INVALID_PARAMETERS");
}
if (!Settings.TaskDeviceEnabled[taskIndex]) {
return F("Task Not Enabled");
return F("TASK_NOT_ENABLED");
}
SensorSendTask(taskIndex);