Adding the switch calibration feature

neosensor/libraries/neocampus/advertisedDeviceCallbacks.cpp

-#include <advertisedDeviceCallbacks.h>
 //Manon
+/*
+#include <advertisedDeviceCallbacks.h>
+
 void advertisedDeviceCallbacks::onResult(BLEAdvertisedDevice device) {
     if (device.getName() == "TP358 (5551)") {
         log_debug(F("\nReference temperature : "));
@@ -8,4 +10,5 @@ void advertisedDeviceCallbacks::onResult(BLEAdvertisedDevice device) {
         log_debug(getHumidity(device)); 
         log_flush();
     }
-}
+}
\ No newline at end of file
+*/
\ No newline at end of file

neosensor/libraries/neocampus/advertisedDeviceCallbacks.h

 //Manon
+/*
 #include <Arduino.h>
 #include <BLEDevice.h>
 #include <BLEUtils.h>
@@ -6,10 +7,11 @@
 #include <BLEAdvertisedDevice.h>
 #include "neocampus_debug.h"
 
-/*
+ *
  * Class
- */
+ *
 class advertisedDeviceCallbacks : public BLEAdvertisedDeviceCallbacks{
 public:
     void onResult(BLEAdvertisedDevice device);
-};
+};
\ No newline at end of file
+*/
\ No newline at end of file

neosensor/libraries/neocampus/neocampus_utils.cpp

@@ -112,6 +112,63 @@ bool checkCLEARswitch( uint8_t sw_pin ) {
   return _res;
 }
 
+//Manon
+// --- CALIBRATION switch management ------------------------------------------------
+
+ /* check incr switch and decr switch for CALIBRATION procedure
+ * if decr_sw_pin == -1 OR incr_sw_pin-->== -1 check disabled
+ */
+bool checkCALIBRATIONswitch(uint8_t decr_sw_pin, uint8_t incr_sw_pin) {
+  if (decr_sw_pin == INVALID_GPIO) {
+    log_debug(F("\n[CALIBRATION] no DECR_SW defined !")); log_flush();
+    return false;
+  }
+  if (incr_sw_pin == INVALID_GPIO) {
+    log_debug(F("\n[CALIBRATION] no INCR_SW defined !")); log_flush();
+    return false;
+  }
+  // set pin as input
+  pinMode( decr_sw_pin, INPUT );
+  pinMode( incr_sw_pin, INPUT );
+  
+  log_debug(F("\n[CALIBRATION] Press + AND - switch for 5s to activate TEST MANON :) ...")); log_flush();
+  delay(1000);
+  log_debug(F("\n[CALIBRATION] check for incr_switch and decr_switch activation ...")); log_flush();
+  delay(250);
+
+  bool _res = true;
+  // ... then read input for a specific time
+  for( uint8_t cpt=10; cpt > 0; cpt-- ) {
+    if ( digitalRead( decr_sw_pin ) != HIGH || digitalRead( incr_sw_pin ) != HIGH ) {
+      // at least read 'LOW' one time --> cancel calibration operation
+      _res = false;
+      _need2calibrate=false;
+      break;
+    }
+    delay(500);  // sleep for 500ms (allowing ESP to manage internals)
+  }
+
+   /* okay, delay for + and - switch acquisition is now over.
+   * If we need to calibrate things, we want to wait for sw_pin
+   * LOW (i.e user stopped to press switch)
+   */ 
+  if( _res==true ) {
+    log_info(F("\n[CALIBRATION] activate CALIBRATION procedure ..."));
+    log_debug(F("\n[CALIBRATION] release SWITCH for calibration to start ..."));
+    log_flush();
+  }
+  int i=1;
+  while( digitalRead( incr_sw_pin )==HIGH && digitalRead( decr_sw_pin )==HIGH ) {
+    delay(250);
+  }
+  if (_res==true){
+    log_debug(F("\n[neocampus_utils] Need to calibrate"));log_flush();
+    _need2calibrate=true;
+  }
+  log_debug(F("\n test "));log_debug(_res);
+  
+  return _res;
+}
 
 
 // ----------------------------------------------------------------------------

neosensor/libraries/neocampus/neocampus_utils.h

@@ -36,6 +36,8 @@
  */
 // reboot flag
 extern bool _need2reboot;
+//Manon
+extern bool _need2calibrate; 
 
 
 
@@ -56,6 +58,9 @@ extern bool _need2reboot;
 // check clear switch for CLEAR procedure
 bool checkCLEARswitch( uint8_t );
 
