[Cleanup] Reduce bin size using FormSelectOptions class

Author: TD-er

src/_C011.cpp

@@ -111,7 +111,7 @@ bool CPlugin_011(CPlugin::Function function, struct EventStruct *event, String&
             }
           }
 
-          FormSelectorOptions selector(nrOptions, methods);
+          const FormSelectorOptions selector(nrOptions, methods);
           selector.addFormSelector(F("Method"), F("P011httpmethod"), choice);
         }
 

src/_P001_Switch.ino

@@ -86,7 +86,7 @@ boolean Plugin_001(uint8_t function, struct EventStruct *event, String& string)
         const int optionValues[]             = { PLUGIN_001_TYPE_SWITCH, PLUGIN_001_TYPE_DIMMER };
         const uint8_t switchtype             = P001_data_struct::P001_getSwitchType(event);
         constexpr size_t optionCount         = NR_ELEMENTS(optionValues);
-        FormSelectorOptions selector(optionCount, options, optionValues);
+        const FormSelectorOptions selector(optionCount, options, optionValues);
         selector.addFormSelector(F("Switch Type"), F("type"), switchtype);
 
         if (switchtype == PLUGIN_001_TYPE_DIMMER)
@@ -106,7 +106,7 @@ boolean Plugin_001(uint8_t function, struct EventStruct *event, String& string)
           SWITCH_TYPE_PUSH_ACTIVE_LOW,
           SWITCH_TYPE_PUSH_ACTIVE_HIGH };
 */
-        FormSelectorOptions selector(
+        const FormSelectorOptions selector(
           NR_ELEMENTS(buttonOptions),
           buttonOptions); // buttonOptionValues);
         selector.addFormSelector(

src/_P003_Pulse.ino

@@ -163,7 +163,7 @@ boolean Plugin_003(uint8_t function, struct EventStruct *event, String& string)
           F("Time/Delta"),
           # endif // if P003_USE_EXTRA_COUNTERTYPES
         };
-        FormSelectorOptions selector(
+        const FormSelectorOptions selector(
           NR_ELEMENTS(options),
           options);
         selector.addFormSelector(F("Counter Type"), F("countertype"), choice);

src/_P004_Dallas.ino

@@ -140,7 +140,7 @@ boolean Plugin_004(uint8_t function, struct EventStruct *event, String& string)
           if ((resolutionChoice < 9) || (resolutionChoice > 12)) { resolutionChoice = activeRes; }
           constexpr int resultsOptionValues[] { 9, 10, 11, 12 };
 
-          FormSelectorOptions selector(
+          const FormSelectorOptions selector(
             NR_ELEMENTS(resultsOptionValues),
             resultsOptionValues);
           selector.addFormSelector(F("Device Resolution"), F("res"), resolutionChoice);
@@ -152,7 +152,7 @@ boolean Plugin_004(uint8_t function, struct EventStruct *event, String& string)
           const __FlashStringHelper *resultsOptions[] = { F("NaN"), F("-127"), F("0"), F("125"), F("Ignore") };
           constexpr int resultsOptionValues[] { P004_ERROR_NAN, P004_ERROR_MIN_RANGE, P004_ERROR_ZERO, P004_ERROR_MAX_RANGE, P004_ERROR_IGNORE };
 
-          FormSelectorOptions selector(
+          const FormSelectorOptions selector(
             NR_ELEMENTS(resultsOptionValues),
             resultsOptions, resultsOptionValues);
           selector.addFormSelector(F("Error State Value"), F("err"), P004_ERROR_STATE_OUTPUT);

src/_P005_DHT.ino

@@ -65,7 +65,7 @@ boolean Plugin_005(uint8_t function, struct EventStruct *event, String& string)
       constexpr int indices[]{ P005_DHT11, P005_DHT22, P005_DHT12, P005_AM2301, P005_SI7021, P005_MS01 };
       constexpr size_t nrElements = NR_ELEMENTS(indices);
 
-      FormSelectorOptions selector(nrElements, options, indices);
+      const FormSelectorOptions selector(nrElements, options, indices);
       selector.addFormSelector(F("Sensor model"), F("dhttype"), PCONFIG(0));
 
       success = true;

src/_P007_PCF8591.ino

@@ -105,7 +105,7 @@ boolean Plugin_007(uint8_t function, struct EventStruct *event, String& string)
           portNames[x] += x;
         }
         addFormSelectorI2C(F("pi2c"), 8, i2cAddressValues, address);
-        FormSelectorOptions selector(4, portNames, portValues);
+        const FormSelectorOptions selector(4, portNames, portValues);
         selector.addFormSelector(F("Port"), F("pport"), port);
         addFormNote(F(
                       "Selected Port value will be stored in first 'Values' field and consecutively for 'Number Output Values' > Single."));
@@ -143,7 +143,7 @@ boolean Plugin_007(uint8_t function, struct EventStruct *event, String& string)
         0b00110000,
       };
       constexpr size_t optionCount = NR_ELEMENTS(inputModeValues);
-      FormSelectorOptions selector(optionCount, inputModeOptions, inputModeValues);
+      const FormSelectorOptions selector(optionCount, inputModeOptions, inputModeValues);
       selector.addFormSelector(F("Input mode"), F("input_mode"), P007_INPUT_MODE);
 
       addFormCheckBox(F("Enable Analog output (AOUT)"), F("output_mode"), P007_OUTPUT_MODE == P007_OUTPUT_ENABLED);

src/_P009_MCP.ino

@@ -71,7 +71,7 @@ boolean Plugin_009(uint8_t function, struct EventStruct *event, String& string)
           portNames[x] += (x < 8 ? x : x - 8);
         }
         addFormSelectorI2C(F("pi2c"), 8, i2cAddressValues, address);
-        FormSelectorOptions selector(16, portNames, portValues);
+        const FormSelectorOptions selector(16, portNames, portValues);
         selector.addFormSelector(F("Port"), F("pport"),  port);
       } else {
         success = intArrayContains(8, i2cAddressValues, event->Par1);

src/_P010_BH1750.ino

@@ -85,7 +85,7 @@ boolean Plugin_010(uint8_t function, struct EventStruct *event, String& string)
         RESOLUTION_AUTO_HIGH,
       };
       constexpr size_t optionCount = NR_ELEMENTS(optionValuesMode);
