Move objects names to singular form

Author: manchoz

examples/Application/IrrigationSimple/CustomTasks.cpp

@@ -39,7 +39,7 @@ void openSolenoidValve()
     Serial.print("] Opening Valve: ");
 
     // Open the Solid State Relay on Channel 1
-    Relays.on(RELAYS_CH01);
+    Relay.on(RELAY_CH01);
 
     Serial.println("Valve Open");
 }
@@ -53,7 +53,7 @@ void closeSolenoidValve()
     Serial.print("] Closing Valve: ");
 
     // Close the Solid State Relay on Channel 1
-    Relays.off(RELAYS_CH01);
+    Relay.off(RELAY_CH01);
 
     Serial.println("Valve Closed");
 }
@@ -83,8 +83,8 @@ void getSensors()
 
     Serial.print("Moisture: ");
 
-    auto value = getAverageInputsRead(INPUTS_05V_CH01);
-    auto perc = getMoisturePerc(INPUTS_05V_CH01);
+    auto value = getAverageInputRead(INPUT_05V_CH01);
+    auto perc = getMoisturePerc(INPUT_05V_CH01);
 
     DataPoint d{value, perc};
 

examples/Application/IrrigationSimple/Helpers.cpp

@@ -59,33 +59,33 @@ float getAverage05VRead(int pin)
     constexpr size_t loops { 10 };
     constexpr float toV { 3.3f / float { (1 << ADC_RESOLUTION) - 1 } };
 
-    // Resistor divider on Inputs ports
+    // Resistor divider on Input ports
     constexpr float rDiv { 17.4f / (10.0f + 17.4f) };
 
     int tot { 0 };
 
     analogReadResolution(ADC_RESOLUTION);
 
-    Inputs.enable();
+    Input.enable();
     for (auto i = 0; i < loops; i++)
-        tot += Inputs.analogRead(pin);
-    Inputs.disable();
+        tot += Input.analogRead(pin);
+    Input.disable();
 
     const auto avg = float { tot } * toV / float { loops };
 
     return avg / rDiv;
 }
 
-int getAverageInputsRead(int pin, const size_t loops)
+int getAverageInputRead(int pin, const size_t loops)
 {
     unsigned int tot { 0 };
 
     analogReadResolution(ADC_RESOLUTION);
 
-    Inputs.enable();
+    Input.enable();
     for (auto i = 0; i < loops; i++)
-        tot += Inputs.analogRead(pin);
-    Inputs.disable();
+        tot += Input.analogRead(pin);
+    Input.disable();
 
     return tot / loops;
 }
@@ -96,7 +96,7 @@ int getMoisturePerc(int pin)
     static long dryValue { 2160 };
     static long wetValue { 975 };
 
-    auto val = getAverageInputsRead(pin);
+    auto val = getAverageInputRead(pin);
 
     // Self-update dry/wet values range.
     if (val > dryValue)

examples/Application/IrrigationSimple/Helpers.h

@@ -4,13 +4,14 @@
 #include "TimeHelpers.h"
 #include <Arduino_EdgeControl.h>
 #include <TimeAlarms.h>
+#include <mbed.h>
 
 #include <list>
 #include <map>
 
 void setSystemClock(String date = __DATE__, String time = __TIME__);
 void statusPrint();
-int getAverageInputsRead(int pin, size_t loops = 20);
+int getAverageInputRead(int pin, size_t loops = 20);
 float getAverage05VRead(int pin);
 int getMoisturePerc(int pin);
 

examples/Application/IrrigationSimple/IrrigationSimple.ino

@@ -90,19 +90,19 @@ void setup()
     // Init the sensors inputs.
     // If needed, will also take care of enabling the
     // 3V3 and 12V power rails and to initialize the IO Expander.
-    Inputs.begin();
+    Input.begin();
 
     Latching.begin();
     Latching.channelDirection(LATCHING_OUT_1, POSITIVE);
     Latching.strobe(5000);
     Latching.channelDirection(LATCHING_OUT_1, NEGATIVE);
     Latching.strobe(5000);
 
-    Relays.begin();
+    Relay.begin();
     delay(1000);
-    Relays.on(RELAYS_CH01);
+    Relay.on(RELAY_CH01);
     delay(5000);
-    Relays.off(RELAYS_CH01);
+    Relay.off(RELAY_CH01);
 
     // Load alarm tasks list from file on SD.
     // See example alarmtab.txt for example and

examples/Application/IrrigationSimpleLCD/CustomTasks.cpp

@@ -54,7 +54,7 @@ void openSolenoidValve()
     LCD.print("Opening Valve   ");
 
     // Open the Solid State Relay on Channel 1
-    Relays.on(RELAYS_CH01);
+    Relay.on(RELAY_CH01);
 
     LCD.setCursor(0, 1);
     LCD.print("Valve Open      ");
@@ -74,7 +74,7 @@ void closeSolenoidValve()
     LCD.print("Closing Valve   ");
 
     // Close the Solid State Relay on Channel 1
-    Relays.off(RELAYS_CH01);
+    Relay.off(RELAY_CH01);
 
     LCD.setCursor(0, 1);
     LCD.print("Valve Closed    ");
@@ -110,8 +110,8 @@ void getSensors()
     String msg = "Moisture: ";
     Serial.print(msg);
 
