Merge pull request #31 from Lyr3x/master-v1.1

v1.0.1

Author: Lyr3x

common/api.yaml

@@ -1,3 +1,4 @@
 # Enable Home Assistant API
 api:
   password: !secret api_password
+  reboot_timeout: 60min

common/mqtt_conf.yaml

@@ -11,13 +11,12 @@
 static int DIST_THRESHOLD_MAX[] = {0, 0}; // treshold of the two zones
 static int MIN_DISTANCE[] = {0, 0};
 static int center[2] = {0, 0}; /* center of the two zones */
-static int Zone = 0;
 static int ROI_height = 0;
 static int ROI_width = 0;
+static int zone = 0;
 
 static int delay_between_measurements = 0;
 static int time_budget_in_ms = 0;
-const int threshold_percentage = 80;
 
 // this value has to be true if the sensor is oriented as in Duthdeffy's picture
 static bool advised_orientation_of_the_sensor = true;
@@ -115,10 +114,7 @@ void calibration(VL53L1XSensor Sensor)
 void calibration(VL53L1XSensor Sensor)
 {
     // the sensor does 100 measurements for each zone (zones are predefined)
-    // each measurements is done with a timing budget of 100 ms, to increase the precision
-    //   client.publish(mqtt_serial_publish_distance_ch, "Computation of new threshold");
-    // we set the standard values for the measurements
-    Sensor.setIntermeasurementPeriod(time_budget_in_ms_short);
+    Sensor.setIntermeasurementPeriod(time_budget_in_ms_long);
     Sensor.setRangeMode(LONG_RANGE);
     time_budget_in_ms = time_budget_in_ms_long;
     delay_between_measurements = delay_between_measurements_long;
@@ -128,7 +124,7 @@ void calibration(VL53L1XSensor Sensor)
     ROI_width = 8;
     delay(500);
 
-    Zone = 0;
+    zone = 0;
     float sum_zone_0 = 0;
     float sum_zone_1 = 0;
     uint16_t distance;
@@ -141,17 +137,17 @@ void calibration(VL53L1XSensor Sensor)
         distance = Sensor.readRangeContinuoisMillimeters(roiConfig1);
         Sensor.stopMeasurement();
         sum_zone_0 = sum_zone_0 + distance;
-        Zone++;
-        Zone = Zone % 2;
+        zone++;
+        zone = zone % 2;
 
         // increase sum of values in Zone 2
         Sensor.startMeasurement();
         delay(delay_between_measurements);
         distance = Sensor.readRangeContinuoisMillimeters(roiConfig2);
         Sensor.stopMeasurement();
         sum_zone_1 = sum_zone_1 + distance;
-        Zone++;
-        Zone = Zone % 2;
+        zone++;
+        zone = zone % 2;
     }
     // after we have computed the sum for each zone, we can compute the average distance of each zone
     float average_zone_0 = sum_zone_0 / number_attempts;
@@ -228,7 +224,7 @@ void calibration(VL53L1XSensor Sensor)
     }
     delay(2000);
     // we will now repeat the calculations necessary to define the thresholds with the updated zones
-    Zone = 0;
+    zone = 0;
     sum_zone_0 = 0;
     sum_zone_1 = 0;
     for (int i = 0; i < number_attempts; i++)
@@ -239,22 +235,22 @@ void calibration(VL53L1XSensor Sensor)
         distance = Sensor.readRangeContinuoisMillimeters(roiConfig1);
         Sensor.stopMeasurement();
         sum_zone_0 = sum_zone_0 + distance;
-        Zone++;
-        Zone = Zone % 2;
+        zone++;
+        zone = zone % 2;
 
         // increase sum of values in Zone 1
         Sensor.startMeasurement();
         delay(delay_between_measurements);
         distance = Sensor.readRangeContinuoisMillimeters(roiConfig2);
         Sensor.stopMeasurement();
         sum_zone_1 = sum_zone_1 + distance;
-        Zone++;
-        Zone = Zone % 2;
+        zone++;
+        zone = zone % 2;
     }
     average_zone_0 = sum_zone_0 / number_attempts;
     average_zone_1 = sum_zone_1 / number_attempts;
-    float threshold_zone_0 = average_zone_0 * threshold_percentage / 100; // they can be int values, as we are not interested in the decimal part when defining the threshold
-    float threshold_zone_1 = average_zone_1 * threshold_percentage / 100;
+    float threshold_zone_0 = average_zone_0 * id(threshold_percentage) / 100; // they can be int values, as we are not interested in the decimal part when defining the threshold
+    float threshold_zone_1 = average_zone_1 * id(threshold_percentage) / 100;
 
     DIST_THRESHOLD_MAX[0] = threshold_zone_0;
     DIST_THRESHOLD_MAX[1] = threshold_zone_1;

