Merge ee1a970647 into 89a5c28a32

former logic assumed it was the last distance found, which turns out to not always be the case. Implementing @dkerr64 logic from https://github.com/ratgdo/homekit-ratgdo32/pull/16

.github/workflows/build.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - ratgdo32
+      - main
   pull_request:
   schedule:
     - cron: '0 4 * * 1'
@@ -97,7 +97,7 @@ jobs:
 
 
   consolidate:
-    if: github.event_name != 'pull_request' && github.ref == 'refs/heads/ratgdo32'
+    if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
     name: Consolidate firmwares
     runs-on: ubuntu-latest
     needs: build
@@ -119,7 +119,7 @@ jobs:
           path: output
 
   deploy:
-    if: github.event_name != 'pull_request' && github.ref == 'refs/heads/ratgdo32'
+    if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
     name: Deploy to GitHub Pages
     runs-on: ubuntu-latest
     needs: consolidate

base.yaml

@@ -3,7 +3,7 @@ external_components:
   - source:
       type: git
       url: https://github.com/ratgdo/esphome-ratgdo
-      ref: ratgdo32
+      ref: main
     refresh: 1s
   # - source:
   #     type: local

base_drycontact.yaml

@@ -4,7 +4,7 @@ external_components:
   - source:
       type: git
       url: https://github.com/ratgdo/esphome-ratgdo
-      ref: ratgdo32
+      ref: main
     refresh: 1s
   # - source:
   #     type: local

base_secplusv1.yaml

@@ -4,7 +4,7 @@ external_components:
   - source:
       type: git
       url: https://github.com/ratgdo/esphome-ratgdo
-      ref: ratgdo32
+      ref: main
     refresh: 1s
   # - source:
   #     type: local

components/ratgdo/sensor/ratgdo_sensor.cpp

@@ -87,12 +87,19 @@ namespace ratgdo {
                 status = this->distance_sensor_.VL53L4CX_GetMultiRangingData(pDistanceData);
                 objCount = pDistanceData->NumberOfObjectsFound;
 
-                maxDistance = objCount == 0 ? -1 : pDistanceData->RangeData[objCount - 1].RangeMilliMeter;
+                for (int i = 0; i < distanceData.NumberOfObjectsFound; i++) {
+                    VL53L4CX_TargetRangeData_t *d = &pDistanceData->RangeData[i];
+                    if (d->RangeStatus == 0) {
+                        maxDistance = std::max(maxDistance, d->RangeMilliMeter);
+                    }
+                }
+
+                //maxDistance = objCount == 0 ? -1 : pDistanceData->RangeData[objCount - 1].RangeMilliMeter;
                 /* 
                  * if the sensor is pointed at glass, there are many error -1 readings which will fill the
                  * vector with out of range data. The sensor should be sensitive enough to detect the floor
                  * in most situations, but daylight and/or really high ceilings can cause long distance 
-				 * measurements to be out of range.
+                 * measurements to be out of range.
                  */
                 this->parent_->set_distance_measurement(maxDistance);
 

static/v32board.yaml

@@ -30,7 +30,7 @@ dashboard_import:
 packages:
   remote_package:
     url: https://github.com/ratgdo/esphome-ratgdo
-    ref: ratgdo32
+    ref: main
     files: [base.yaml]
     refresh: 1s
   # remote_package: !include

static/v32board_drycontact.yaml

@@ -29,7 +29,7 @@ dashboard_import:
 packages:
   remote_package:
     url: https://github.com/ratgdo/esphome-ratgdo
-    ref: ratgdo32
+    ref: main
     files: [base_drycontact.yaml]
     refresh: 1s
   # remote_package: !include

static/v32board_secplusv1.yaml

@@ -30,7 +30,7 @@ dashboard_import:
 packages:
   remote_package:
     url: https://github.com/ratgdo/esphome-ratgdo
-    ref: ratgdo32
+    ref: main
     files: [base_secplusv1.yaml]
     refresh: 1s
   # remote_package: !include

static/v32disco.yaml

@@ -30,7 +30,7 @@ dashboard_import:
 packages:
   remote_package:
     url: https://github.com/ratgdo/esphome-ratgdo
-    ref: ratgdo32
+    ref: main
     files: [base.yaml]
     refresh: 1s
   # remote_package: !include

static/v32disco_drycontact.yaml

@@ -29,7 +29,7 @@ dashboard_import:
 packages:
   remote_package:
     url: https://github.com/ratgdo/esphome-ratgdo
-    ref: ratgdo32
+    ref: main
     files: [base_drycontact.yaml]
     refresh: 1s
   # remote_package: !include

static/v32disco_secplusv1.yaml

@@ -30,7 +30,7 @@ dashboard_import:
 packages:
   remote_package:
     url: https://github.com/ratgdo/esphome-ratgdo
-    ref: ratgdo32
+    ref: main
     files: [base_secplusv1.yaml]
     refresh: 1s
   # remote_package: !include