blakeandreasen-pdc · blakeandreasen-pdc · Nov 15, 2021 · Nov 15, 2021 · Nov 15, 2021 · Nov 15, 2021
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl
 liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
-custom: ['https://www.buymeacoffee.com/gW5rPpsKR','https://www.tindie.com/stores/luma/'] # Up to 4 links
+custom: ['https://www.buymeacoffee.com/gW5rPpsKR','https://www.etsy.com/listing/1191709235/haspone-haswitchplate-touchscreen-home','https://www.etsy.com/listing/1177721322/haspone-pcb'] # Up to 4 links
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+# Ignore VSCode files
+**/.vscode/
+.claude
diff --git a/3D_Printable_Models/HASwitchPlate_front_2x_decora_hasp.stl b/3D_Printable_Models/HASwitchPlate_front_2x_decora_hasp.stl
diff --git a/3D_Printable_Models/HASwitchPlate_front_2x_hasp_decora.stl b/3D_Printable_Models/HASwitchPlate_front_2x_hasp_decora.stl
diff --git a/3D_Printable_Models/HASwitchPlate_front_2x_hasp_toggle.stl b/3D_Printable_Models/HASwitchPlate_front_2x_hasp_toggle.stl
diff --git a/3D_Printable_Models/HASwitchPlate_front_2x_toggle_hasp.stl b/3D_Printable_Models/HASwitchPlate_front_2x_toggle_hasp.stl
diff --git a/3D_Printable_Models/HASwitchPlate_front_3x_decora_decora_hasp.stl b/3D_Printable_Models/HASwitchPlate_front_3x_decora_decora_hasp.stl
diff --git a/3D_Printable_Models/HASwitchPlate_front_3x_decora_hasp_decora.stl b/3D_Printable_Models/HASwitchPlate_front_3x_decora_hasp_decora.stl
diff --git a/3D_Printable_Models/HASwitchPlate_front_3x_hasp_decora_decora.stl b/3D_Printable_Models/HASwitchPlate_front_3x_hasp_decora_decora.stl
diff --git a/3D_Printable_Models/HASwitchPlate_front_3x_hasp_toggle_toggle.stl b/3D_Printable_Models/HASwitchPlate_front_3x_hasp_toggle_toggle.stl
diff --git a/3D_Printable_Models/HASwitchPlate_front_3x_toggle_toggle_hasp.stl b/3D_Printable_Models/HASwitchPlate_front_3x_toggle_toggle_hasp.stl
diff --git a/3D_Printable_Models/HASwitchPlate_front_4in_box.stl b/3D_Printable_Models/HASwitchPlate_front_4in_box.stl
diff --git a/3D_Printable_Models/HASwitchPlate_front_4x_hasp_decora_decora_decora.stl b/3D_Printable_Models/HASwitchPlate_front_4x_hasp_decora_decora_decora.stl
diff --git a/3D_Printable_Models/HASwitchPlate_front_single_deep.stl b/3D_Printable_Models/HASwitchPlate_front_single_deep.stl
diff --git a/Arduino_Sketch/.gitignore b/Arduino_Sketch/.gitignore
@@ -0,0 +1,6 @@
+.pio
+.vscode/.browse.c_cpp.db*
+.vscode/c_cpp_properties.json
+.vscode/launch.json
+.vscode/ipch
+.claude
diff --git a/Arduino_Sketch/HASwitchPlate.ino.d1_mini.bin b/Arduino_Sketch/HASwitchPlate.ino.d1_mini.bin
diff --git a/...no_Sketch/HASwitchPlate/HASwitchPlate.ino → ...no_Sketch/HASwitchPlate/HASwitchPlate.cpp b/...no_Sketch/HASwitchPlate/HASwitchPlate.ino → ...no_Sketch/HASwitchPlate/HASwitchPlate.cpp
diff --git a/Arduino_Sketch/README.md b/Arduino_Sketch/README.md
@@ -1,5 +1,3 @@
 # HASwitchPlate Arduino Sketch
 
