mirror of https://github.com/sqfmi/Watchy.git
Merge 2aebb46823
into 342eb48a49
commit
db5ef63f14
|
@ -144,6 +144,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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -156,6 +157,7 @@ void Watchy::handleButtonPress() {
|
||||||
}
|
}
|
||||||
showMenu(menuIndex, true);
|
showMenu(menuIndex, true);
|
||||||
} else if (guiState == WATCHFACE_STATE) {
|
} else if (guiState == WATCHFACE_STATE) {
|
||||||
|
button2();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -168,6 +170,7 @@ void Watchy::handleButtonPress() {
|
||||||
}
|
}
|
||||||
showMenu(menuIndex, true);
|
showMenu(menuIndex, true);
|
||||||
} else if (guiState == WATCHFACE_STATE) {
|
} else if (guiState == WATCHFACE_STATE) {
|
||||||
|
button3();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -625,6 +628,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.weatherUnit,
|
return getWeatherData(settings.cityID, settings.weatherUnit,
|
||||||
settings.weatherLang, settings.weatherURL,
|
settings.weatherLang, settings.weatherURL,
|
||||||
|
|
|
@ -77,6 +77,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