🚧 WIP, analogio - Add deinit, scale reads, update

Author: brentru

src/components/analogIO/controller.cpp

@@ -75,11 +75,44 @@ bool AnalogIOController::Handle_AnalogIORemove(pb_istream_t *stream) {
   _analogio_hardware->DeinitPin(pin_name);
 
   // Remove the pin from the vector
+  // TODO: Refactor this out?
   for (int i = 0; i < _analogio_pins.size(); i++) {
     if (_analogio_pins[i].name == pin_name) {
       _analogio_pins.erase(_analogio_pins.begin() + i);
       break;
     }
   }
   return true;
+}
+
+bool AnalogIOController::IsPinTimerExpired(analogioPin *pin, ulong cur_time) {
+  return cur_time - pin->prv_pin_time > pin->pin_period;
+}
+
+void AnalogIOController::update() {
+  // Bail-out if the vector is empty
+  if (_analogio_pins.empty())
+    return;
+
+  // Process analog input pins
+  for (int i = 0; i < _analogio_pins.size(); i++) {
+    // Create a pin object for this iteration
+    analogioPin &pin = _analogio_pins[i];
+    // Go to the next pin if the period hasn't expired yet
+    ulong cur_time = millis();
+    if (!IsPinTimerExpired(&pin, cur_time))
+      continue;
+
+    // Pins timer has expired, lets read the pin
+    if (pin.read_mode == wippersnapper_sensor_SensorType_SENSOR_TYPE_VOLTAGE) {
+      // TODO: Read and store the pin's voltage
+    } else if (pin.read_mode ==
+               wippersnapper_sensor_SensorType_SENSOR_TYPE_RAW) {
+      // TODO: Read and store the pin's raw value
+    } else {
+      WS_DEBUG_PRINT("ERROR: Invalid read mode for analog pin: ");
+      WS_DEBUG_PRINTLN(pin.name);
+      continue;
+    }
+  }
 }

src/components/analogIO/controller.h

@@ -47,10 +47,13 @@ class AnalogIOController {
   // Routing functions
   bool Handle_AnalogIOAdd(pb_istream_t *stream);
   bool Handle_AnalogIORemove(pb_istream_t *stream);
+  // Polling loop function
+  void update();
 
   void SetTotalAnalogPins(uint8_t total_pins);
   void SetRefVoltage(float voltage);
   float GetRefVoltage(void);
+  bool IsPinTimerExpired(analogioPin *pin, ulong cur_time);
 
 private:
   AnalogIOModel *_analogio_model;          ///< AnalogIO model

src/components/analogIO/hardware.cpp

@@ -16,6 +16,7 @@
 
 AnalogIOHardware::AnalogIOHardware() {
   SetNativeADCResolution(); // Configure the device's native ADC resolution
+  _scale_factor = 0;
 }
 
 AnalogIOHardware::~AnalogIOHardware() {}
@@ -45,6 +46,33 @@ void AnalogIOHardware::SetNativeADCResolution() {
 
 void AnalogIOHardware::SetResolution(uint8_t resolution) {
   _adc_resolution = resolution;
+  // Calculate (or re-calculate) the scale factor when we set the resolution
+  CalculateScaleFactor();
 }
 
-uint8_t AnalogIOHardware::GetResolution(void) { return _adc_resolution; }
+uint8_t AnalogIOHardware::GetResolution(void) { return _adc_resolution; }
+
+void AnalogIOHardware::CalculateScaleFactor() {
+  if (!_is_adc_resolution_scaled)
+    return;
+
+  if (getADCresolution() > getNativeResolution()) {
+    _scale_factor = getADCresolution() - getNativeResolution();
+  } else {
+    _scale_factor = getNativeResolution() - getADCresolution();
+  }
+}
+
+uint16_t AnalogIOHardware::GetPinValue(uint8_t pin) {
+  // Get the pin's value using Arduino API
+  uint16_t value = analogRead(pin);
+  // Scale the pins value
+  if (_is_adc_resolution_scaled) {
+    if (getADCresolution() > getNativeResolution()) {
+      value = value << _scale_factor;
+    } else {
+      value = value >> _scale_factor;
+    }
+  }
+  return value;
+}

src/components/analogIO/hardware.h

@@ -28,13 +28,16 @@ class AnalogIOHardware {
   void SetNativeADCResolution();
   void SetResolution(uint8_t resolution);
   uint8_t GetResolution(void);
+  void CalculateScaleFactor();
 
   void InitPin(uint8_t pin);
   void DeinitPin(uint8_t pin);
+  uint16_t GetPinValue(uint8_t pin);
 
 private:
   uint8_t _native_adc_resolution;
   uint8_t _adc_resolution;
+  int _scale_factor;
   bool _is_adc_resolution_scaled;
 };
 #endif // WS_ANALOGIO_HARDWARE_H