diff --git a/docs/assets/h-2-boot-mode-method-1-boot-button.webp b/docs/assets/h-2-boot-mode-method-1-boot-button.webp
new file mode 100755
index 000000000..027e4eccf
Binary files /dev/null and b/docs/assets/h-2-boot-mode-method-1-boot-button.webp differ
diff --git a/docs/assets/h-2-boot-mode-method-2-boot-reset-buttons.webp b/docs/assets/h-2-boot-mode-method-2-boot-reset-buttons.webp
new file mode 100755
index 000000000..86776840b
Binary files /dev/null and b/docs/assets/h-2-boot-mode-method-2-boot-reset-buttons.webp differ
diff --git a/docs/assets/h-2-image.png b/docs/assets/h-2-image.png
new file mode 100755
index 000000000..d0571b942
Binary files /dev/null and b/docs/assets/h-2-image.png differ
diff --git a/docs/assets/h-2-reflash-install.gif b/docs/assets/h-2-reflash-install.gif
new file mode 100755
index 000000000..9acbd3a02
Binary files /dev/null and b/docs/assets/h-2-reflash-install.gif differ
diff --git a/docs/assets/h-2-reflash-installer-connect.gif b/docs/assets/h-2-reflash-installer-connect.gif
new file mode 100755
index 000000000..a99f0d723
Binary files /dev/null and b/docs/assets/h-2-reflash-installer-connect.gif differ
diff --git a/docs/assets/h-2-reset-and-boot-buttons-labeled.png b/docs/assets/h-2-reset-and-boot-buttons-labeled.png
new file mode 100755
index 000000000..46bacfc43
Binary files /dev/null and b/docs/assets/h-2-reset-and-boot-buttons-labeled.png differ
diff --git a/docs/products/h2/faq.md b/docs/products/h2/faq.md
index 461762843..f4aace530 100755
--- a/docs/products/h2/faq.md
+++ b/docs/products/h2/faq.md
@@ -8,11 +8,11 @@ description: Frequently asked questions about the H-2.
2\. **Can I customize the songs and LED effects?**
-* Yes! While the H-2 ships pre-loaded with four songs and light effects, you can integrate it with Home Assistant and ESPHome to further customize songs, LED patterns, and more. This makes the H-2 a versatile addition to your smart home holiday setup.
+* Yes! While the H-2 ships pre-loaded with four songs and light effects, you can integrate it with Home Assistant and ESPHome to further customize songs, LED patterns, and more. This makes the H-2 a versatile addition to your smart home holiday setup. You can also use the buzzer to play any song in Home Assistant!
3\. **Is the Apollo H-2 “smart” right out of the box?**
-* The H-2 is pre-flashed with a simple firmware that operates independently, allowing you to play songs with the gold button without needing any additional setup. For a full “smart” experience, you can connect the H-2 to Home Assistant, where you can program custom automations, change songs, and adjust LED effects.
+* The H-2 is pre-flashed with a simple firmware that operates independently, allowing you to play songs with the gold button without needing any additional setup. For a full “smart” experience, you can reflash the H-2 to the smart firmware then join it to Home Assistant, where you can program custom automations, change songs, and adjust LED effects.
4\. **How do I activate the pre-loaded songs?**
@@ -28,11 +28,11 @@ description: Frequently asked questions about the H-2.
7\. **How do I set up the Apollo H-2 with Home Assistant?**
-* To integrate the H-2 with Home Assistant, follow getting started guide or reach out to our support team for assistance. Once connected, you can unlock additional functionality and customization.
+* To integrate the H-2 with Home Assistant, reflash the sensor with smart firmware.
8\. **Does the ornament require any additional power source?**
-* The Apollo H-2 can operate on battery power, making it easy to hang and place wherever you'd like in your holiday decorations. It uses a [(rechargable) RC-CR123A aka 16340 battery (ideally 2800mAh or higher)](https://www.amazon.com/PAOWANG-Rechargeable-Capacity-Headlamp-Flashlight/dp/B0DF7T9YZ6). It can also be powered by the USB-C port. The H-2 USB-C port will NOT charge the battery, you need an external charger.
+* The Apollo H-2 can operate on battery power, making it easy to hang and place wherever you'd like in your holiday decorations. It uses a [(rechargable) RC-CR123A aka 16340 battery (ideally 2800mAh or higher)](https://www.amazon.com/PAOWANG-Rechargeable-Capacity-Headlamp-Flashlight/dp/B0DF7T9YZ6). It can also be powered by the USB-C port. The H-2 USB-C port will charge the battery very slowly.
9\. **Can I gift the Apollo H-2 to friends or family?**
@@ -46,4 +46,4 @@ description: Frequently asked questions about the H-2.
* For more details, setups, guides, and other products please email us at support@apolloautomation.com
-[Click here to join our Discord for fast support! :simple-discord:](https://dsc.gg/apolloautomation){ .md-button .md-button--primary }
\ No newline at end of file
+[Click here to join our Discord for fast support! :simple-discord:](https://dsc.gg/apolloautomation){ .md-button .md-button--primary }
\ No newline at end of file
diff --git a/docs/products/h2/introduction.md b/docs/products/h2/introduction.md
index 4d879ea83..5f19c79df 100755
--- a/docs/products/h2/introduction.md
+++ b/docs/products/h2/introduction.md
@@ -2,12 +2,14 @@
title: H-2 Introduction
description: H-2 Introduction.
---
-
+
-The Apollo H-2 is our special holiday ornament, designed to bring festive cheer to your home while supporting a good cause. As the second in our annual series, this ornament is crafted with both functionality and community spirit in mind. All proceeds from the H-2 go directly to Casa De Lexington in Lexington, KY and the Open Home Foundation, reflecting our commitment to giving back and celebrating the season alongside our community.
+**Can be powered by USB-C or battery.** Uses a 16340 or RCR123A **rechargeable** battery. The device can charge the battery directly via USB-C for convenient power management.
-The H-2 is pre-flashed with a playful firmware featuring four classic holiday songs. With just a press of the gold buttons on the back, you can enjoy the tunes with synchronized LED effects: one press for Sleigh Bells, two presses for Rudolph the Red-Nosed Reindeer, and long press for Let it Snow. Each song brings its own light show, making the H-1 both fun and festive right out of the box.
+The Apollo H-2 is the second edition of our annual holiday ornament! It's our way of saying thank you for your support and giving back to our community.
-For those looking to personalize their experience, the H-2 can also be integrated with Home Assistant, transforming it into a “smart” ornament. Through this setup, you can customize songs, LED effects, and create unique holiday automations to suit your style.
+The H-2 ships pre-flashed with a basic firmware featuring four classic holiday tunes. Simply press any of the four buttons on the back to play: Button 1 for Jingle Bells, Button 2 for Rudolph the Red-Nosed Reindeer, Button 3 for Let it Snow, and Button 4 for Blue Christmas. The LEDs light up with unique effects to match each tune!
-With the Apollo H-2, we’re blending holiday joy, smart home innovation, and community spirit into a single ornament, making it a perfect addition to any festive setup.
\ No newline at end of file
+You can also integrate it with Home Assistant to unlock more features, such as changing the songs and LED effects, bluetooth proxy, and bluetooth tracking. You will need to reflash it to the smart firmware first!
+
+**New for 2025:** The H-2 features four dedicated song buttons (no more multi-click!), upgraded ESP32-C6 processor with 8MB flash, 58 RGB LEDs (up from 22), USB-C charging, and a logo light for enhanced visual appeal.
\ No newline at end of file
diff --git a/docs/products/h2/getting-started.md b/docs/products/h2/setup/getting-started.md
similarity index 68%
rename from docs/products/h2/getting-started.md
rename to docs/products/h2/setup/getting-started.md
index 195b498f0..e28a44814 100755
--- a/docs/products/h2/getting-started.md
+++ b/docs/products/h2/setup/getting-started.md
@@ -6,7 +6,7 @@ description: H-2 Getting Started tutorial.
**1\. Powering On the H-2**
-Insert a rechargeable RC-CR123A (16340) battery, ideally 2800mAh or higher, such as this option on Amazon.
+Insert a rechargeable RC-CR123A (16340) battery, ideally 2800mAh or higher, such as this option on Amazon.
@@ -21,16 +21,14 @@ After the ornament is awake, press the gold buttons (see image below) to play a
* **Button 1:** Sleigh Bells
* **Button 2:** Rudolph the Red-Nosed Reindeer
* **Button 3:** Let It Snow
-* **Button 4:** White Christmas
-
-
+* **Button 4:** Blue Christmas
4\. **Add to Home Assistant** (Optional)
-For additional customization, you will need to flash the [smart H-2 firmware](https://wiki.apolloautomation.com/products/h1/code/) and then connect to Home Assistant following the [setup guide](https://wiki.apolloautomation.com/products/general/setup/getting-started/). With Home Assistant you can add new songs, change LED effects, and create custom automations.
+For additional customization, you will need to flash the [smart H-2 firmware](https://apolloautomation.github.io/H-2/) and then connect to Home Assistant following the [setup guide](https://wiki.apolloautomation.com/products/general/setup/getting-started/). With Home Assistant you can add new songs, change LED effects, and create custom automations.
5\. **Enjoy Your Ornament**
Hang the H-2 on your tree, place it on a mantel, or incorporate it into any holiday setup for added joy. Your Apollo H-2 is now ready to spread holiday cheer! Enjoy the festive tunes and LED effects, and feel free to share your unique setup with us in the community!
-[Join our Discord if you need more help! :simple-discord:](https://dsc.gg/apolloautomation){ .md-button }
\ No newline at end of file
+[Join our Discord if you need more help! :simple-discord:](https://dsc.gg/apolloautomation){ .md-button }
\ No newline at end of file
diff --git a/docs/products/h2/troubleshooting/boot-mode.md b/docs/products/h2/troubleshooting/boot-mode.md
new file mode 100755
index 000000000..f5c52f8c9
--- /dev/null
+++ b/docs/products/h2/troubleshooting/boot-mode.md
@@ -0,0 +1,39 @@
+---
+title: Putting The H-2 In Boot Mode
+description: Step by step guide for putting The H-2 In Boot Mode.
+---
+!!! info "This will cover how to put the H-2 into boot mode."
+
+ This is needed to force the device into boot mode to reflash the firmware.
+
+## **Boot Button Only**
+
+!!! tip "Make sure that the battery is removed prior to putting it in boot mode"
+
+ Make sure that there is no battery in the device - the battery will prevent it from entering boot mode.
+
+1\. Disconnect your H-2 from power. With the device facing you, locate the boot button—it’s the small black button on the right.
+
+2\. Plug in a USB cable that supports power and data into your computer.
+
+3\. Push and hold the boot button (the right button). While still holding the button down, plug in a USB-C cable into the USB-C port of your H-2 then let go of the button.
+
+
+
+4\. You are now ready to reflash your device!
+
+[Click here to go to the reflashing guide!](https://wiki.apolloautomation.com/products/h2/reflash/){ .md-button .md-button--primary }
+
+## **Boot and Reset Buttons**
+
+1\. Plug in a USB cable that supports power and data into your computer and connect the other end to your H-2. With the device facing you, locate the reset (left) and boot (right) buttons.
+
+
+
+2\. Hold down the boot button (the right button), then press and release the reset button (the left button) while keeping the boot button pressed. Finally, release the boot button.
+
+
+
+3\. You are now ready to reflash your device!
+
+[Click here to go to the reflashing guide!](https://wiki.apolloautomation.com/products/h2/reflash/){ .md-button .md-button--primary }
\ No newline at end of file
diff --git a/docs/products/h2/troubleshooting/h2-boot-mode.md b/docs/products/h2/troubleshooting/h2-boot-mode.md
deleted file mode 100755
index 3a76efa81..000000000
--- a/docs/products/h2/troubleshooting/h2-boot-mode.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-title: Putting The H-1 In Boot Mode
-description: Step by step guide for putting The H-1 In Boot Mode.
----
-This will cover how to put the H-1 into boot mode. Sometimes, this is needed to upload new firmware if the device is struggling.
-
-
-
-## **Boot Button Only**
-
-1\. Make sure the device is not powered and see the photo above to help find the boot button
-
-2\. Press and hold the boot button, while holding the boot button plug the H-1 back into your computer/power and then release the boot button
-
-3\. Continue with [uploading the firmware](https://wiki.apolloautomation.com/products/h1/code/)
-
-## **Boot and Reset Buttons**
-
-1\. Plug in the device
-
-2\. Press and hold the boot button, while holding it press and release the reset button, then release the boot button
-
-3\. Continue with [uploading the firmware](https://wiki.apolloautomation.com/products/h1/code/)
\ No newline at end of file
diff --git a/docs/products/h2/troubleshooting/h2-reflash.md b/docs/products/h2/troubleshooting/h2-reflash.md
deleted file mode 100755
index 48c6be020..000000000
--- a/docs/products/h2/troubleshooting/h2-reflash.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-title: Factory Re-Flash H-1
-description: Step by step guide for re-flashing the H-1 back to factory firmware.
----
-If your device becomes unresponsive and you've exhausted the other troubleshooting methods you can upload a fresh set of firmware by following the below guide. The utility does need to be run from Chrome or Edge.
-
-If your device has already been connected to Home Assistant previously please refer to Removing Device From Home Assistant first before proceeding
-
-1. Hold the boot button then plug your sensor into your computer with a quality USB-C cable that supports data transfer. Let go of the boot button once you plug the usb cable in!
-2. Navigate to our installer page and click connect [\*\* Install Page \*\*](https://apolloautomation.github.io/H-1/)
-3. Select your Apollo device, it will show with a similar name to the one below, and click connect. If you aren't sure which device it is, you can unplug the sensor and see which disappears.
-
-[](https://apolloautomation.github.io/docs/products/mtr1/assets/comselection.png)
-
-If no device shows, click cancel and then install the recommended driver that shows on the popup. If you have installed the driver, tried different cables, and it still won't work refer [here](https://wiki.apolloautomation.com/products/h1/boot-mode/) for putting the sensor in bootloader mode and then retry step 3.
-
-4\. Choose to install the new firmware
-
-[](https://apolloautomation.github.io/docs/products/mtr1/assets/image-1698806750134.png)
-
-5\. Wait for the installer to finish - if you see "ERROR Logger is not configured!" that is totally expected! The logger is disabled to make more room for other components on the microcontroller.
-
-[](https://apolloautomation.github.io/docs/products/mtr1/assets/image-1698806082666.png)
-
-6\. VERY IMPORTANT - you need to unplug your device and plug it back in to leave boot mode!
-
-1. After finishing, check for the Apollo hotspot and connect. This might not show if you previously had the MTR-1 connected to your wifi
-2. Log into Home Assistant and go to the ESPHome addon check to see if you can adopt the device.
-
-If you encounter the below error, please complete the [Putting H-1 In Boot Mode Document](https://wiki.apolloautomation.com/products/h1/boot-mode/) and go back to step 3.
-
-[](https://apolloautomation.github.io/docs/products/mtr1/assets/image-1698806793309.png)
\ No newline at end of file
diff --git a/docs/products/h2/troubleshooting/reflash.md b/docs/products/h2/troubleshooting/reflash.md
new file mode 100755
index 000000000..e4001f3b6
--- /dev/null
+++ b/docs/products/h2/troubleshooting/reflash.md
@@ -0,0 +1,35 @@
+---
+title: Factory Re-Flash H-2
+description: Step by step guide for re-flashing the H-2 back to factory firmware.
+---
+# Reflashing The H-2
+
+!!! info "If your device becomes unresponsive and you've exhausted the other troubleshooting methods you can reflash the factory firmware by following the steps below."
+
+ This factory re-flash needs to be done in Chrome, Edge, or another Chromium based browser.
+
+1\. Disconnect your H-2 from power. With the device facing you, locate the boot button - it’s the small black button on the right.
+
+2\. Plug in a USB cable that supports power and data into your computer.
+
+3\. Push and hold the boot button (the right button). While still holding the button down, plug in a USB-C cable into the USB-C port of your H-2 then let go of the button.
+
+
+
+4\. Navigate to our installer page using a chromium based browser such as Chrome or Edge and click **connect** under **H-2 Smart Wi-Fi Firmware** or **H-2 No Wi-Fi Firmware**. Select the open com port and click **connect**.
+
+
+
+5\. Click Install **H-2** then click **Install** again.
+
+
+
+6\. Once you see "Installation complete!" you are finished. Click Next then close out of the browser window.
+
+
+
+!!! warning "Power cycle your device before doing anything else!"
+
+ Your device is still in boot mode and needs to be power cycled aka power removed to make it boot in a normal mode!
+
+[Head to the Getting Started article to setup your H-2 as a new device!](https://wiki.apolloautomation.com/products/h-2/setup/getting-started/){ .md-button .md-button--primary }
\ No newline at end of file
diff --git a/mkdocs.yml b/mkdocs.yml
index 1d8e1cfeb..fc03c2831 100755
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -444,13 +444,13 @@ nav:
- H-2:
- Introduction: products/h2/introduction.md
- FAQ: products/h2/faq.md
- - Getting Started: products/h2/getting-started.md
- - Reviews: products/h2/reviews.md
+ - Getting Started: products/h2/setup/getting-started.md
+ - Reviews: products/h2/h2-reviews.md
- Examples:
- Holiday Songs: products/h2/holiday-songs.md
- Troubleshooting:
- - H-1 Boot Mode: products/h2/troubleshooting/h2-boot-mode.md
- - Factory Re-Flash H-1: products/h2/troubleshooting/h2-reflash.md
+ - H-2 Boot Mode: products/h2/troubleshooting/boot-mode.md
+ - Factory Re-Flash H-2: products/h2/troubleshooting/reflash.md
- Apollo ODroid:
- Introduction: products/apolloodroid/introduction.md
- FAQ: products/apolloodroid/faq.md