diff --git a/examples/WatchFaces/Tetris/Watchy_Tetris.cpp b/examples/WatchFaces/Tetris/Watchy_Tetris.cpp index 91feb75..7f0dd44 100644 --- a/examples/WatchFaces/Tetris/Watchy_Tetris.cpp +++ b/examples/WatchFaces/Tetris/Watchy_Tetris.cpp @@ -2,8 +2,6 @@ const unsigned char *tetris_nums [10] = {tetris0, tetris1, tetris2, tetris3, tetris4, tetris5, tetris6, tetris7, tetris8, tetris9}; -WatchyTetris::WatchyTetris(){} //constructor - void WatchyTetris::drawWatchFace(){ display.fillScreen(GxEPD_WHITE); display.drawBitmap(0, 0, tetrisbg, DISPLAY_WIDTH, DISPLAY_HEIGHT, GxEPD_BLACK); diff --git a/examples/WatchFaces/Tetris/Watchy_Tetris.h b/examples/WatchFaces/Tetris/Watchy_Tetris.h index ba05f83..94210e9 100644 --- a/examples/WatchFaces/Tetris/Watchy_Tetris.h +++ b/examples/WatchFaces/Tetris/Watchy_Tetris.h @@ -5,9 +5,8 @@ #include "tetris.h" class WatchyTetris : public Watchy{ - using Watchy::Watchy; public: - WatchyTetris(); + using Watchy::Watchy; void drawWatchFace(); }; diff --git a/src/WatchyRTC.cpp b/src/WatchyRTC.cpp index 4a65bc5..3542b3a 100644 --- a/src/WatchyRTC.cpp +++ b/src/WatchyRTC.cpp @@ -30,7 +30,7 @@ void WatchyRTC::config(String datetime){ //String datetime format is YYYY:MM:DD: void WatchyRTC::clearAlarm(){ if(rtcType == DS3231){ - rtc_ds.alarm(ALARM_2); + rtc_ds.alarm(DS3232RTC::ALARM_2); }else{ int nextAlarmMinute = 0; rtc_pcf.clearAlarm(); //resets the alarm flag in the RTC @@ -90,9 +90,9 @@ void WatchyRTC::_DSConfig(String datetime){ //String datetime is YYYY:MM:DD:HH:M rtc_ds.set(t); } //https://github.com/JChristensen/DS3232RTC - rtc_ds.squareWave(SQWAVE_NONE); //disable square wave output - rtc_ds.setAlarm(ALM2_EVERY_MINUTE, 0, 0, 0, 0); //alarm wakes up Watchy every minute - rtc_ds.alarmInterrupt(ALARM_2, true); //enable alarm interrupt + rtc_ds.squareWave(DS3232RTC::SQWAVE_NONE); //disable square wave output + rtc_ds.setAlarm(DS3232RTC::ALM2_EVERY_MINUTE, 0, 0, 0, 0); //alarm wakes up Watchy every minute + rtc_ds.alarmInterrupt(DS3232RTC::ALARM_2, true); //enable alarm interrupt } void WatchyRTC::_PCFConfig(String datetime){ //String datetime is YYYY:MM:DD:HH:MM:SS