Skip to content

Commit b60a6ad

Browse files
TD-erTD-er
committed
[Cleanup] Change addFormSelector calls to use new class
1 parent cca1a26 commit b60a6ad

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+312
-350
lines changed

‎src/_C011.cpp‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,17 @@ bool CPlugin_011(CPlugin::Function function, struct EventStruct *event, String&
102102
uint8_t choice = 0;
103103
const __FlashStringHelper * methods[] = { F("GET"), F("POST"), F("PUT"), F("HEAD"), F("PATCH") };
104104

105-
for (uint8_t i = 0; i < 5; i++)
105+
constexpr int nrOptions = NR_ELEMENTS(methods);
106+
107+
for (uint8_t i = 0; i < nrOptions; i++)
106108
{
107109
if (HttpMethod.equals(methods[i])) {
108110
choice = i;
109111
}
110112
}
111-
addFormSelector(F("Method"), F("P011httpmethod"), 5, methods, nullptr, choice);
113+
114+
FormSelectorOptions selector(nrOptions, methods);
115+
selector.addFormSelector(F("Method"), F("P011httpmethod"), choice);
112116
}
113117

114118
addFormTextBox(F("URI"), F("P011httpuri"), HttpUri, C011_HTTP_URI_MAX_LEN - 1);

‎src/_P003_Pulse.ino‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,10 @@ boolean Plugin_003(uint8_t function, struct EventStruct *event, String& string)
163163
F("Time/Delta"),
164164
# endif // if P003_USE_EXTRA_COUNTERTYPES
165165
};
166-
constexpr size_t optionCount = NR_ELEMENTS(options);
167-
addFormSelector(F("Counter Type"), F("countertype"), optionCount, options, nullptr, choice);
166+
FormSelectorOptions selector(
167+
NR_ELEMENTS(options),
168+
options);
169+
selector.addFormSelector(F("Counter Type"), F("countertype"), choice);
168170

169171
if (choice != 0) {
170172
addHtml(F("<span style=\"color:red\">Total count is not persistent!</span>"));

‎src/_P004_Dallas.ino‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -138,20 +138,24 @@ boolean Plugin_004(uint8_t function, struct EventStruct *event, String& string)
138138
int resolutionChoice = P004_RESOLUTION;
139139

140140
if ((resolutionChoice < 9) || (resolutionChoice > 12)) { resolutionChoice = activeRes; }
141-
const __FlashStringHelper *resultsOptions[] = { F("9"), F("10"), F("11"), F("12") };
142-
const int resultsOptionValues[] = { 9, 10, 11, 12 };
143-
constexpr size_t optionCount = NR_ELEMENTS(resultsOptionValues);
144-
addFormSelector(F("Device Resolution"), F("res"), optionCount, resultsOptions, resultsOptionValues, resolutionChoice);
145-
addHtml(F(" Bit"));
141+
constexpr int resultsOptionValues[] { 9, 10, 11, 12 };
142+
143+
FormSelectorOptions selector(
144+
NR_ELEMENTS(resultsOptionValues),
145+
resultsOptionValues);
146+
selector.addFormSelector(F("Device Resolution"), F("res"), resolutionChoice);
147+
addUnit(F("bit"));
146148
}
147149

148150
{
149151
// Value in case of Error
150152
const __FlashStringHelper *resultsOptions[] = { F("NaN"), F("-127"), F("0"), F("125"), F("Ignore") };
151-
int resultsOptionValues[] =
152-
{ P004_ERROR_NAN, P004_ERROR_MIN_RANGE, P004_ERROR_ZERO, P004_ERROR_MAX_RANGE, P004_ERROR_IGNORE };
153-
constexpr size_t optionCount = NR_ELEMENTS(resultsOptionValues);
154-
addFormSelector(F("Error State Value"), F("err"), optionCount, resultsOptions, resultsOptionValues, P004_ERROR_STATE_OUTPUT);
153+
constexpr int resultsOptionValues[] { P004_ERROR_NAN, P004_ERROR_MIN_RANGE, P004_ERROR_ZERO, P004_ERROR_MAX_RANGE, P004_ERROR_IGNORE };
154+
155+
FormSelectorOptions selector(
156+
NR_ELEMENTS(resultsOptionValues),
157+
resultsOptions, resultsOptionValues);
158+
selector.addFormSelector(F("Error State Value"), F("err"), P004_ERROR_STATE_OUTPUT);
155159
}
156160
addFormNote(F("External pull up resistor is needed, see docs!"));
157161

