Merge ee1a970647 into f58247e029

for more information, see https://pre-commit.ci

.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

README.md

@@ -1,16 +1,12 @@
 
 # ratgdo for ESPHome
 
-This is a port of the ratgdo software for the v2.0/v2.5 board to ESPHome.
+[Visit the ratcloud.llc to purchase boards](https://ratcloud.llc)
-
-[Visit the github.io page to purchase boards](https://paulwieland.github.io/ratgdo/#order)
 
 ## Installation
 
 - Flash the ESPHome based firmware using the [Web Installer](https://ratgdo.github.io/esphome-ratgdo/)
 
-It is no longer necessary to save the rolling code counter when switching between firmware.
-
 ## First use after adding to Home Assistant
 
 The ESPHome firmware will allow you to open the door to any position after calibration. To calibrate the door, open and close it once without stopping.

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

static/index.html

@@ -215,33 +215,43 @@
         ratgdo32 disco
       </label>
 
+      <label>
+        <img src="./ratgdo32.jpg" alt="v32 board" />
+        <input type="radio" name="hardware" value="v32board" checked />
+        ratgdo32
+      </label>
+
       <label>
         <img src="./ratgdo_v2.5xi.jpg" alt="v2.5i, v2.52i, v2.53i" />
         <input type="radio" name="hardware" value="v25iboard" checked />
         ratgdo v2.5x<br/>
       v2.5, v2.5i, v2.52i, v2.53i (black PCB)
       </label>
+    </div>
 
-      <label>
+    <a id="show_legacy_hardware" style="text-decoration: underline;" onclick="toggleLegacy()">Show Legacy Hardware &raquo;</a>
-        <img src="./ratgdo_v2.0.jpg" alt="v2.0" />
-        <input type="radio" name="hardware" value="v2board_esp8266_d1_mini" />
-        ratgdo v2.0<br/>
-        ESP8266 / D1 Mini (white PCB)
-      </label>
 
-      <label>
+    <div class="hardware radios" id="legacy_hardware" style="display: none">
-        <img src="./v25board_esp32_d1_mini.png" alt="v2.5 esp32" />
+        <label>
-        <input type="radio" name="hardware" value="v25board_esp32_d1_mini" />
+            <img src="./ratgdo_v2.0.jpg" alt="v2.0" />
-        ratgdo v2.5<br/>
+            <input type="radio" name="hardware" value="v2board_esp8266_d1_mini" />
-        ESP32 (black PCB)
+            ratgdo v2.0<br/>
-      </label>
+            ESP8266 / D1 Mini (white PCB)
+        </label>
 
-      <label>
+        <label>
-        <img src="./v2board_esp32_d1_mini.png" alt="v2.0 esp32" />
+            <img src="./v25board_esp32_d1_mini.png" alt="v2.5 esp32" />
-        <input type="radio" name="hardware" value="v2board_esp32_d1_mini" />
+            <input type="radio" name="hardware" value="v25board_esp32_d1_mini" />
-        ratgdo v2.0<br/>
+            ratgdo v2.5<br/>
-        ESP32 (white PCB)
+            ESP32 (black PCB)
-      </label>
+        </label>
+
+        <label>
+            <img src="./v2board_esp32_d1_mini.png" alt="v2.0 esp32" />
+            <input type="radio" name="hardware" value="v2board_esp32_d1_mini" />
+            ratgdo v2.0<br/>
+            ESP32 (white PCB)
+        </label>
     </div>
 
     <p>
@@ -288,6 +298,18 @@
       </div>
     </div>
     <script>
+      function toggleLegacy() {
+          var x = document.querySelector("#legacy_hardware");
+          var y = document.querySelector("#show_legacy_hardware");
+          if (x.style.display === "none") {
+              x.style.display = "flex";
+              y.innerHTML = "hide legacy hardware &raquo;";
+          } else {
+              x.style.display = "none";
+              y.innerHTML = "show legacy hardware &raquo;";
+          }
+      }
+
       document.querySelectorAll('div.radios input').forEach((radio) =>
         radio.addEventListener("change", () => {
         const button = document.querySelector("esp-web-install-button");

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