-Here you'll find the [Arduino source code](./HASwitchPlate/HASwitchPlate.ino) for the microcontroller firmware along with [a pre-compiled binary image](https://github.com/aderusha/HASwitchPlate/raw/master/Arduino_Sketch/HASwitchPlate.ino.d1_mini.bin) which can be [flashed directly to your ESP8266](../Documentation/01_Arduino_Sketch.md#nodemcu-flasher).  
-
-Please [check the Arduino Sketch documentation](../Documentation/01_Arduino_Sketch.md) for additional deployment details.
+Here you'll find the [Arduino source code](./HASwitchPlate/HASwitchPlate.ino) for the microcontroller firmware along with [a pre-compiled binary image](https://github.com/HASwitchPlate/HASPone/raw/main/Arduino_Sketch/HASwitchPlate.ino.d1_mini.bin) which can be [flashed directly to your ESP8266](https://github.com/HASwitchPlate/HASPone/wiki/Flashing-HASPone-to-an-ESP8266).  
diff --git a/Arduino_Sketch/debug/HASwitchPlate.ino.d1_mini.elf b/Arduino_Sketch/debug/HASwitchPlate.ino.d1_mini.elf
diff --git a/Arduino_Sketch/platformio.ini b/Arduino_Sketch/platformio.ini
@@ -8,18 +8,23 @@
 ; Please visit documentation for the other options and examples
 ; https://docs.platformio.org/page/projectconf.html
 
+[platformio]
+src_dir = .
+
 [env:d1_mini]
-platform = https://github.com/platformio/platform-espressif8266.git @ ^3.2.0
+platform = https://github.com/platformio/platform-espressif8266.git @ ^4.2.1
 board = d1_mini
 framework = arduino
 board_build.f_cpu = 160000000L
 board_build.ldscript = eagle.flash.4m1m.ld
 build_flags = 
-    -D PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_191122 
+    -D PIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK305 
     -D PIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH
 lib_deps = 
-    bblanchon/ArduinoJson @ ^6.18.5
-    256dpi/MQTT @ ^2.5.0
-    dancol90/ESP8266Ping @ ^1.0
-    krzychb/EspSaveCrash @ ^1.2.0
-    https://github.com/tzapu/WiFiManager.git#72b53316105e6e15ec56b430b151907b4867e66a
+  256dpi/MQTT @ ^2.5.2
+  dancol90/ESP8266Ping @ ^1.1.0
+  bblanchon/ArduinoJson @ ^7.0.4
+  krzychb/EspSaveCrash @ ^1.3.0
+  https://github.com/tzapu/WiFiManager.git#e978bc059c522404c01e06cd136fcf23234eb784
+monitor_speed = 115200
+upload_speed = 921600
diff --git a/Home_Assistant/blueprints/README.md b/Home_Assistant/blueprints/README.md
@@ -2,9 +2,9 @@
 
 ---
 
-## HASP Core Functionality
+## HASPone Core Functionality
 