lib/Calibration/Calibration.h

@@ -34,7 +34,7 @@ Be carfeul with reconfiguring! Some options shouldnt be changed!
   * general bug fixes and improvements
 * added untested VL53L1X support
 */
-#define ROODE_VERSION "1.1-alpha"
+#define ROODE_VERSION "1.1-beta"
 /*
 ###### FEATURE SELECTION ######
 */
@@ -56,8 +56,8 @@ Be carfeul with reconfiguring! Some options shouldnt be changed!
 #include <vl53l1_api.h>
 #define dev1_sel digitalWrite(XSHUT_PIN, HIGH);
 #define dev1_desel digitalWrite(XSHUT_PIN, LOW);
-static VL53L1_UserRoi_t roiConfig1 = {10, 15, 15, 0}; //TopLeftX, TopLeftY, BotRightX, BotRightY
-static VL53L1_UserRoi_t roiConfig2 = {0, 15, 5, 0};   //TopLeftX, TopLeftY, BotRightX, BotRightY
+static VL53L1_UserRoi_t roiConfig1 = {9, 15, 15, 0}; //TopLeftX, TopLeftY, BotRightX, BotRightY
+static VL53L1_UserRoi_t roiConfig2 = {0, 15, 6, 0};   //TopLeftX, TopLeftY, BotRightX, BotRightY
 
 #define SENSOR_I2C 0x52
 

lib/Configuration/Config.h

@@ -19,14 +19,18 @@ esphome:
 <<: !include common/common.yaml
 
 globals:
-  - id: DIST_THRESHOLD_MAX_G
-    type: int
-    restore_value: no
-    initial_value: "1780"
   - id: cnt
     type: int
     restore_value: yes
     initial_value: "0"
+  - id: recalibrate
+    type: int
+    restore_value: no
+    initial_value: "0"
+  - id: threshold_percentage
+    type: int
+    restore_value: no
+    initial_value: "60"
 
 # Enable logging
 logger:
@@ -57,7 +61,7 @@ binary_sensor:
   - platform: template
     name: $friendly_name photo sensor
     lambda: |-