-      FormSelectorOptions selector(optionCount, optionsMode, optionValuesMode);
+      const FormSelectorOptions selector(optionCount, optionsMode, optionValuesMode);
       selector.addFormSelector(F("Measurement mode"), F("pmode"), PCONFIG(1));
 
       addFormCheckBox(F("Send sensor to sleep"), F("psleep"), PCONFIG(2));

src/_P011_PME.ino

@@ -84,7 +84,7 @@ boolean Plugin_011(uint8_t function, struct EventStruct *event, String& string)
       const __FlashStringHelper *options[] = { F("Digital"), F("Analog"), F("Input (switch)") };
       const int optionValues[]             = { P011_TYPE_DIGITAL, P011_TYPE_ANALOG, P011_TYPE_SWITCH };
       constexpr size_t optionCount         = NR_ELEMENTS(options);
-      FormSelectorOptions selector(optionCount, options, optionValues);
+      const FormSelectorOptions selector(optionCount, options, optionValues);
       selector.addFormSelector(F("Port Type"), F("p011"), P011_PORT_TYPE);
 
       success = true;

src/_P012_LCD.ino

@@ -97,7 +97,7 @@ boolean Plugin_012(uint8_t function, struct EventStruct *event, String& string)
         };
         const int optionValues2[2]   = { 1, 2 };
         constexpr size_t optionCount = NR_ELEMENTS(optionValues2);
-        FormSelectorOptions selector(optionCount, options2, optionValues2);
+        const FormSelectorOptions selector(optionCount, options2, optionValues2);
         selector.addFormSelector(F("Display Size"), F("psize"), P012_SIZE);
       }
 
@@ -126,7 +126,7 @@ boolean Plugin_012(uint8_t function, struct EventStruct *event, String& string)
         };
         const int optionValues3[]    = { 0, 1, 2 };
         constexpr size_t optionCount = NR_ELEMENTS(optionValues3);
-        FormSelectorOptions selector(optionCount, options3, optionValues3);
+        const FormSelectorOptions selector(optionCount, options3, optionValues3);
         selector.addFormSelector(F("LCD command Mode"), F("pmode"), P012_MODE);
       }