Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-09-15 11:05:08 +00:00
Code Issues Releases Activity

[Cleanup] Code formatting for Pulse Counter

Browse Source
This commit is contained in:
Gijs Noorlander
2020-04-12 21:59:57 +02:00
parent a9f555538c
commit f15d583b06
3 changed files with 227 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/_Plugin_Helper.cpp
+13 -9
View File
@@ -21,7 +21,6 @@ String PCONFIG_LABEL(int n) {
return F("error");
}
void resetPluginTaskData() {
for (taskIndex_t i = 0; i < TASKS_MAX; ++i) {
Plugin_task_data[i] = nullptr;
@@ -39,17 +38,18 @@ void clearPluginTaskData(taskIndex_t taskIndex) {
void initPluginTaskData(taskIndex_t taskIndex, PluginTaskData_base *data) {
if (!validTaskIndex(taskIndex)) { return; }
clearPluginTaskData(taskIndex);
if (Settings.TaskDeviceEnabled[taskIndex]) {
Plugin_task_data[taskIndex] = data;
Plugin_task_data[taskIndex] = data;
Plugin_task_data[taskIndex]->_taskdata_pluginID = Settings.TaskDeviceNumber[taskIndex];
}
}
PluginTaskData_base* getPluginTaskData(taskIndex_t taskIndex) {
if (pluginTaskData_initialized(taskIndex)) {
return Plugin_task_data[taskIndex];
return Plugin_task_data[taskIndex];
}
return nullptr;
}
@@ -58,12 +58,13 @@ bool pluginTaskData_initialized(taskIndex_t taskIndex) {
if (!validTaskIndex(taskIndex)) {
return false;
}
return Plugin_task_data[taskIndex] != nullptr &&
(Plugin_task_data[taskIndex]->_taskdata_pluginID == Settings.TaskDeviceNumber[taskIndex]);
return Plugin_task_data[taskIndex] != nullptr &&
(Plugin_task_data[taskIndex]->_taskdata_pluginID == Settings.TaskDeviceNumber[taskIndex]);
}
String getPluginCustomArgName(int varNr) {
String argName = F("pc_arg");
argName += varNr + 1;
return argName;
}
@@ -75,12 +76,14 @@ String getPluginCustomArgName(int varNr) {
// Note that the varNr of the custom values should not conflict with the existing variable numbers (e.g. start at VARS_PER_TASK)
String pluginWebformShowValue(taskIndex_t taskIndex, byte varNr, const String& label, const String& value, bool addTrailingBreak) {
String result;
size_t length = 96 + label.length() + value.length();
size_t length = 96 + label.length() + value.length();
String breakStr = F("<div class='div_br'></div>");
if (addTrailingBreak) {
length += breakStr.length();
}
result.reserve(length);
if (varNr > 0) {
result += breakStr;
}
@@ -97,21 +100,22 @@ String pluginWebformShowValue(taskIndex_t taskIndex, byte varNr, const String& l
result += "'>";
result += value;
result += "</div>";
if (addTrailingBreak) {
result += breakStr;
}
return result;
}
bool pluginOptionalTaskIndexArgumentMatch(taskIndex_t taskIndex, byte paramNr, const String& string) {
if (!validTaskIndex(taskIndex)) {
return false;
}
const taskIndex_t found_taskIndex = parseCommandArgumentTaskIndex(string, paramNr);
if (!validTaskIndex(found_taskIndex)) {
// Optional parameter not present
return true;
}
return (found_taskIndex == taskIndex);
return found_taskIndex == taskIndex;
}