Merge 2aebb46823 into 9f3accdb07

library.json

@@ -30,7 +30,7 @@
     },
     {
       "name": "WiFiManager",
-      "version": "https://github.com/tzapu/WiFiManager.git#2.0.3-alpha"
+      "version": "https://github.com/tzapu/WiFiManager.git#master"
     }
   ]
 }

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();