Merge 2aebb46823 into e5fce3b38b

README.md

@@ -2,29 +2,15 @@
 
 ![Watchy](https://watchy.sqfmi.com/img/watchy_render.png)
 
-**Buy Watchy from [The Pi Hut](https://thepihut.com/collections/sqfmi), [Crowd Supply](https://www.crowdsupply.com/sqfmi/watchy), and [Mouser](https://www.mouser.com/ProductDetail/SQFMI/SQFMI-WATCHY-10?qs=DRkmTr78QARN9VSJRzqRxw%3D%3D)!**
+**Buy Watchy from [Mouser](https://www.mouser.com/ProductDetail/SQFMI/SQFMI-WATCHY-10?qs=DRkmTr78QARN9VSJRzqRxw%3D%3D), [The Pi Hut](https://thepihut.com/collections/sqfmi), and [Crowd Supply](https://www.crowdsupply.com/sqfmi/watchy)**
 
 [**Watchy Case & Accessories**](https://shop.sqfmi.com)
 
-Visit [**https://watchy.sqfmi.com**](https://watchy.sqfmi.com) for documentation, hardware design files, and more!
-
-## Setup
-1. In the Arduino IDE Boards Manager, [install support for the ESP32](https://docs.espressif.com/projects/arduino-esp32/en/latest/installing.html).
-    * Arduino > Preferences > Additional Board Manager URLs
-    * ```https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json```
-2. Install this library (search for **Watchy** in the library manager), and any other dependencies when prompted
-3. Check out the examples under ```Examples``` -> ```Watchy```
-4. Compile & Upload with these board settings:
-    * Board: "Watchy"
-    * Partition Scheme: "Huge App"
-    * Board Revision: Choose your Watchy version
-    * All Other Settings: leave to default
-
-You may also have to install the [CP2104 USB to Serial drivers](https://www.silabs.com/products/development-tools/software/usb-to-uart-bridge-vcp-drivers) if the port is not automatically detected.
+## Getting Started Guide
+Follow the instructions here https://watchy.sqfmi.com/docs/getting-started
 
 ### Have Fun! :)
 
-
 ### Got Questions?
 
 Join our [Discord](https://discord.gg/ZXDegGV8E7)

src/Watchy.cpp

@@ -180,6 +180,7 @@ void Watchy::handleButtonPress() {
     } else if (guiState == FW_UPDATE_STATE) {
       showMenu(menuIndex, false); // exit to menu if already in app
     } else if (guiState == WATCHFACE_STATE) {
+      button1();
       return;
     }
   }
@@ -192,6 +193,7 @@ void Watchy::handleButtonPress() {
       }
       showMenu(menuIndex, true);
     } else if (guiState == WATCHFACE_STATE) {
+      button2();
       return;
     }
   }
@@ -204,6 +206,7 @@ void Watchy::handleButtonPress() {
       }
       showMenu(menuIndex, true);
     } else if (guiState == WATCHFACE_STATE) {
+      button3();
       return;
     }
   }
@@ -685,6 +688,17 @@ void Watchy::drawWatchFace() {
   display.println(currentTime.Minute);
 }
 
+void Watchy::button1()
+{
+}
+void Watchy::button2()
+{
+}
+void Watchy::button3()
+{
+}
+
+
 weatherData Watchy::getWeatherData() {
   return _getWeatherData(settings.cityID, settings.lat, settings.lon,
     settings.weatherUnit, settings.weatherLang, settings.weatherURL,

src/Watchy.h

@@ -101,6 +101,9 @@ public:
   void showWatchFace(bool partialRefresh);
   virtual void drawWatchFace(); // override this method for different watch
                                 // faces
+  virtual void button1(); // override these methods to handle different non-menu button presses
+  virtual void button2();
+  virtual void button3();
 
 private:
   void _bmaConfig();