‎src/_P005_DHT.ino‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ boolean Plugin_005(uint8_t function, struct EventStruct *event, String& string)
6262
{
6363
const __FlashStringHelper *options[] = { F("DHT 11"), F("DHT 22"), F("DHT 12"), F("Sonoff am2301"), F("Sonoff si7021"),
6464
F("Sonoff MS01") };
65-
const int indices[] = { P005_DHT11, P005_DHT22, P005_DHT12, P005_AM2301, P005_SI7021, P005_MS01 };
66-
65+
constexpr int indices[]{ P005_DHT11, P005_DHT22, P005_DHT12, P005_AM2301, P005_SI7021, P005_MS01 };
6766
constexpr size_t nrElements = NR_ELEMENTS(indices);
6867

69-
addFormSelector(F("Sensor model"), F("dhttype"), nrElements, options, indices, PCONFIG(0));
68+
FormSelectorOptions selector(nrElements, options, indices);
69+
selector.addFormSelector(F("Sensor model"), F("dhttype"), PCONFIG(0));
7070

7171
success = true;
7272
break;

‎src/_P007_PCF8591.ino‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ boolean Plugin_007(uint8_t function, struct EventStruct *event, String& string)
105105
portNames[x] += x;
106106
}
107107
addFormSelectorI2C(F("pi2c"), 8, i2cAddressValues, address);
108-
addFormSelector(F("Port"), F("pport"), 4, portNames, portValues, port);
108+
FormSelectorOptions selector(4, portNames, portValues);
109+
selector.addFormSelector(F("Port"), F("pport"), port);
109110
addFormNote(F(
110111
"Selected Port value will be stored in first 'Values' field and consecutively for 'Number Output Values' &gt; Single."));
111112
} else {
@@ -142,7 +143,8 @@ boolean Plugin_007(uint8_t function, struct EventStruct *event, String& string)
142143
0b00110000,
143144
};
144145
constexpr size_t optionCount = NR_ELEMENTS(inputModeValues);
145-
addFormSelector(F("Input mode"), F("input_mode"), optionCount, inputModeOptions, inputModeValues, P007_INPUT_MODE);
146+
FormSelectorOptions selector(optionCount, inputModeOptions, inputModeValues);
147+
selector.addFormSelector(F("Input mode"), F("input_mode"), P007_INPUT_MODE);
146148

147149
addFormCheckBox(F("Enable Analog output (AOUT)"), F("output_mode"), P007_OUTPUT_MODE == P007_OUTPUT_ENABLED);
148150

‎src/_P009_MCP.ino‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ boolean Plugin_009(uint8_t function, struct EventStruct *event, String& string)
7171
portNames[x] += (x < 8 ? x : x - 8);
7272
}
7373
addFormSelectorI2C(F("pi2c"), 8, i2cAddressValues, address);
74-
addFormSelector(F("Port"), F("pport"), 16, portNames, portValues, port);
74+
FormSelectorOptions selector(16, portNames, portValues);
75+
selector.addFormSelector(F("Port"), F("pport"), port);
7576
} else {
7677
success = intArrayContains(8, i2cAddressValues, event->Par1);
7778
}

‎src/_P010_BH1750.ino‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ boolean Plugin_010(uint8_t function, struct EventStruct *event, String& string)
8585
RESOLUTION_AUTO_HIGH,
8686
};
8787
constexpr size_t optionCount = NR_ELEMENTS(optionValuesMode);
88-
addFormSelector(F("Measurement mode"), F("pmode"), optionCount, optionsMode, optionValuesMode, PCONFIG(1));
88+
FormSelectorOptions selector(optionCount, optionsMode, optionValuesMode);
89+
selector.addFormSelector(F("Measurement mode"), F("pmode"), PCONFIG(1));
8990

