Merge ee1a970647 into 9714d659ea

Ceilings that are higher than the sensor capabilities result in out of range (-1) readings.
Daylight, water on the floor and other environment changes can also cause the sensor to read out of range. This change results in 30 readings of -1 to be VehicleDetected false.

.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/ratgdo.h

@@ -65,7 +65,7 @@ namespace ratgdo {
         observable<uint32_t> closing_delay { 0 };
 
         observable<int16_t> target_distance_measurement { -1 };
-        std::vector<int16_t> distance_measurement { std::vector<int16_t>(10, -1) }; // the length of this vector determines how many in-range readings are required for presence detection to change states
+        std::vector<int16_t> distance_measurement { std::vector<int16_t>(30, -1) }; // the length of this vector determines how many in-range readings are required for presence detection to change states
         observable<int16_t> last_distance_measurement { 0 };
 
         observable<uint16_t> openings { 0 }; // number of times the door has been opened

components/ratgdo/sensor/ratgdo_sensor.cpp

@@ -88,15 +88,13 @@ namespace ratgdo {
                 objCount = pDistanceData->NumberOfObjectsFound;
 
                 maxDistance = objCount == 0 ? -1 : pDistanceData->RangeData[objCount - 1].RangeMilliMeter;
-                /* if(maxDistance < 0) maxDistance = -1;
-                 * if the sensor is pointed at glass, there are many error readings which will fill the
+                /* 
+                 * 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, unless its mounted really far away.
-                 * If this doesn't work, then the vector size will have to increase substantially
+                 * in most situations, but daylight and/or really high ceilings can cause long distance 
+				 * measurements to be out of range.
                  */
-                if (maxDistance > 0) {
-                    this->parent_->set_distance_measurement(maxDistance);
-                }
+                this->parent_->set_distance_measurement(maxDistance);
 
                 // ESP_LOGD(TAG,"# obj found %d; distance %d",objCount, maxDistance);
 

static/index.html

@@ -271,7 +271,7 @@
     <h3>Drivers</h3>
     <p>If you can't connect to your ratgdo board make sure you have the right driver installed for the type of board you have.</p>
     <ul>
-      <li>ratgdo32 disco uses a CH9102 USB to Serial chipset. [<a href="https://www.wch-ic.com/downloads/CH343SER_EXE.html" target="_blank">driver download</a>]</li>
+      <li>ratgdo32 and ratgdo32 disco use a CH9102 USB to Serial chipset. Modern versions of Windows &amp; macOS include the necessary drivers natively. Installing a standalone driver can create a conflict preventing you from connecting to ratgdo32.</li>
       <li>ratgdo v2.5i uses a CH340 USB to Serial chipset. [<a href="https://www.wch-ic.com/downloads/CH341SER_EXE.html" target="_blank">driver download</a>]</li>
     </ul>
     <p>Watch the v2.5i driver and firmware installation [<a href="https://www.youtube.com/watch?v=9WecAUTC9iI">video on YouTube</a>].</p>

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