-      if (id(tof_distance_avg).state < 1400) {
+      if (id(tof_distance_avg).state < DIST_THRESHOLD_MAX[0] || id(tof_distance_avg).state < DIST_THRESHOLD_MAX[1]) {
         // someone in the door
         return true;
       } else {
@@ -73,7 +77,28 @@ sensor:
     update_interval: 60s
 
   - platform: uptime
-    name: $friendly_name Uptime
+    name: Uptime Sensor
+    id: uptime_sensor
+    update_interval: 120s
+    internal: true
+    on_raw_value:
+      then:
+        - text_sensor.template.publish:
+            id: uptime_human
+            state: !lambda |-
+              int seconds = round(id(uptime_sensor).raw_state);
+              int days = seconds / (24 * 3600);
+              seconds = seconds % (24 * 3600);
+              int hours = seconds / 3600;
+              seconds = seconds % 3600;
+              int minutes = seconds /  60;
+              seconds = seconds % 60;
+              return (
+                (days ? String(days) + "d " : "") +
+                (hours ? String(hours) + "h " : "") +
+                (minutes ? String(minutes) + "m " : "") +
+                (String(seconds) + "s")
+              ).c_str();
 
   - platform: custom
     lambda: |-
@@ -97,13 +122,36 @@ sensor:
         - lambda: |-
             resetCounter = 1;
 
+  - platform: mqtt_subscribe
+    name: "People set counter"
+    id: people_set_counter
+    topic: $devicename/sensor/people/set
+    internal: true
+    on_value:
+      then:
+        - lambda: |-
+            if(id(cnt)!=id(people_set_counter).state){
+              id(cnt)=id(people_set_counter).state;
+              forceSetValue=1;
+            }
+
+  - platform: mqtt_subscribe
+    name: "People recalibrate"
+    id: people_recalibrate
+    topic: $devicename/sensor/people/recalibrate
+    internal: true
+    on_value:
+      then:
+        - lambda: |-
+            id(recalibrate) = 1;
+
   - platform: template
     name: $friendly_name measured distance
     id: tof_distance
     accuracy_decimals: 0
     icon: "mdi:ruler"
     unit_of_measurement: "mm"
-    update_interval: 1s
+    update_interval: 5s
     lambda: |-
       return distance;
     filters:
@@ -116,10 +164,45 @@ sensor:
     icon: "mdi:ruler"
     unit_of_measurement: "mm"
     internal: true
-    update_interval: 0.1s
+    update_interval: 2s
     lambda: |-
       return distance;
     filters:
       - sliding_window_moving_average:
           window_size: 10
           send_every: 10
+
+  - platform: template
+    name: $friendly_name threshold zone 0
+    id: threshold_zone0
+    accuracy_decimals: 0
+    icon: "mdi:ruler"
+    unit_of_measurement: "mm"
+    lambda: |-
+      return DIST_THRESHOLD_MAX[0];
+    filters:
+      - delta: 1
+
+  - platform: template
+    name: $friendly_name threshold zone 1
+    id: threshold_zone1
+    accuracy_decimals: 0
+    icon: "mdi:ruler"
+    unit_of_measurement: "mm"
+    update_interval: 60s
+    lambda: |-
+      return DIST_THRESHOLD_MAX[1];
+    filters:
+      - delta: 1
+
+text_sensor:
+  - platform: template
+    name: "$friendly_name Version"
+    icon: mdi:git
+    lambda: |-
+      std::string version = ROODE_VERSION;
+      return version;
+  - platform: template
+    name: Uptime Human Readable
+    id: uptime_human
+    icon: mdi:clock-start

peopleCounter.yaml

@@ -8,7 +8,7 @@
 #include <Calibration.h>
 
 #define USE_VL53L1X
-VL53L1XSensor count_sensor(XSHUT_PIN, SENSOR_I2C);
+VL53L1XSensor countSensor(XSHUT_PIN, SENSOR_I2C);
 int gesture_code;
 #define NOBODY 0
 #define SOMEONE 1
@@ -19,12 +19,15 @@ static const char *TAG = "main";
 int distance = 0;
 int left = 0, right = 0, oldcnt;
 static uint8_t peopleCount = 0; //default state: nobody is inside the room
-static int resetCounter = 0;
 boolean lastTrippedState = 0;
 
 //static int num_timeouts = 0;
 double people, distance_avg;
 
+// MQTT Commands
+static int resetCounter = 0;
+static int forceSetValue = -1;
+
 class PeopleCountSensor : public Component, public Sensor
 {
 public:
@@ -38,43 +41,69 @@ class PeopleCountSensor : public Component, public Sensor
     Wire.begin();
     Wire.setClock(400000);
 
-    count_sensor.init();
+    countSensor.init();
 #ifdef CALIBRATION
-    calibration(count_sensor);
+    calibration(countSensor);
 #endif
 #ifdef CALIBRATIONV2
-  calibration_boot(count_sensor);
+    calibration_boot(countSensor);
 #endif
     ESP_LOGI("VL53L1X custom sensor", "Starting measurements");
-    count_sensor.startMeasurement();
+    countSensor.startMeasurement();
+  }
+
+  void checkMQTTCommands()
+  {
+    if (resetCounter == 1)
+    {
+      ESP_LOGI("MQTTCommand", "Reset counter command received");
+      resetCounter = 0;
+      sendCounter(-1);
+    }
+    if (id(recalibrate) == 1)
+    {
+      ESP_LOGI("MQTTCommand", "Recalibration command received");
+      calibration(countSensor);
+      recalibrate = 0;
+    }
+    if (forceSetValue != -1)
+    {
+      ESP_LOGI("MQTTCommand", "Force set value command received");
+      publishMQTT(id(cnt));
+      forceSetValue = -1;
+    }
   }
 
+  void publishMQTT(int val)
+  {
+    peopleCount = val;
+    people_sensor->publish_state(val);
+  }
   void loop() override
   {
+    checkMQTTCommands();
     static int PathTrack[] = {0, 0, 0, 0};
     static int PathTrackFillingSize = 1; // init this to 1 as we start from state where nobody is any of the zones
     static int LeftPreviousStatus = NOBODY;
     static int RightPreviousStatus = NOBODY;
-    static int zone = 0;
+
 
     int CurrentZoneStatus = NOBODY;
     int AllZonesCurrentStatus = 0;
     int AnEventHasOccured = 0;
-    if (zone == LEFT)
+    if (zone == 0)
     {
-      distance = count_sensor.readRangeContinuoisMillimeters(roiConfig1);
+      distance = countSensor.readRangeContinuoisMillimeters(roiConfig1);
     }
-    else
+    else if (zone == 1)
     {
-      distance = count_sensor.readRangeContinuoisMillimeters(roiConfig2);
+      distance = countSensor.readRangeContinuoisMillimeters(roiConfig2);
     }
 
-    // if (distance < id(DIST_THRESHOLD_MAX_G))
-    if (distance < DIST_THRESHOLD_MAX[Zone] && distance > MIN_DISTANCE[Zone])
+    if (distance < DIST_THRESHOLD_MAX[zone] && distance > MIN_DISTANCE[zone])
     {
       // Someone is in !
       CurrentZoneStatus = SOMEONE;
-      //ESP_LOGE(TAG, "Global value is: %d", id(DIST_THRESHOLD_MAX_G));
     }
 
     // left zone