Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-09-14 10:35:30 +00:00
Code Issues Releases Activity

[Cleanup] Use taskIndex_t everywhere where a task index is used.

Browse Source
This commit is contained in:
Gijs Noorlander
2019-10-23 17:07:52 +02:00
parent 68836da315
commit f8168e9fe9
34 changed files with 92 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/_Plugin_Helper.cpp
+6 -6
View File
@@ -23,12 +23,12 @@ String PCONFIG_LABEL(int n) {
void resetPluginTaskData() {
for (byte i = 0; i < TASKS_MAX; ++i) {
for (taskIndex_t i = 0; i < TASKS_MAX; ++i) {
Plugin_task_data[i] = nullptr;
}
}
void clearPluginTaskData(byte taskIndex) {
void clearPluginTaskData(taskIndex_t taskIndex) {
if (validTaskIndex(taskIndex)) {
if (Plugin_task_data[taskIndex] != nullptr) {
delete Plugin_task_data[taskIndex];
@@ -37,7 +37,7 @@ void clearPluginTaskData(byte taskIndex) {
}
}
void initPluginTaskData(byte taskIndex, PluginTaskData_base *data) {
void initPluginTaskData(taskIndex_t taskIndex, PluginTaskData_base *data) {
if (!validTaskIndex(taskIndex)) return;
clearPluginTaskData(taskIndex);
@@ -47,7 +47,7 @@ void initPluginTaskData(byte taskIndex, PluginTaskData_base *data) {
}
}
PluginTaskData_base* getPluginTaskData(byte taskIndex) {
PluginTaskData_base* getPluginTaskData(taskIndex_t taskIndex) {
if (!validTaskIndex(taskIndex)) {
return nullptr;
}
@@ -58,7 +58,7 @@ PluginTaskData_base* getPluginTaskData(byte taskIndex) {
return nullptr;
}
bool pluginTaskData_initialized(byte taskIndex) {
bool pluginTaskData_initialized(taskIndex_t taskIndex) {
// FIXME TD-er: Must check for type also.
if (validTaskIndex(taskIndex)) {
return Plugin_task_data[taskIndex] != nullptr;
@@ -77,7 +77,7 @@ String getPluginCustomArgName(int varNr) {
// if the regular values should also be displayed.
// The call to PLUGIN_WEBFORM_SHOW_VALUES should only return success = true when no regular values should be displayed
// 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(byte taskIndex, byte varNr, const String& label, const String& value, bool addTrailingBreak) {
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();
String breakStr = F("<div class='div_br'></div>");