From 581bb2883e8612cca8d4fd5662a8a0aefcf2addb Mon Sep 17 00:00:00 2001
From: TJ Horner <me@tjhorner.com>
Date: Sat, 16 Dec 2023 17:00:13 -0800
Subject: [PATCH] Add ESPHome 2023.12 compatibility

---
 .github/workflows/nightly-build.yaml |  2 +-
 firmware/addons/presets.yaml         | 14 ++++++++++----
 firmware/base.yaml                   |  6 +++---
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/nightly-build.yaml b/.github/workflows/nightly-build.yaml
index 76bde17..3050d1e 100644
--- a/.github/workflows/nightly-build.yaml
+++ b/.github/workflows/nightly-build.yaml
@@ -15,7 +15,7 @@ jobs:
           python-version: "3.9"
 
       - name: Install ESPHome
-        run: pip install --user esphome
+        run: pip install --pre --user esphome
       
       - name: Compile Release Firmware
         working-directory: firmware
diff --git a/firmware/addons/presets.yaml b/firmware/addons/presets.yaml
index ba80fa8..57a9d81 100644
--- a/firmware/addons/presets.yaml
+++ b/firmware/addons/presets.yaml
@@ -2,22 +2,28 @@ output:
   - platform: gpio
     inverted: true
     id: button_bit1
-    pin: ${button_bit1_pin}
+    pin:
+      number: ${button_bit1_pin}
+      allow_other_uses: true
 
   - platform: gpio
     inverted: true
     id: button_bit2
-    pin: ${button_bit2_pin}
+    pin:
+      number: ${button_bit2_pin}
+      allow_other_uses: true
 
   - platform: gpio
     inverted: true
     id: button_bit4
-    pin: ${button_bit4_pin}
+    pin:
+      number: ${button_bit4_pin}
 
   - platform: gpio
     inverted: true
     id: button_m
-    pin: ${button_m_pin}
+    pin:
+      number: ${button_m_pin}
 
 button:
   # Recall Presets
diff --git a/firmware/base.yaml b/firmware/base.yaml
index 1685160..3de7036 100644
--- a/firmware/base.yaml
+++ b/firmware/base.yaml
@@ -3,7 +3,7 @@ esphome:
   name: "${name}"
   friendly_name: "${friendly_name}"
   name_add_mac_suffix: true
-  min_version: "2023.5.1"
+  min_version: "2023.12.0"
   on_boot:
     then:
       # Wakes up the desk and reports height
@@ -12,7 +12,7 @@ esphome:
           data: [ 0x0 ]
   project:
     name: tj_horner.upsy_desky
-    version: "1.2.0"
+    version: "2.0.0-pre"
 
 uart:
   id: handset_tx
@@ -46,7 +46,7 @@ substitutions:
   default_height_units: "in" # Must be "in" or "cm"
 
 packages:
-  standing_desk: github://tjhorner/esphome-standing-desk/configs/template.yaml
+  standing_desk: github://tjhorner/esphome-standing-desk/configs/template.yaml@esphome-2023.12
   addon_presets: !include addons/presets.yaml
   addon_stable_ids: !include addons/stable-ids.yaml
   addon_runtime_config: !include addons/runtime-config.yaml