Merge branch 'master' of https://github.com/fablabs-ch/bar-o-matic

Arduino/.editorconfig

@@ -0,0 +1,7 @@
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.{ino,h,cpp}]
+indent_style = space
+indent_size = 4

Arduino/CocktailJam/pressure.cpp

@@ -0,0 +1,29 @@
+#include "pressure.h"
+
+Pressure::Pressure(int pinPressure, int pinPump, int targetPressure): pinPressure(pinPressure),
+    pinPump(pinPump), targetPressure(targetPressure){
+    this->targetPressureStart = targetPressure-TARGET_PRESSURE_HYSTERESIS;
+    this->targetPressureStop = targetPressure+TARGET_PRESSURE_HYSTERESIS;
+}
+
+long Pressure::getCurrentPressure(){
+    return this->currentPressure;
+}
+
+void Pressure::run(unsigned long dtMs){
+    this->currentPressure = readPressure(); //stupid, to remove
+    if(this->currentPressure<this->targetPressureStart){
+        digitalWrite(this->pinPump, HIGH);
+    }
+    if(this->currentPressure>this->targetPressureStop){
+        digitalWrite(this->pinPump, LOW);
+    }
+}
+
+double Pressure::readPressure(){
+	double adc0 = (double)analogRead(this->pinPressure);
+	double erreurV = -0.17;
+	double vout = adc0 * 0.004883 + erreurV;
+	double pressure = (vout * 0.2 - 0.04) *1111.111111111;
+    return pressure;
+}

Arduino/CocktailJam/pressure.h

@@ -0,0 +1,30 @@
+#ifndef PRESSURE_H
+#define PRESSURE_H
+
+#include <Arduino.h>
+
+// in pression unit
+#define TARGET_PRESSURE_HYSTERESIS 100
+
+class Pressure
+{
+    public:
+        Pressure(int pinPressionSensor, int pinPump, int targetPression);
+
+        void run(unsigned long dtMs);
+
+        long getCurrentPressure();
+
+    private:
+        int pinPressure;
+        int pinPump;
+        int targetPressure;
+        long currentPressure = -1;
+        int targetPressureStop;
+        int targetPressureStart;
+
+        double readPressure();
+
+};
+
+#endif

Arduino/CocktailJam/status.cpp

@@ -0,0 +1,23 @@
+#include "status.h"
+#include <Arduino.h>
+
+
+Status::Status(Stream *serial, int *weightGrPtr, int *carrierMmPtr, Pressure *pressure): serial(serial), weightGrPtr(weightGrPtr),
+    carrierMmPtr(carrierMmPtr), pressure(pressure){
+    this->acc = 0;
+}
+
+void Status::run(unsigned long dtMs){
+    this->acc += dtMs;
+    if(acc>=STATUS_DELAY_MS){
+        this->serial->print("s:");
+        this->serial->print(*this->carrierMmPtr);
+        this->serial->print(':');
+        this->serial->print(*this->weightGrPtr);
+        this->serial->print(':');
+        this->serial->println(this->pressure->getCurrentPressure());
+
+        this->acc = 0;
+    }
+}
+

Arduino/CocktailJam/status.h

@@ -0,0 +1,24 @@
+#ifndef STATUS_H
+#define STATUS_H
+
+#include <Arduino.h>
+#include "pressure.h"
+
+#define STATUS_DELAY_MS 100
+
+class Status
+{
+    public:
+        Status(Stream *serial, int *weightGrPtr, int *carrierMmPtr, Pressure *pressure);
+
+        void run(unsigned long dtMs);
+
+    private:
+        unsigned long acc;
+        Stream *serial;
+        int *weightGrPtr;
+        int *carrierMmPtr;
+        Pressure *pressure;
+};
+
+#endif