-[![HASP Core functionality](https://my.home-assistant.io/badges/blueprint_import.svg)](https://my.home-assistant.io/redirect/blueprint_import/?blueprint_url=https%3A%2F%2Fgithub.com%2FHASwitchPlate%2FHASPone%2Fblob%2Fmain%2FHome_Assistant%2Fblueprints%2Fhasp_Core_Functionality.yaml)
+[![HASPone Core functionality](https://my.home-assistant.io/badges/blueprint_import.svg)](https://my.home-assistant.io/redirect/blueprint_import/?blueprint_url=https%3A%2F%2Fgithub.com%2FHASwitchPlate%2FHASPone%2Fblob%2Fmain%2FHome_Assistant%2Fblueprints%2Fhasp_Core_Functionality.yaml)
 
 ![Preview](https://raw.githubusercontent.com/HASwitchPlate/HASPone/main/images/hasp_Core_Functionality.png)
 
@@ -24,15 +24,15 @@ Activates a selected page after a specified period of inactivity.
 
 [![Activate Page](https://my.home-assistant.io/badges/blueprint_import.svg)](https://my.home-assistant.io/redirect/blueprint_import/?blueprint_url=https%3A%2F%2Fgithub.com%2FHASwitchPlate%2FHASPone%2Fblob%2Fmain%2FHome_Assistant%2Fblueprints%2Fhasp_Activate_Page.yaml)
 
-A button on the HASP will activate a page when pressed. Can be combined on a button with another blueprint which displays text.
+A button on the HASPone will activate a page when pressed. Can be combined on a button with another blueprint which displays text.
 
 ---
 
 ### Create Device Triggers
 
 [![Create Device Triggers](https://my.home-assistant.io/badges/blueprint_import.svg)](https://my.home-assistant.io/redirect/blueprint_import/?blueprint_url=https%3A%2F%2Fgithub.com%2FHASwitchPlate%2FHASPone%2Fblob%2Fmain%2FHome_Assistant%2Fblueprints%2Fhasp_Create_Device_Triggers.yaml)
 
-Create [Device Triggers](https://www.home-assistant.io/integrations/device_trigger.mqtt/) for each of the HASP buttons defined. Device triggers can be utilized while creating your own automations through the Home Assistant UI. This allows for the easy creation of automations which will be triggered when pressing buttons on your HASP.
+Create [Device Triggers](https://www.home-assistant.io/integrations/device_trigger.mqtt/) for each of the HASPone buttons defined. Device triggers can be utilized while creating your own automations through the Home Assistant UI. This allows for the easy creation of automations which will be triggered when pressing buttons on your HASPone.
 
 ---
 
@@ -52,7 +52,7 @@ Page 7 controls a selected alarm panel for code entry and arm/disarm.
 
 ![Preview](https://raw.githubusercontent.com/HASwitchPlate/HASPone/main/images/hasp_Display_Calendar_with_Icon.png)
 
-A HASP button displays month + date on the right with a calendar icon on the left.
+A HASPone button displays month + date on the right with a calendar icon on the left.
 
 ---
 
@@ -62,7 +62,7 @@ A HASP button displays month + date on the right with a calendar icon on the lef
 
 ![Preview](https://raw.githubusercontent.com/HASwitchPlate/HASPone/main/images/hasp_Display_Clock_with_Icon.png)
 
-A HASP button displays a clock on the right with a clock icon on the left.
+A HASPone button displays a clock on the right with a clock icon on the left.
 
 ---
 
@@ -72,7 +72,7 @@ A HASP button displays a clock on the right with a clock icon on the left.
 
 ![Preview](https://raw.githubusercontent.com/HASwitchPlate/HASPone/main/images/hasp_Display_Clock.png)
 
-A HASP button displays a clock with configurable text options.
+A HASPone button displays a clock with configurable text options.
 
 ---
 
@@ -82,7 +82,7 @@ A HASP button displays a clock with configurable text options.
 
 ![Preview](https://raw.githubusercontent.com/HASwitchPlate/HASPone/main/images/hasp_Display_Dimmer_with_Icon.png)
 
-A HASP button displays a dimmer control on page 4 and 5 with a toggle on/off icon to the left.
+A HASPone button displays a dimmer control on page 4 and 5 with a toggle on/off icon to the left.
 
 ---
 
@@ -92,7 +92,7 @@ A HASP button displays a dimmer control on page 4 and 5 with a toggle on/off ico
 
 ![Preview](https://raw.githubusercontent.com/HASwitchPlate/HASPone/main/images/hasp_Display_Entity_State_or_Attribute.png)
 
-A HASP button displays the state or attribute value of an entity
+A HASPone button displays the state or attribute value of an entity
 
 ---
 
@@ -112,7 +112,7 @@ Page 8 controls a selected media player with artist and track info, track back/p
 
 ![Preview](https://raw.githubusercontent.com/HASwitchPlate/HASPone/main/images/hasp_Display_Template.png)
 
-A button on the HASP will display the output of a template.  The template is updated when the state of a selected entity updates.
+A button on the HASPone will display the output of a template.  The template is updated when the state of a selected entity updates.
 
 ---
 
@@ -122,7 +122,7 @@ A button on the HASP will display the output of a template.  The template is upd
 
 ![Preview](https://raw.githubusercontent.com/HASwitchPlate/HASPone/main/images/hasp_Display_Text.png)
 
-A button on the HASP will display text.  This can be useful when combined with other blueprints which perform an action, but don't apply a label to a button. Deploy both blueprints on the same button, and now you have a button that says things and does things.
+A button on the HASPone will display text.  This can be useful when combined with other blueprints which perform an action, but don't apply a label to a button. Deploy both blueprints on the same button, and now you have a button that says things and does things.
 
 ---
 
@@ -132,7 +132,17 @@ A button on the HASP will display text.  This can be useful when combined with o
 
 ![Preview](https://raw.githubusercontent.com/HASwitchPlate/HASPone/main/images/hasp_Display_Toggle.gif)
 
-Press a button on the HASP to toggle the state of an entity.  The button colors and text can change in response to the on/off state or attribute of the selected entity.
+Press a button on the HASPone to toggle the state of an entity.  The button colors and text can change in response to the on/off state or attribute of the selected entity.
+
+---
+
+### Display Value with Icon and Colors
+
+[![Display Value with Icon and Colors](https://my.home-assistant.io/badges/blueprint_import.svg)](https://my.home-assistant.io/redirect/blueprint_import/?blueprint_url=https%3A%2F%2Fgithub.com%2FHASwitchPlate%2FHASPone%2Fblob%2Fmain%2FHome_Assistant%2Fblueprints%2Fhasp_Display_Value_with_Icon_and_Colors.yaml)
+
+![Preview](https://raw.githubusercontent.com/HASwitchPlate/HASPone/main/images/hasp_Display_Value_with_Icon_and_Colors.png)
+
+A HASPone button displays the current value of an entity (state or attribute) with a dynamic icon on the left and (optional) colors.  Up to 5 icons and color ranges are supported.
 
 ---
 
@@ -152,7 +162,17 @@ The slider button on page 8 displays a volume control
 
 ![Preview](https://raw.githubusercontent.com/HASwitchPlate/HASPone/main/images/hasp_Display_Weather_Condition_with_Icon.png)
 
-A HASP button displays the current weather condition on the right with a matching icon on the left
+A HASPone button displays the current weather condition on the right with a matching icon on the left
+
+---
+
+### Display Weather Condition Icon Only
+
+[![Display Weather Condition Icon Only](https://my.home-assistant.io/badges/blueprint_import.svg)](https://my.home-assistant.io/redirect/blueprint_import/?blueprint_url=https%3A%2F%2Fgithub.com%2FHASwitchPlate%2FHASPone%2Fblob%2Fmain%2FHome_Assistant%2Fblueprints%2Fhasp_Display_Weather_Condition_Icon_Only.yaml)
+
+![Preview](https://raw.githubusercontent.com/HASwitchPlate/HASPone/main/images/hasp_Display_Weather_Condition_Icon_Only.png)
+
+A HASPone button displays the current weather condition as an icon
 
 ---
 
@@ -162,7 +182,7 @@ A HASP button displays the current weather condition on the right with a matchin
 
 ![Preview](https://raw.githubusercontent.com/HASwitchPlate/HASPone/main/images/hasp_Display_Weather_Forecast.png)
 
-A HASP button displays an attribute of a selected weather forecast. You can use this to display tomorrow's condition, or tonight's low temp. Available forecast conditions will vary by weather provider, check your selected provider's state under `Developer Tools` > `States` to get a sense of what your selected provider has to offer.
+A HASPone button displays an attribute of a selected weather forecast. You can use this to display tomorrow's condition, or tonight's low temp. Available forecast conditions will vary by weather provider, check your selected provider's state under `Developer Tools` > `States` to get a sense of what your selected provider has to offer.
 
 ---
 
@@ -172,7 +192,7 @@ A HASP button displays an attribute of a selected weather forecast. You can use
 
 ![Preview](https://raw.githubusercontent.com/HASwitchPlate/HASPone/main/images/hasp_Display_Weather_Temperature_Color_Icon_Only.png)
 
-A HASP button displays the current temperature as an icon that is optionally coloured.
+A HASPone button displays the current temperature as an icon that is optionally coloured.
 
 ---
 
@@ -182,15 +202,15 @@ A HASP button displays the current temperature as an icon that is optionally col
 
 ![Preview](https://raw.githubusercontent.com/HASwitchPlate/HASPone/main/images/hasp_Display_Weather_Temperature_with_Icon_and_Colors.png)
 
-A HASP button displays the current temperature from a selected weather provider on the right with a dynamic thermometer icon on the left and (optional) colors.
+A HASPone button displays the current temperature from a selected weather provider on the right with a dynamic thermometer icon on the left and (optional) colors.
 
 ---
 
 ### Perform Action
 
 [![Perform Action](https://my.home-assistant.io/badges/blueprint_import.svg)](https://my.home-assistant.io/redirect/blueprint_import/?blueprint_url=https%3A%2F%2Fgithub.com%2FHASwitchPlate%2FHASPone%2Fblob%2Fmain%2FHome_Assistant%2Fblueprints%2Fhasp_Perform_Action.yaml)
 
-A button on the HASP will perform an action when pressed. Can be combined on a button with another blueprint which displays text.
+A button on the HASPone will perform an action when pressed. Can be combined on a button with another blueprint which displays text.
 
 ---
 
@@ -200,7 +220,7 @@ A button on the HASP will perform an action when pressed. Can be combined on a b
 
 ![Preview](https://raw.githubusercontent.com/HASwitchPlate/HASPone/main/images/hasp_Cycle_Automations.gif)
 
-A button on the HASP will toggle through as many as 10 selected automations.  This allows the user to assign multiple blueprints to the same button on the HASPone device, and to cycle between them by pressing the selected button.
+A button on the HASPone will toggle through as many as 10 selected automations.  This allows the user to assign multiple blueprints to the same button on the HASPone device, and to cycle between them by pressing the selected button.
 
 Optionally, a timeout can be set to cycle back to a "default" automation after a specified interval, or to continuously cycle through selected automations.
 
@@ -226,32 +246,42 @@ Dim the screen backlight after a specified period of inactivity.
 
 [![Apply Theme](https://my.home-assistant.io/badges/blueprint_import.svg)](https://my.home-assistant.io/redirect/blueprint_import/?blueprint_url=https%3A%2F%2Fgithub.com%2FHASwitchPlate%2FHASPone%2Fblob%2Fmain%2FHome_Assistant%2Fblueprints%2Fhasp_Apply_Theme.yaml)
 
-A button on the HASP will have the current device theme or custom colors applied.
+A button on the HASPone will have the current device theme or custom colors applied.
 
 ---
 
-### HASP Theme Dark on Light
+### HASPone Theme Dark on Light
 
-[![HASP Theme Dark on Light](https://my.home-assistant.io/badges/blueprint_import.svg)](https://my.home-assistant.io/redirect/blueprint_import/?blueprint_url=https%3A%2F%2Fgithub.com%2FHASwitchPlate%2FHASPone%2Fblob%2Fmain%2FHome_Assistant%2Fblueprints%2Fhasp_Theme_Dark_on_Light.yaml)
+[![HASPone Theme Dark on Light](https://my.home-assistant.io/badges/blueprint_import.svg)](https://my.home-assistant.io/redirect/blueprint_import/?blueprint_url=https%3A%2F%2Fgithub.com%2FHASwitchPlate%2FHASPone%2Fblob%2Fmain%2FHome_Assistant%2Fblueprints%2Fhasp_Theme_Dark_on_Light.yaml)
 
 ![Preview](https://raw.githubusercontent.com/HASwitchPlate/HASPone/main/images/hasp_Theme_Dark_on_Light.png)
 
-Press RUN ACTIONS to apply the theme Dark on Light to the selected HASP device
+Press RUN ACTIONS to apply the theme Dark on Light to the selected HASPone device
 
 ---
 
-### HASP Theme Light on Dark
+### HASPone Theme Light on Dark
 
-[![HASP Theme Light on Dark](https://my.home-assistant.io/badges/blueprint_import.svg)](https://my.home-assistant.io/redirect/blueprint_import/?blueprint_url=https%3A%2F%2Fgithub.com%2FHASwitchPlate%2FHASPone%2Fblob%2Fmain%2FHome_Assistant%2Fblueprints%2Fhasp_Theme_Light_on_Dark.yaml)
+[![HASPone Theme Light on Dark](https://my.home-assistant.io/badges/blueprint_import.svg)](https://my.home-assistant.io/redirect/blueprint_import/?blueprint_url=https%3A%2F%2Fgithub.com%2FHASwitchPlate%2FHASPone%2Fblob%2Fmain%2FHome_Assistant%2Fblueprints%2Fhasp_Theme_Light_on_Dark.yaml)
 
 ![Preview](https://raw.githubusercontent.com/HASwitchPlate/HASPone/main/images/hasp_Theme_Light_on_Dark.png)
 
-Press RUN ACTIONS to apply the theme Light on Dark to the selected HASP device
+Press RUN ACTIONS to apply the theme Light on Dark to the selected HASPone device
+
+---
+
+### HASPone Theme Light on Dark Blue
+
+[![HASPone Theme Light on Dark](https://my.home-assistant.io/badges/blueprint_import.svg)](https://my.home-assistant.io/redirect/blueprint_import/?blueprint_url=https%3A%2F%2Fgithub.com%2FHASwitchPlate%2FHASPone%2Fblob%2Fmain%2FHome_Assistant%2Fblueprints%2Fhasp_Theme_Light_on_BlueDark.yaml)
+
+![Preview](https://raw.githubusercontent.com/HASwitchPlate/HASPone/main/images/hasp_Theme_Light_on_BlueDark.png)
+
+Press RUN ACTIONS to apply the theme Light on Dark Blue to the selected HASPone device
 
 ---
 
 ### Remove MQTT Discovery Devices
 
 [![Remove MQTT Discovery Devices](https://my.home-assistant.io/badges/blueprint_import.svg)](https://my.home-assistant.io/redirect/blueprint_import/?blueprint_url=https%3A%2F%2Fgithub.com%2FHASwitchPlate%2FHASPone%2Fblob%2Fmain%2FHome_Assistant%2Fblueprints%2Fhasp_Remove_MQTT_Discovery_Devices.yaml)
 
-Press RUN ACTIONS to remove retained MQTT discovery messages for a decommissioned HASP.
+Press RUN ACTIONS to remove retained MQTT discovery messages for a decommissioned HASPone.