mirror of https://github.com/sqfmi/Watchy.git
Merge 2aebb46823
into 9f3accdb07
commit
fe183fb731
|
@ -180,6 +180,7 @@ void Watchy::handleButtonPress() {
|
||||||
} else if (guiState == FW_UPDATE_STATE) {
|
} else if (guiState == FW_UPDATE_STATE) {
|
||||||
showMenu(menuIndex, false); // exit to menu if already in app
|
showMenu(menuIndex, false); // exit to menu if already in app
|
||||||
} else if (guiState == WATCHFACE_STATE) {
|
} else if (guiState == WATCHFACE_STATE) {
|
||||||
|
button1();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -192,6 +193,7 @@ void Watchy::handleButtonPress() {
|
||||||
}
|
}
|
||||||
showMenu(menuIndex, true);
|
showMenu(menuIndex, true);
|
||||||
} else if (guiState == WATCHFACE_STATE) {
|
} else if (guiState == WATCHFACE_STATE) {
|
||||||
|
button2();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -204,6 +206,7 @@ void Watchy::handleButtonPress() {
|
||||||
}
|
}
|
||||||
showMenu(menuIndex, true);
|
showMenu(menuIndex, true);
|
||||||
} else if (guiState == WATCHFACE_STATE) {
|
} else if (guiState == WATCHFACE_STATE) {
|
||||||
|
button3();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -685,6 +688,17 @@ void Watchy::drawWatchFace() {
|
||||||
display.println(currentTime.Minute);
|
display.println(currentTime.Minute);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Watchy::button1()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
void Watchy::button2()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
void Watchy::button3()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
weatherData Watchy::getWeatherData() {
|
weatherData Watchy::getWeatherData() {
|
||||||
return _getWeatherData(settings.cityID, settings.lat, settings.lon,
|
return _getWeatherData(settings.cityID, settings.lat, settings.lon,
|
||||||
settings.weatherUnit, settings.weatherLang, settings.weatherURL,
|
settings.weatherUnit, settings.weatherLang, settings.weatherURL,
|
||||||
|
|
|
@ -101,6 +101,9 @@ public:
|
||||||
void showWatchFace(bool partialRefresh);
|
void showWatchFace(bool partialRefresh);
|
||||||
virtual void drawWatchFace(); // override this method for different watch
|
virtual void drawWatchFace(); // override this method for different watch
|
||||||
// faces
|
// faces
|
||||||
|
virtual void button1(); // override these methods to handle different non-menu button presses
|
||||||
|
virtual void button2();
|
||||||
|
virtual void button3();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void _bmaConfig();
|
void _bmaConfig();
|
||||||
|
|
Loading…
Reference in New Issue