summaryrefslogtreecommitdiff
path: root/src/displayapp/screens
diff options
context:
space:
mode:
Diffstat (limited to 'src/displayapp/screens')
-rw-r--r--src/displayapp/screens/Paddle.cpp4
-rw-r--r--src/displayapp/screens/Screen.h4
-rw-r--r--src/displayapp/screens/settings/SettingBluetooth.cpp8
-rw-r--r--src/displayapp/screens/settings/SettingBluetooth.h4
-rw-r--r--src/displayapp/screens/settings/SettingSetDate.cpp1
-rw-r--r--src/displayapp/screens/settings/SettingSetTime.cpp1
6 files changed, 10 insertions, 12 deletions
diff --git a/src/displayapp/screens/Paddle.cpp b/src/displayapp/screens/Paddle.cpp
index 1fb25085..dc973957 100644
--- a/src/displayapp/screens/Paddle.cpp
+++ b/src/displayapp/screens/Paddle.cpp
@@ -79,11 +79,11 @@ void Paddle::Refresh() {
lv_label_set_text_fmt(points, "%04d", score);
}
-bool Paddle::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
+bool Paddle::OnTouchEvent(Pinetime::Applications::TouchEvents /*event*/) {
return true;
}
-bool Paddle::OnTouchEvent(uint16_t x, uint16_t y) {
+bool Paddle::OnTouchEvent(uint16_t /*x*/, uint16_t y) {
// sets the center paddle pos. (30px offset) with the the y_coordinate of the finger
// but clamp it such that the paddle never clips off screen
if (y < 31) {
diff --git a/src/displayapp/screens/Screen.h b/src/displayapp/screens/Screen.h
index a2452da5..4cf134d2 100644
--- a/src/displayapp/screens/Screen.h
+++ b/src/displayapp/screens/Screen.h
@@ -67,11 +67,11 @@ namespace Pinetime {
/** @return false if the event hasn't been handled by the app, true if it has been handled */
// Returning true will cancel lvgl tap
- virtual bool OnTouchEvent(TouchEvents event) {
+ virtual bool OnTouchEvent(TouchEvents /*event*/) {
return false;
}
- virtual bool OnTouchEvent(uint16_t x, uint16_t y) {
+ virtual bool OnTouchEvent(uint16_t /*x*/, uint16_t /*y*/) {
return false;
}
diff --git a/src/displayapp/screens/settings/SettingBluetooth.cpp b/src/displayapp/screens/settings/SettingBluetooth.cpp
index 1b9be3d8..0032b58f 100644
--- a/src/displayapp/screens/settings/SettingBluetooth.cpp
+++ b/src/displayapp/screens/settings/SettingBluetooth.cpp
@@ -12,12 +12,12 @@ using namespace Pinetime::Applications::Screens;
namespace {
void OnBluetoothDisabledEvent(lv_obj_t* obj, lv_event_t event) {
auto* screen = static_cast<SettingBluetooth*>(obj->user_data);
- screen->OnBluetoothDisabled(obj, event);
+ screen->OnBluetoothDisabled(event);
}
void OnBluetoothEnabledEvent(lv_obj_t* obj, lv_event_t event) {
auto* screen = static_cast<SettingBluetooth*>(obj->user_data);
- screen->OnBluetoothEnabled(obj, event);
+ screen->OnBluetoothEnabled(event);
}
}
@@ -76,7 +76,7 @@ SettingBluetooth::~SettingBluetooth() {
}
}
-void SettingBluetooth::OnBluetoothDisabled(lv_obj_t* object, lv_event_t event) {
+void SettingBluetooth::OnBluetoothDisabled(lv_event_t event) {
if (event == LV_EVENT_VALUE_CHANGED) {
lv_checkbox_set_checked(cbEnabled, false);
lv_checkbox_set_checked(cbDisabled, true);
@@ -84,7 +84,7 @@ void SettingBluetooth::OnBluetoothDisabled(lv_obj_t* object, lv_event_t event) {
}
}
-void SettingBluetooth::OnBluetoothEnabled(lv_obj_t* object, lv_event_t event) {
+void SettingBluetooth::OnBluetoothEnabled(lv_event_t event) {
if (event == LV_EVENT_VALUE_CHANGED) {
lv_checkbox_set_checked(cbEnabled, true);
lv_checkbox_set_checked(cbDisabled, false);
diff --git a/src/displayapp/screens/settings/SettingBluetooth.h b/src/displayapp/screens/settings/SettingBluetooth.h
index 12bb459a..35efcafe 100644
--- a/src/displayapp/screens/settings/SettingBluetooth.h
+++ b/src/displayapp/screens/settings/SettingBluetooth.h
@@ -17,8 +17,8 @@ namespace Pinetime {
SettingBluetooth(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
~SettingBluetooth() override;
- void OnBluetoothEnabled(lv_obj_t* object, lv_event_t event);
- void OnBluetoothDisabled(lv_obj_t* object, lv_event_t event);
+ void OnBluetoothEnabled(lv_event_t event);
+ void OnBluetoothDisabled(lv_event_t event);
private:
Controllers::Settings& settingsController;
diff --git a/src/displayapp/screens/settings/SettingSetDate.cpp b/src/displayapp/screens/settings/SettingSetDate.cpp
index a30a5c7e..0136c47c 100644
--- a/src/displayapp/screens/settings/SettingSetDate.cpp
+++ b/src/displayapp/screens/settings/SettingSetDate.cpp
@@ -101,7 +101,6 @@ void SettingSetDate::HandleButtonPress() {
dateTimeController.SetTime(yearValue,
monthValue,
dayValue,
- 0,
dateTimeController.Hours(),
dateTimeController.Minutes(),
dateTimeController.Seconds(),
diff --git a/src/displayapp/screens/settings/SettingSetTime.cpp b/src/displayapp/screens/settings/SettingSetTime.cpp
index af765871..3b6a5acb 100644
--- a/src/displayapp/screens/settings/SettingSetTime.cpp
+++ b/src/displayapp/screens/settings/SettingSetTime.cpp
@@ -99,7 +99,6 @@ void SettingSetTime::SetTime() {
dateTimeController.SetTime(dateTimeController.Year(),
static_cast<uint8_t>(dateTimeController.Month()),
dateTimeController.Day(),
- static_cast<uint8_t>(dateTimeController.DayOfWeek()),
static_cast<uint8_t>(hoursValue),
static_cast<uint8_t>(minutesValue),
0,