mirror of https://github.com/sqfmi/Watchy.git
Merge pull request #189 from shtrom/feature/vibrate-o-clock
Vibrate every hour on the dotpull/190/head
commit
c5344d9d42
|
@ -13,14 +13,15 @@
|
|||
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT
|
||||
|
||||
watchySettings settings{
|
||||
CITY_ID,
|
||||
OPENWEATHERMAP_APIKEY,
|
||||
OPENWEATHERMAP_URL,
|
||||
TEMP_UNIT,
|
||||
TEMP_LANG,
|
||||
WEATHER_UPDATE_INTERVAL,
|
||||
NTP_SERVER,
|
||||
GMT_OFFSET_SEC
|
||||
.cityID = CITY_ID,
|
||||
.weatherAPIKey = OPENWEATHERMAP_APIKEY,
|
||||
.weatherURL = OPENWEATHERMAP_URL,
|
||||
.weatherUnit = TEMP_UNIT,
|
||||
.weatherLang = TEMP_LANG,
|
||||
.weatherUpdateInterval = WEATHER_UPDATE_INTERVAL,
|
||||
.ntpServer = NTP_SERVER,
|
||||
.gmtOffset = GMT_OFFSET_SEC,
|
||||
.vibrateOClock = true,
|
||||
};
|
||||
|
||||
#endif
|
|
@ -13,14 +13,14 @@
|
|||
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT
|
||||
|
||||
watchySettings settings{
|
||||
CITY_ID,
|
||||
OPENWEATHERMAP_APIKEY,
|
||||
OPENWEATHERMAP_URL,
|
||||
TEMP_UNIT,
|
||||
TEMP_LANG,
|
||||
WEATHER_UPDATE_INTERVAL,
|
||||
NTP_SERVER,
|
||||
GMT_OFFSET_SEC
|
||||
.cityID = CITY_ID,
|
||||
.weatherAPIKey = OPENWEATHERMAP_APIKEY,
|
||||
.weatherURL = OPENWEATHERMAP_URL,
|
||||
.weatherUnit = TEMP_UNIT,
|
||||
.weatherLang = TEMP_LANG,
|
||||
.weatherUpdateInterval = WEATHER_UPDATE_INTERVAL,
|
||||
.ntpServer = NTP_SERVER,
|
||||
.gmtOffset = GMT_OFFSET_SEC,
|
||||
};
|
||||
|
||||
#endif
|
|
@ -13,14 +13,14 @@
|
|||
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT
|
||||
|
||||
watchySettings settings{
|
||||
CITY_ID,
|
||||
OPENWEATHERMAP_APIKEY,
|
||||
OPENWEATHERMAP_URL,
|
||||
TEMP_UNIT,
|
||||
TEMP_LANG,
|
||||
WEATHER_UPDATE_INTERVAL,
|
||||
NTP_SERVER,
|
||||
GMT_OFFSET_SEC
|
||||
.cityID = CITY_ID,
|
||||
.weatherAPIKey = OPENWEATHERMAP_APIKEY,
|
||||
.weatherURL = OPENWEATHERMAP_URL,
|
||||
.weatherUnit = TEMP_UNIT,
|
||||
.weatherLang = TEMP_LANG,
|
||||
.weatherUpdateInterval = WEATHER_UPDATE_INTERVAL,
|
||||
.ntpServer = NTP_SERVER,
|
||||
.gmtOffset = GMT_OFFSET_SEC,
|
||||
};
|
||||
|
||||
#endif
|
|
@ -13,14 +13,14 @@
|
|||
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT
|
||||
|
||||
watchySettings settings{
|
||||
CITY_ID,
|
||||
OPENWEATHERMAP_APIKEY,
|
||||
OPENWEATHERMAP_URL,
|
||||
TEMP_UNIT,
|
||||
TEMP_LANG,
|
||||
WEATHER_UPDATE_INTERVAL,
|
||||
NTP_SERVER,
|
||||
GMT_OFFSET_SEC
|
||||
.cityID = CITY_ID,
|
||||
.weatherAPIKey = OPENWEATHERMAP_APIKEY,
|
||||
.weatherURL = OPENWEATHERMAP_URL,
|
||||
.weatherUnit = TEMP_UNIT,
|
||||
.weatherLang = TEMP_LANG,
|
||||
.weatherUpdateInterval = WEATHER_UPDATE_INTERVAL,
|
||||
.ntpServer = NTP_SERVER,
|
||||
.gmtOffset = GMT_OFFSET_SEC,
|
||||
};
|
||||
|
||||
#endif
|
|
@ -13,14 +13,14 @@
|
|||
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT
|
||||
|
||||
watchySettings settings{
|
||||
CITY_ID,
|
||||
OPENWEATHERMAP_APIKEY,
|
||||
OPENWEATHERMAP_URL,
|
||||
TEMP_UNIT,
|
||||
TEMP_LANG,
|
||||
WEATHER_UPDATE_INTERVAL,
|
||||
NTP_SERVER,
|
||||
GMT_OFFSET_SEC
|
||||
.cityID = CITY_ID,
|
||||
.weatherAPIKey = OPENWEATHERMAP_APIKEY,
|
||||
.weatherURL = OPENWEATHERMAP_URL,
|
||||
.weatherUnit = TEMP_UNIT,
|
||||
.weatherLang = TEMP_LANG,
|
||||
.weatherUpdateInterval = WEATHER_UPDATE_INTERVAL,
|
||||
.ntpServer = NTP_SERVER,
|
||||
.gmtOffset = GMT_OFFSET_SEC,
|
||||
};
|
||||
|
||||
#endif
|
|
@ -13,14 +13,14 @@
|
|||
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT
|
||||
|
||||
watchySettings settings{
|
||||
CITY_ID,
|
||||
OPENWEATHERMAP_APIKEY,
|
||||
OPENWEATHERMAP_URL,
|
||||
TEMP_UNIT,
|
||||
TEMP_LANG,
|
||||
WEATHER_UPDATE_INTERVAL,
|
||||
NTP_SERVER,
|
||||
GMT_OFFSET_SEC
|
||||
.cityID = CITY_ID,
|
||||
.weatherAPIKey = OPENWEATHERMAP_APIKEY,
|
||||
.weatherURL = OPENWEATHERMAP_URL,
|
||||
.weatherUnit = TEMP_UNIT,
|
||||
.weatherLang = TEMP_LANG,
|
||||
.weatherUpdateInterval = WEATHER_UPDATE_INTERVAL,
|
||||
.ntpServer = NTP_SERVER,
|
||||
.gmtOffset = GMT_OFFSET_SEC,
|
||||
};
|
||||
|
||||
#endif
|
|
@ -13,14 +13,14 @@
|
|||
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT
|
||||
|
||||
watchySettings settings{
|
||||
CITY_ID,
|
||||
OPENWEATHERMAP_APIKEY,
|
||||
OPENWEATHERMAP_URL,
|
||||
TEMP_UNIT,
|
||||
TEMP_LANG,
|
||||
WEATHER_UPDATE_INTERVAL,
|
||||
NTP_SERVER,
|
||||
GMT_OFFSET_SEC
|
||||
.cityID = CITY_ID,
|
||||
.weatherAPIKey = OPENWEATHERMAP_APIKEY,
|
||||
.weatherURL = OPENWEATHERMAP_URL,
|
||||
.weatherUnit = TEMP_UNIT,
|
||||
.weatherLang = TEMP_LANG,
|
||||
.weatherUpdateInterval = WEATHER_UPDATE_INTERVAL,
|
||||
.ntpServer = NTP_SERVER,
|
||||
.gmtOffset = GMT_OFFSET_SEC,
|
||||
};
|
||||
|
||||
#endif
|
|
@ -30,6 +30,12 @@ void Watchy::init(String datetime) {
|
|||
if (guiState == WATCHFACE_STATE) {
|
||||
RTC.read(currentTime);
|
||||
showWatchFace(true); // partial updates on tick
|
||||
if (settings.vibrateOClock) {
|
||||
if (currentTime.Minute == 0) {
|
||||
// The RTC wakes us up once per minute
|
||||
vibMotor(75, 4);
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
case ESP_SLEEP_WAKEUP_EXT1: // button Press
|
||||
|
@ -40,6 +46,7 @@ void Watchy::init(String datetime) {
|
|||
_bmaConfig();
|
||||
RTC.read(currentTime);
|
||||
showWatchFace(false); // full update on reset
|
||||
vibMotor(75, 4);
|
||||
break;
|
||||
}
|
||||
deepSleep();
|
||||
|
|
|
@ -35,6 +35,8 @@ typedef struct watchySettings {
|
|||
String ntpServer;
|
||||
int gmtOffset;
|
||||
int dstOffset;
|
||||
//
|
||||
bool vibrateOClock;
|
||||
} watchySettings;
|
||||
|
||||
class Watchy {
|
||||
|
|
Loading…
Reference in New Issue