scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Removed unused variables. Tested.

Browse source
This commit is contained in:
panky-codes 2021-03-15 21:35:36 +01:00
parent bc6d447a5f
commit abc30028a2
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/displayapp/DisplayApp.cpp
View file

@ -205,7 +205,7 @@ void DisplayApp::RunningState() {
case Apps::Twos: currentScreen.reset(new Screens::Twos(this)); break;
case Apps::Paint: currentScreen.reset(new Screens::InfiniPaint(this, lvgl)); break;
//TODO: Change it back
case Apps::StopWatch: currentScreen.reset(new Screens::StopWatch(this, dateTimeController)); break;
case Apps::StopWatch: currentScreen.reset(new Screens::StopWatch(this)); break;
case Apps::Brightness : currentScreen.reset(new Screens::Brightness(this, brightnessController)); break;
case Apps::Music : currentScreen.reset(new Screens::Music(this, systemTask.nimble().music())); break;
case Apps::Navigation : currentScreen.reset(new Screens::Navigation(this, systemTask.nimble().navigation())); break;

10
src/displayapp/screens/StopWatch.cpp
View file

@ -36,18 +36,18 @@ namespace {
}
static void play_pause_event_handler(lv_obj_t* obj, lv_event_t event) {
StopWatch* stopWatch = static_cast<StopWatch*>(obj->user_data);
auto stopWatch = static_cast<StopWatch*>(obj->user_data);
stopWatch->playPauseBtnEventHandler(event);
}
static void stop_lap_event_handler(lv_obj_t* obj, lv_event_t event) {
StopWatch* stopWatch = static_cast<StopWatch*>(obj->user_data);
auto stopWatch = static_cast<StopWatch*>(obj->user_data);
stopWatch->stopLapBtnEventHandler(event);
}
StopWatch::StopWatch(DisplayApp* app, const Pinetime::Controllers::DateTime& dateTime)
: Screen(app), dateTime {dateTime}, running {true}, currentState {States::INIT}, currentEvent {Events::STOP}, startTime {},
oldTimeElapsed {}, currentTimeSeparated {}, lapBuffer {}, lapNr {}, lapPressed {false} {
StopWatch::StopWatch(DisplayApp* app)
: Screen(app), running {true}, currentState {States::INIT}, currentEvent {Events::STOP}, startTime {}, oldTimeElapsed {},
currentTimeSeparated {}, lapBuffer {}, lapNr {}, lapPressed {false} {
time = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_font(time, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_extrabold_compressed);

5
src/displayapp/screens/StopWatch.h
View file

@ -63,7 +63,7 @@ namespace Pinetime::Applications::Screens {
class StopWatch : public Screen {
public:
StopWatch(DisplayApp* app, const Pinetime::Controllers::DateTime& dateTime);
StopWatch(DisplayApp* app);
~StopWatch() override;
bool Refresh() override;
bool OnButtonPushed() override;
@ -71,7 +71,6 @@ namespace Pinetime::Applications::Screens {
void stopLapBtnEventHandler(lv_event_t event);
private:
const Pinetime::Controllers::DateTime& dateTime;
bool running;
States currentState;
Events currentEvent;
@ -84,4 +83,4 @@ namespace Pinetime::Applications::Screens {
lv_obj_t *time, *msecTime, *btnPlayPause, *btnStopLap, *txtPlayPause, *txtStopLap;
lv_obj_t *lapOneText, *lapTwoText;
};
}
}