LoRa-Sensornode Firmware for Multitech mDot

Diff: app/FlowMeter.cpp

Revision:

9:c4e378f4801d

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/app/FlowMeter.cpp	Fri Nov 02 16:58:23 2018 +0000
@@ -0,0 +1,147 @@
+/*
+ * FlowMeter.cpp
+ *
+ *  Created on: 23.10.2018
+ *      Author: Adrian
+ */
+
+#include "FlowMeter.h"
+#include "math.h"
+
+FlowMeter::FlowMeter(InterruptIn* interruptPin, FlowSensorProperties prop) :
+    _properties(prop),
+	_currentCorrection(0.0f),
+	_currentDuration(0.0f),
+	_currentFlowrate(0.0f),
+	_currentVolume(0.0f),
+	_totalDuration(0.0f),
+	_totalVolume(0.0f),
+	_totalCorrection(0.0f),
+	_currentPulses(0.0f),
+	_currentFrequency(0.0f)//!< store sensor properties
+{
+	this->pulseInput = interruptPin;
+	this->pulseInput->rise(this,&FlowMeter::count);
+	this->ticker = new Ticker();
+	this->tickDuration_ms = 1000;
+	this->ticker->attach(this,&FlowMeter::tick,this->tickDuration_ms/1000);
+	this->_currentCorrection = 0.0f;
+}
+
+double FlowMeter::getCurrentFlowrate() {
+    return this->_currentFlowrate;                                          //!< in l/min
+}
+
+double FlowMeter::getCurrentVolume() {
+    return this->_currentVolume;                                            //!< in l
+}
+
+double FlowMeter::getTotalFlowrate() {
+    return this->_totalVolume / (this->_totalDuration / 1000.0f) * 60.0f;   //!< in l/min
+}
+
+double FlowMeter::getTotalVolume() {
+    return this->_totalVolume;                                              //!< in l
+}
+
+void FlowMeter::tick() {
+    /* sampling and normalisation */
+    double seconds = this->tickDuration_ms / 1000.0f;                                    //!< normalised duration (in s, i.e. per 1000ms)
+    //todo get rid of it cli();                                                                  //!< going to change interrupt variable(s)
+    double frequency = this->_currentPulses / seconds;                      //!< normalised frequency (in 1/s)
+    this->_currentPulses = 0;                                               //!< reset pulse counter after successfull sampling
+    //todo get rid of it sei();                                                                  //!< done changing interrupt variable(s)
+
+    /* determine current correction factor (from sensor properties) */
+    unsigned int decile = floor(10.0f * frequency / (this->_properties.capacity * this->_properties.kFactor));          //!< decile of current flow relative to sensor capacity
+    unsigned int ceiling =  9;
+    unsigned int min;
+    if(ceiling < decile){
+    	min = ceiling;	
+    }
+    else{
+    	min = decile;
+    }                                                                                          //!< highest possible decile index
+    this->_currentCorrection = this->_properties.kFactor / this->_properties.mFactor[min];             //!< combine constant k-factor and m-factor for decile
+
+    /* update current calculations: */
+    this->_currentFlowrate = frequency / this->_currentCorrection;          //!< get flow rate (in l/min) from normalised frequency and combined correction factor
+    this->_currentVolume = this->_currentFlowrate / (60.0f/seconds);        //!< get volume (in l) from normalised flow rate and normalised time
+
+    /* update statistics: */
+    this->_currentDuration = this->tickDuration_ms;                                      //!< store current tick duration (convenience, in ms)
+    this->_currentFrequency = frequency;                                    //!< store current pulses per second (convenience, in 1/s)
+    this->_totalDuration += this->tickDuration_ms;                                       //!< accumulate total duration (in ms)
+    this->_totalVolume += this->_currentVolume;                             //!< accumulate total volume (in l)
+    this->_totalCorrection += this->_currentCorrection * this->tickDuration_ms;          //!< accumulate corrections over time
+}
+
+void FlowMeter::count(void) {
+    this->_currentPulses++;                                                 //!< this should be called from an interrupt service routine
+}
+
+void FlowMeter::reset() {
+	//todo get rid of it  cli();                                                                  //!< going to change interrupt variable(s)
+    this->_currentPulses = 0;                                               //!< reset pulse counter
+    //todo get rid of it sei();                                                                  //!< done changing interrupt variable(s)
+
+    this->_currentFrequency = 0.0f;
+    this->_currentDuration = 0.0f;
+    this->_currentFlowrate = 0.0f;
+    this->_currentVolume = 0.0f;
+    this->_currentCorrection = 0.0f;
+}
+
+InterruptIn* FlowMeter::getPin() {
+    return this->pulseInput;
+}
+
+unsigned long FlowMeter::getCurrentDuration() {
+    return this->_currentDuration;                                          //!< in ms
+}
+
+double FlowMeter::getCurrentFrequency() {
+    return this->_currentFrequency;                                         //!< in 1/s
+}
+
+double FlowMeter::getCurrentError() {
+    /// error (in %) = error * 100
+    /// error = correction rate - 1
+    /// correction rate = k-factor / correction
+    return (this->_properties.kFactor / this->_currentCorrection - 1) * 100;  //!< in %
+}
+
+unsigned long FlowMeter::getTotalDuration() {
+    return this->_totalDuration;                                            //!< in ms
+}
+
+double FlowMeter::getTotalError() {
+    /// average error (in %) = average error * 100
+    /// average error = average correction rate - 1
+    /// average correction rate = k-factor / corrections over time * total time
+    return (this->_properties.kFactor / this->_totalCorrection * this->_totalDuration - 1) * 100;
+}
+
+FlowMeter* FlowMeter::setTotalDuration(unsigned long totalDuration) {
+    this->_totalDuration = totalDuration;
+    return this;
+}
+
+FlowMeter* FlowMeter::setTotalVolume(double totalVolume) {
+    this->_totalVolume = totalVolume;
+    return this;
+}
+
+FlowMeter* FlowMeter::setTotalCorrection(double totalCorrection) {
+    this->_totalCorrection = totalCorrection;
+    return this;
+}
+
+FlowSensorProperties UncalibratedSensor = {60.0f, 5.0f, {1, 1, 1, 1, 1, 1, 1, 1, 1, 1}};
+FlowSensorProperties FS300A = {60.0f, 5.5f, {1, 1, 1, 1, 1, 1, 1, 1, 1, 1}};
+FlowSensorProperties FS400A = {60.0f, 4.8f, {1, 1, 1, 1, 1, 1, 1, 1, 1, 1}};
+
+
+void pulesInputInterrupt(void){
+	int i = 0;
+}