Merge pull request #189 from shtrom/feature/vibrate-o-clock

Vibrate every hour on the dot
pull/190/head
SQFMI 2022-11-13 04:18:05 -05:00 committed by GitHub
commit c5344d9d42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 66 additions and 56 deletions

View File

@ -13,14 +13,15 @@
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT #define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT
watchySettings settings{ watchySettings settings{
CITY_ID, .cityID = CITY_ID,
OPENWEATHERMAP_APIKEY, .weatherAPIKey = OPENWEATHERMAP_APIKEY,
OPENWEATHERMAP_URL, .weatherURL = OPENWEATHERMAP_URL,
TEMP_UNIT, .weatherUnit = TEMP_UNIT,
TEMP_LANG, .weatherLang = TEMP_LANG,
WEATHER_UPDATE_INTERVAL, .weatherUpdateInterval = WEATHER_UPDATE_INTERVAL,
NTP_SERVER, .ntpServer = NTP_SERVER,
GMT_OFFSET_SEC .gmtOffset = GMT_OFFSET_SEC,
.vibrateOClock = true,
}; };
#endif #endif

View File

@ -13,14 +13,14 @@
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT #define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT
watchySettings settings{ watchySettings settings{
CITY_ID, .cityID = CITY_ID,
OPENWEATHERMAP_APIKEY, .weatherAPIKey = OPENWEATHERMAP_APIKEY,
OPENWEATHERMAP_URL, .weatherURL = OPENWEATHERMAP_URL,
TEMP_UNIT, .weatherUnit = TEMP_UNIT,
TEMP_LANG, .weatherLang = TEMP_LANG,
WEATHER_UPDATE_INTERVAL, .weatherUpdateInterval = WEATHER_UPDATE_INTERVAL,
NTP_SERVER, .ntpServer = NTP_SERVER,
GMT_OFFSET_SEC .gmtOffset = GMT_OFFSET_SEC,
}; };
#endif #endif

View File

@ -13,14 +13,14 @@
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT #define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT
watchySettings settings{ watchySettings settings{
CITY_ID, .cityID = CITY_ID,
OPENWEATHERMAP_APIKEY, .weatherAPIKey = OPENWEATHERMAP_APIKEY,
OPENWEATHERMAP_URL, .weatherURL = OPENWEATHERMAP_URL,
TEMP_UNIT, .weatherUnit = TEMP_UNIT,
TEMP_LANG, .weatherLang = TEMP_LANG,
WEATHER_UPDATE_INTERVAL, .weatherUpdateInterval = WEATHER_UPDATE_INTERVAL,
NTP_SERVER, .ntpServer = NTP_SERVER,
GMT_OFFSET_SEC .gmtOffset = GMT_OFFSET_SEC,
}; };
#endif #endif

View File

@ -13,14 +13,14 @@
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT #define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT
watchySettings settings{ watchySettings settings{
CITY_ID, .cityID = CITY_ID,
OPENWEATHERMAP_APIKEY, .weatherAPIKey = OPENWEATHERMAP_APIKEY,
OPENWEATHERMAP_URL, .weatherURL = OPENWEATHERMAP_URL,
TEMP_UNIT, .weatherUnit = TEMP_UNIT,
TEMP_LANG, .weatherLang = TEMP_LANG,
WEATHER_UPDATE_INTERVAL, .weatherUpdateInterval = WEATHER_UPDATE_INTERVAL,
NTP_SERVER, .ntpServer = NTP_SERVER,
GMT_OFFSET_SEC .gmtOffset = GMT_OFFSET_SEC,
}; };
#endif #endif

View File

@ -13,14 +13,14 @@
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT #define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT
watchySettings settings{ watchySettings settings{
CITY_ID, .cityID = CITY_ID,
OPENWEATHERMAP_APIKEY, .weatherAPIKey = OPENWEATHERMAP_APIKEY,
OPENWEATHERMAP_URL, .weatherURL = OPENWEATHERMAP_URL,
TEMP_UNIT, .weatherUnit = TEMP_UNIT,
TEMP_LANG, .weatherLang = TEMP_LANG,
WEATHER_UPDATE_INTERVAL, .weatherUpdateInterval = WEATHER_UPDATE_INTERVAL,
NTP_SERVER, .ntpServer = NTP_SERVER,
GMT_OFFSET_SEC .gmtOffset = GMT_OFFSET_SEC,
}; };
#endif #endif

View File

@ -13,14 +13,14 @@
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT #define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT
watchySettings settings{ watchySettings settings{
CITY_ID, .cityID = CITY_ID,
OPENWEATHERMAP_APIKEY, .weatherAPIKey = OPENWEATHERMAP_APIKEY,
OPENWEATHERMAP_URL, .weatherURL = OPENWEATHERMAP_URL,
TEMP_UNIT, .weatherUnit = TEMP_UNIT,
TEMP_LANG, .weatherLang = TEMP_LANG,
WEATHER_UPDATE_INTERVAL, .weatherUpdateInterval = WEATHER_UPDATE_INTERVAL,
NTP_SERVER, .ntpServer = NTP_SERVER,
GMT_OFFSET_SEC .gmtOffset = GMT_OFFSET_SEC,
}; };
#endif #endif

View File

@ -13,14 +13,14 @@
#define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT #define GMT_OFFSET_SEC 3600 * -5 //New York is UTC -5 EST, -4 EDT
watchySettings settings{ watchySettings settings{
CITY_ID, .cityID = CITY_ID,
OPENWEATHERMAP_APIKEY, .weatherAPIKey = OPENWEATHERMAP_APIKEY,
OPENWEATHERMAP_URL, .weatherURL = OPENWEATHERMAP_URL,
TEMP_UNIT, .weatherUnit = TEMP_UNIT,
TEMP_LANG, .weatherLang = TEMP_LANG,
WEATHER_UPDATE_INTERVAL, .weatherUpdateInterval = WEATHER_UPDATE_INTERVAL,
NTP_SERVER, .ntpServer = NTP_SERVER,
GMT_OFFSET_SEC .gmtOffset = GMT_OFFSET_SEC,
}; };
#endif #endif

View File

@ -30,6 +30,12 @@ void Watchy::init(String datetime) {
if (guiState == WATCHFACE_STATE) { if (guiState == WATCHFACE_STATE) {
RTC.read(currentTime); RTC.read(currentTime);
showWatchFace(true); // partial updates on tick 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; break;
case ESP_SLEEP_WAKEUP_EXT1: // button Press case ESP_SLEEP_WAKEUP_EXT1: // button Press
@ -40,6 +46,7 @@ void Watchy::init(String datetime) {
_bmaConfig(); _bmaConfig();
RTC.read(currentTime); RTC.read(currentTime);
showWatchFace(false); // full update on reset showWatchFace(false); // full update on reset
vibMotor(75, 4);
break; break;
} }
deepSleep(); deepSleep();

View File

@ -35,6 +35,8 @@ typedef struct watchySettings {
String ntpServer; String ntpServer;
int gmtOffset; int gmtOffset;
int dstOffset; int dstOffset;
//
bool vibrateOClock;
} watchySettings; } watchySettings;
class Watchy { class Watchy {