+// check clear switch for CALIBRATION procedure
+bool checkCALIBRATIONswitch( uint8_t , uint8_t );
+
 // whole neocampus WiFi connexion setup
 bool setupWiFi( wifiParametersMgt *wp=nullptr );
 

neosensor/libraries/neocampus_drivers/SHT3x.cpp

@@ -285,7 +285,14 @@ boolean SHT3x::getTemp( float *pval )
   // 100.0 x _tmp = (17500 x _tmp) / (16384 x 4) - 4500
   _tmp = ((4375 * _tmp) >> 14) - 4500;
   *pval = ((float)_tmp / 100.0f);
-  calibrate(pval, _a, _b);       //Manon
+  //Manon
+  if ((not _need2reboot) && _need2calibrate){
+    auto result = calibrate(pval, _a, _b);
+    _a = std::get<0>(result);
+    _b = std::get<1>(result);
+  }
+  *pval = *pval * _a;
+  *pval = *pval + _b;
   return true;
 }
 

neosensor/libraries/neocampus_drivers/generic_driver.cpp

@@ -24,7 +24,7 @@
 #include "neocampus.h"        // _MAX_COOLDOWN_SENSOR
 #include "generic_driver.h"
 #include "neocampus_debug.h" //Manon
-
+#include "neocampus_utils.h" //Manon
 
 
 /******************************************
@@ -167,12 +167,12 @@ void generic_driver::setDataSent( void ) {
 }
 
 //Manon
-void generic_driver::calibrate(float* pval, float a, float b){
-  *pval = *pval * a;
-  *pval = *pval + b;
-  log_debug(F("\n[generic_drivers][calibration] Calibration effectuée ! a="));
-  log_debug(a);
-  log_debug(F(" ; b="));
-  log_debug(b);log_flush();
-
+std::tuple<float, float> generic_driver::calibrate(float* pval, float a, float b){
+  //TO-DO : Ajouter une variable globale externe -> valeur du capteur de référence : valBLE
+  float valBLE = 22.0;  //<----- à enlever
+  b= valBLE-*pval;
+  //TO-DO traiter le cas de non-linéarité
+  //On vient de calibrer donc plus besoin de le faire
+  _need2calibrate=false;
+  return std::make_tuple(a, b);
 }
\ No newline at end of file

neosensor/libraries/neocampus_drivers/generic_driver.h

@@ -112,7 +112,7 @@ class generic_driver {
 
     float         valueSent;      // official value that has been sent
     unsigned long _lastMsSent;    // (ms) time the official value has been sent
-    void calibrate(float*, float a, float b);     // Manon
+    std::tuple<float, float> calibrate(float*, float a, float b);     // Manon
 };
 
 #endif /* _GENERIC_DRIVER_H_ */

neosensor/neosensor.ino

@@ -123,7 +123,7 @@
 
 //Manon
 //BLE device
-#include <advertisedDeviceCallbacks.h>
+//#include <advertisedDeviceCallbacks.h>
 
 
 /*
@@ -186,7 +186,8 @@ typedef enum {
  * Global variables
  */
 bool _need2reboot = false;              // flag to tell a reboot is requested
-
+//Manon
+bool _need2calibrate = false;           // flag to tell a calibration is requested 
 // WiFi parameters management statically allocated instance
 wifiParametersMgt wifiParameters = wifiParametersMgt();
 
@@ -787,6 +788,7 @@ void lateSetup( void ) {
 
 //Manon
 // ***** start BLE scan  *****
+/*
 void startScanBLE() {
   BLEScan* pBLEScan = BLEDevice::getScan(); // start scanning
   pBLEScan->setAdvertisedDeviceCallbacks(new advertisedDeviceCallbacks(), true);
@@ -819,7 +821,7 @@ uint8_t getHumidity(BLEAdvertisedDevice device) {
   const uint8_t *pHum = (const uint8_t *)&device.getManufacturerData().c_str()[3];
   return *pHum;
 }
-
+*/
 // --- SETUP -------------------------------------------------------------------
 void setup() {
 
@@ -1230,12 +1232,22 @@ if( res!=uint8_t(0x44) ) {
   modulesList.startAll( &sensocampus, sharedRoot );
 
   //Manon
+  /*
   //Init BLE
   BLEDevice::init("");
   manageBLEscan();
   log_debug(F("\nSetup of BLE device ..."));log_flush();
   delay(1000);
   log_debug(F(" done !"));log_flush();
+  */
+
+ //Manon
+  #ifdef INCR_SW
+    #ifdef DECR_SW
+      checkCALIBRATIONswitch(DECR_SW, INCR_SW);
+    #endif
+  #endif
+
   /*
    * Very end of setup() :)
    */