Add flowsensor prototype, add canbus to backplane

rust/src/hal/mod.rs

@@ -47,6 +47,7 @@ use once_cell::sync::Lazy;
 use std::result::Result::Ok as OkStd;
 use std::sync::Mutex;
 use std::time::Duration;
+use esp_idf_hal::pcnt::PCNT1;
 
 //Only support for 8 right now!
 pub const PLANT_COUNT: usize = 8;
@@ -154,6 +155,7 @@ pub struct FreePeripherals {
     pub gpio29: Gpio29,
     pub gpio30: Gpio30,
     pub pcnt0: PCNT0,
+    pub pcnt1: PCNT1,
     pub adc1: ADC1,
 }
 
@@ -186,6 +188,7 @@ impl PlantHal {
         let free_pins = FreePeripherals {
             adc1: peripherals.adc1,
             pcnt0: peripherals.pcnt0,
+            pcnt1: peripherals.pcnt1,
             gpio0: peripherals.pins.gpio0,
             gpio1: peripherals.pins.gpio1,
             gpio2: peripherals.pins.gpio2,

rust/src/hal/v3_hal.rs

@@ -124,12 +124,16 @@ pub(crate) fn create_v3(
     let one_wire_pin = peripherals.gpio18.downgrade();
     let tank_power_pin = peripherals.gpio11.downgrade();
 
+    let flow_sensor_pin = peripherals.gpio4.downgrade();
+
     let tank_sensor = TankSensor::create(
         one_wire_pin,
         peripherals.adc1,
         peripherals.gpio5,
         tank_power_pin,
-    );
+        flow_sensor_pin,
+        peripherals.pcnt1
+    )?;
 
     let mut signal_counter = PcntDriver::new(
         peripherals.pcnt0,

rust/src/hal/v4_hal.rs

@@ -152,13 +152,16 @@ pub(crate) fn create_v4(
 
     let one_wire_pin = peripherals.gpio18.downgrade();
     let tank_power_pin = peripherals.gpio11.downgrade();
+    let flow_sensor_pin = peripherals.gpio4.downgrade();
 
     let tank_sensor = TankSensor::create(
         one_wire_pin,
         peripherals.adc1,
         peripherals.gpio5,
         tank_power_pin,
-    );
+        flow_sensor_pin,
+        peripherals.pcnt1
+    )?;
 
     let mut signal_counter = PcntDriver::new(
         peripherals.pcnt0,

rust/src/hal/water.rs

@@ -5,7 +5,8 @@ use esp_idf_hal::adc::oneshot::config::AdcChannelConfig;
 use esp_idf_hal::adc::oneshot::{AdcChannelDriver, AdcDriver};
 use esp_idf_hal::adc::{attenuation, Resolution, ADC1};
 use esp_idf_hal::delay::Delay;
-use esp_idf_hal::gpio::{AnyIOPin, Gpio5, InputOutput, PinDriver, Pull};
+use esp_idf_hal::gpio::{AnyIOPin, AnyInputPin, Gpio5, InputOutput, PinDriver, Pull};
+use esp_idf_hal::pcnt::{PcntChannel, PcntChannelConfig, PcntControlMode, PcntCountMode, PcntDriver, PinIndex, PCNT1};
 use esp_idf_sys::EspError;
 use one_wire_bus::OneWire;
 
@@ -13,6 +14,7 @@ pub struct TankSensor<'a> {
     one_wire_bus: OneWire<PinDriver<'a, AnyIOPin, InputOutput>>,
     tank_channel: AdcChannelDriver<'a, Gpio5, AdcDriver<'a, ADC1>>,
     tank_power: PinDriver<'a, AnyIOPin, InputOutput>,
+    flow_counter: PcntDriver<'a>,
     delay: Delay,
 }
 
@@ -22,7 +24,9 @@ impl<'a> TankSensor<'a> {
         adc1: ADC1,
         gpio5: Gpio5,
         tank_power_pin: AnyIOPin,
-    ) -> TankSensor<'a> {
+        flow_sensor_pin: AnyIOPin,
+        pcnt1: PCNT1
+    ) -> anyhow::Result<TankSensor<'a>> {
         let mut one_wire_pin =
             PinDriver::input_output_od(one_wire_pin).expect("Failed to configure pin");
         one_wire_pin
@@ -47,12 +51,54 @@ impl<'a> TankSensor<'a> {
         let one_wire_bus =
             OneWire::new(one_wire_pin).expect("OneWire bus did not pull up after release");
 
-        TankSensor {
+        let mut flow_counter = PcntDriver::new(
+            pcnt1,
+            Some(flow_sensor_pin),
+            Option::<AnyInputPin>::None,
+            Option::<AnyInputPin>::None,
+            Option::<AnyInputPin>::None,
+        )?;
+
+        flow_counter.channel_config(
+            PcntChannel::Channel1,
+            PinIndex::Pin0,
+            PinIndex::Pin1,
+            &PcntChannelConfig {
+                lctrl_mode: PcntControlMode::Keep,
+                hctrl_mode: PcntControlMode::Keep,
+                pos_mode: PcntCountMode::Increment,
+                neg_mode: PcntCountMode::Hold,
+                counter_h_lim: i16::MAX,
+                counter_l_lim: 0,
+            },
+        )?;
+
+
+        Ok(TankSensor {
             one_wire_bus,
             tank_channel,
             tank_power,
+            flow_counter,
             delay: Default::default(),
-        }
+        })
+    }
+
+    pub fn reset_flow_meter(&mut self) {
+        self.flow_counter.counter_pause().unwrap();
+        self.flow_counter.counter_clear().unwrap();
+    }
+
+    pub fn start_flow_meter(&mut self) {
+        self.flow_counter.counter_resume().unwrap();
+    }
+
+    pub fn get_flow_meter_value(&mut self) -> i16 {
+        self.flow_counter.get_counter_value().unwrap()
+    }
+
+    pub fn stop_flow_meter(&mut self) -> i16 {
+        self.flow_counter.counter_pause().unwrap();
+        self.get_flow_meter_value()
     }
 
     pub fn water_temperature_c(&mut self) -> anyhow::Result<f32> {