Merge branch 'mega' into feature/p104-new-plugin-max7219-dotmatrix

This commit is contained in:
Ton Huisman
2021-07-03 21:34:48 +02:00
committed by GitHub
343 changed files with 2256 additions and 2257 deletions
+3 -3
View File
@@ -90,12 +90,12 @@ int getFormItemIntCustomArgName(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)
void pluginWebformShowValue(taskIndex_t taskIndex, byte varNr, const __FlashStringHelper * label, const String& value, bool addTrailingBreak) {
void pluginWebformShowValue(taskIndex_t taskIndex, uint8_t varNr, const __FlashStringHelper * label, const String& value, bool addTrailingBreak) {
pluginWebformShowValue(taskIndex, varNr, String(label), value, addTrailingBreak);
}
void pluginWebformShowValue(taskIndex_t taskIndex,
byte varNr,
uint8_t varNr,
const String& label,
const String& value,
bool addTrailingBreak) {
@@ -127,7 +127,7 @@ void pluginWebformShowValue(const String& valName, const String& valName_id, con
}
}
bool pluginOptionalTaskIndexArgumentMatch(taskIndex_t taskIndex, const String& string, byte paramNr) {
bool pluginOptionalTaskIndexArgumentMatch(taskIndex_t taskIndex, const String& string, uint8_t paramNr) {
if (!validTaskIndex(taskIndex)) {
return false;
}