-    auto value = getAverageInputsRead(INPUTS_05V_CH01);
-    auto perc = getMoisturePerc(INPUTS_05V_CH01);
+    auto value = getAverageInputRead(INPUT_05V_CH01);
+    auto perc = getMoisturePerc(INPUT_05V_CH01);
 
     DataPoint d{value, perc};
 

examples/Application/IrrigationSimpleLCD/Helpers.cpp

@@ -102,33 +102,33 @@ float getAverage05VRead(int pin)
     constexpr size_t loops { 10 };
     constexpr float toV { 3.3f / float { (1 << ADC_RESOLUTION) - 1 } };
 
-    // Resistor divider on Inputs ports
+    // Resistor divider on Input ports
     constexpr float rDiv { 17.4f / (10.0f + 17.4f) };
 
     int tot { 0 };
 
     analogReadResolution(ADC_RESOLUTION);
 
-    Inputs.enable();
+    Input.enable();
     for (auto i = 0; i < loops; i++)
-        tot += Inputs.analogRead(pin);
-    Inputs.disable();
+        tot += Input.analogRead(pin);
+    Input.disable();
 
     const auto avg = float { tot } * toV / float { loops };
 
     return avg / rDiv;
 }
 
-int getAverageInputsRead(int pin, const size_t loops)
+int getAverageInputRead(int pin, const size_t loops)
 {
     unsigned int tot { 0 };
 
     analogReadResolution(ADC_RESOLUTION);
 
-    Inputs.enable();
+    Input.enable();
     for (auto i = 0; i < loops; i++)
-        tot += Inputs.analogRead(pin);
-    Inputs.disable();
+        tot += Input.analogRead(pin);
+    Input.disable();
 
     return tot / loops;
 }
@@ -139,7 +139,7 @@ int getMoisturePerc(int pin)
     static long dryValue { 2160 };
     static long wetValue { 975 };
 
-    auto val = getAverageInputsRead(pin);
+    auto val = getAverageInputRead(pin);
 
     // Self-update dry/wet values range.
     if (val > dryValue)

examples/Application/IrrigationSimpleLCD/Helpers.h

@@ -4,14 +4,16 @@
 #include "TimeHelpers.h"
 #include <Arduino_EdgeControl.h>
 #include <TimeAlarms.h>
+#include <mbed.h>
+#include <mbed_mktime.h>
 
 #include <list>
 #include <map>
 
 void setSystemClock(String date = __DATE__, String time = __TIME__);
 void statusLCD();
 void backlightOff(bool powerDown);
-int getAverageInputsRead(int pin, size_t loops = 20);
+int getAverageInputRead(int pin, size_t loops = 20);
 float getAverage05VRead(int pin);
 int getMoisturePerc(int pin);
 void displayMsg(const String msg, const unsigned timeout = 5000, const unsigned line = 0, const bool clear = true, const bool off = true);

examples/Application/IrrigationSimpleLCD/IrrigationSimpleLCD.ino

@@ -89,19 +89,19 @@ void setup()
     // Init the sensors inputs.
     // If needed, will also take care of enabling the
     // 3V3 and 12V power rails and to initialize the IO Expander.
-    Inputs.begin();
+    Input.begin();
 
     Latching.begin();
     Latching.channelDirection(LATCHING_OUT_1, POSITIVE);
     Latching.strobe(5000);
     Latching.channelDirection(LATCHING_OUT_1, NEGATIVE);
     Latching.strobe(5000);
 
-    Relays.begin();
+    Relay.begin();
     delay(1000);
-    Relays.on(RELAYS_CH01);
+    Relay.on(RELAY_CH01);
     delay(5000);
-    Relays.off(RELAYS_CH01);
+    Relay.off(RELAY_CH01);
 
     // Init the LCD display
     LCD.begin(16, 2);

examples/Application/LowPowerDataLogger/Helpers.h

@@ -22,7 +22,7 @@ void powerOn()
     Wire.begin();
     delay(500);
     Expander.begin();
-    Inputs.begin();
+    Input.begin();
 }
 
 void powerOff()
@@ -35,24 +35,24 @@ void powerOff()
     }
     DebugSerial.println();
 
-    Inputs.end();
+    Input.end();
     Expander.end();
     Wire.end();
     Power.off(PWR_3V3);
     Power.off(PWR_VBAT);
     pwrMutex.unlock();
 }
 
-int getAverageInputsRead(int pin, const size_t loops)
+int getAverageInputRead(int pin, const size_t loops)
 {
     unsigned int tot { 0 };
 
     analogReadResolution(ADC_RESOLUTION);
 
-    Inputs.enable();
+    Input.enable();
     for (auto i = 0; i < loops; i++)
-        tot += Inputs.analogRead(pin);
-    Inputs.disable();
+        tot += Input.analogRead(pin);
+    Input.disable();
 
     return tot / loops;
 }

examples/Application/LowPowerDataLogger/LowPowerDataLogger.ino

@@ -38,6 +38,7 @@
 #include <SPIFBlockDevice.h>
 #include <TDBStore.h>
 #include <chrono>
+#include <mbed.h>
 
 /*
     To enable debugging print on Serial Monitor define DEBUG on "DebugMode.h" or
@@ -298,7 +299,7 @@ void readSensors()
     delay(50);
     Expander.digitalWrite(EXP_LED1, HIGH);
 
-    auto value = getAverageInputsRead(INPUTS_05V_CH01, 10);
+    auto value = getAverageInputRead(INPUT_05V_CH01, 10);
 
     String key = "key_";
     auto ts = time(nullptr);