9091
addFormCheckBox(F("Send sensor to sleep"), F("psleep"), PCONFIG(2));
9192

‎src/_P011_PME.ino‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ boolean Plugin_011(uint8_t function, struct EventStruct *event, String& string)
8484
const __FlashStringHelper *options[] = { F("Digital"), F("Analog"), F("Input (switch)") };
8585
const int optionValues[] = { P011_TYPE_DIGITAL, P011_TYPE_ANALOG, P011_TYPE_SWITCH };
8686
constexpr size_t optionCount = NR_ELEMENTS(options);
87-
addFormSelector(F("Port Type"), F("p011"), optionCount, options, optionValues, P011_PORT_TYPE);
87+
FormSelectorOptions selector(optionCount, options, optionValues);
88+
selector.addFormSelector(F("Port Type"), F("p011"), P011_PORT_TYPE);
8889

8990
success = true;
9091
break;

‎src/_P012_LCD.ino‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ boolean Plugin_012(uint8_t function, struct EventStruct *event, String& string)
9797
};
9898
const int optionValues2[2] = { 1, 2 };
9999
constexpr size_t optionCount = NR_ELEMENTS(optionValues2);
100-
addFormSelector(F("Display Size"), F("psize"), optionCount, options2, optionValues2, P012_SIZE);
100+
FormSelectorOptions selector(optionCount, options2, optionValues2);
101+
selector.addFormSelector(F("Display Size"), F("psize"), P012_SIZE);
101102
}
102103

103104
{
@@ -125,7 +126,8 @@ boolean Plugin_012(uint8_t function, struct EventStruct *event, String& string)
125126
};
126127
const int optionValues3[] = { 0, 1, 2 };
127128
constexpr size_t optionCount = NR_ELEMENTS(optionValues3);
128-
addFormSelector(F("LCD command Mode"), F("pmode"), optionCount, options3, optionValues3, P012_MODE);
129+
FormSelectorOptions selector(optionCount, options3, optionValues3);
130+
selector.addFormSelector(F("LCD command Mode"), F("pmode"), P012_MODE);
129131
}
130132

131133
success = true;

‎src/_P013_HCSR04.ino‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,8 @@ boolean Plugin_013(uint8_t function, struct EventStruct *even
131131
# endif // if P013_FEATURE_COMBINED_MODE
132132
};
133133
constexpr size_t optionCount = NR_ELEMENTS(optionValuesOpMode);
134-
addFormSelector(F("Mode"), F("pmode"), optionCount, optionsOpMode, optionValuesOpMode, P013_OPERATINGMODE);
134+
FormSelectorOptions selector(optionCount, optionsOpMode, optionValuesOpMode);
135+
selector.addFormSelector(F("Mode"), F("pmode"), P013_OPERATINGMODE);
135136
}
136137

137138
if ((P013_OPERATINGMODE == OPMODE_STATE)
@@ -155,7 +156,8 @@ boolean Plugin_013(uint8_t function, struct EventStruct *even
155156
F("Imperial"),
156157
};
157158
constexpr size_t optionCount = NR_ELEMENTS(optionValuesUnit);
158-
addFormSelector(F("Unit"), F("pUnit"), optionCount, optionsUnit, optionValuesUnit, P013_MEASURINGUNIT);
159+
FormSelectorOptions selector(optionCount, optionsUnit, optionValuesUnit);
160+
selector.addFormSelector(F("Unit"), F("pUnit"), P013_MEASURINGUNIT);
159161
}
160162

161163
{
@@ -165,7 +167,8 @@ boolean Plugin_013(uint8_t function, struct EventStruct *even
165167
F("Median"),
166168
};
167169
constexpr size_t optionCount = NR_ELEMENTS(optionValuesFilter);
168-
addFormSelector(F("Filter"), F("fltr"), optionCount, optionsFilter, optionValuesFilter, P013_FILTERTYPE);
170+
FormSelectorOptions selector(optionCount, optionsFilter, optionValuesFilter);
171+
selector.addFormSelector(F("Filter"), F("fltr"), P013_FILTERTYPE);
169172
}
170173

171174
// enable filtersize option if filter is used,

0 commit comments

Comments
 (0)