summaryrefslogtreecommitdiff
path: root/src/displayapp
diff options
context:
space:
mode:
Diffstat (limited to 'src/displayapp')
-rw-r--r--src/displayapp/DisplayAppRecovery.cpp32
-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
7 files changed, 26 insertions, 28 deletions
diff --git a/src/displayapp/DisplayAppRecovery.cpp b/src/displayapp/DisplayAppRecovery.cpp
index e553aa87..ecc01e9b 100644
--- a/src/displayapp/DisplayAppRecovery.cpp
+++ b/src/displayapp/DisplayAppRecovery.cpp
@@ -11,22 +11,22 @@
using namespace Pinetime::Applications;
DisplayApp::DisplayApp(Drivers::St7789& lcd,
- Components::LittleVgl& lvgl,
- Drivers::Cst816S& touchPanel,
- Controllers::Battery& batteryController,
+ Components::LittleVgl& /*lvgl*/,
+ Drivers::Cst816S& /*touchPanel*/,
+ Controllers::Battery& /*batteryController*/,
Controllers::Ble& bleController,
- Controllers::DateTime& dateTimeController,
- Drivers::WatchdogView& watchdog,
- Pinetime::Controllers::NotificationManager& notificationManager,
- Pinetime::Controllers::HeartRateController& heartRateController,
- Controllers::Settings& settingsController,
- Pinetime::Controllers::MotorController& motorController,
- Pinetime::Controllers::MotionController& motionController,
- Pinetime::Controllers::TimerController& timerController,
- Pinetime::Controllers::AlarmController& alarmController,
- Pinetime::Controllers::BrightnessController& brightnessController,
- Pinetime::Controllers::TouchHandler& touchHandler,
- Pinetime::Controllers::FS& filesystem)
+ Controllers::DateTime& /*dateTimeController*/,
+ Drivers::WatchdogView& /*watchdog*/,
+ Pinetime::Controllers::NotificationManager& /*notificationManager*/,
+ Pinetime::Controllers::HeartRateController& /*heartRateController*/,
+ Controllers::Settings& /*settingsController*/,
+ Pinetime::Controllers::MotorController& /*motorController*/,
+ Pinetime::Controllers::MotionController& /*motionController*/,
+ Pinetime::Controllers::TimerController& /*timerController*/,
+ Pinetime::Controllers::AlarmController& /*alarmController*/,
+ Pinetime::Controllers::BrightnessController& /*brightnessController*/,
+ Pinetime::Controllers::TouchHandler& /*touchHandler*/,
+ Pinetime::Controllers::FS& /*filesystem*/)
: lcd {lcd}, bleController {bleController} {
}
@@ -121,5 +121,5 @@ void DisplayApp::PushMessage(Display::Messages msg) {
}
}
-void DisplayApp::Register(Pinetime::System::SystemTask* systemTask) {
+void DisplayApp::Register(Pinetime::System::SystemTask* /*systemTask*/) {
}
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 c66be3e9..177e1870 100644
--- a/src/displayapp/screens/settings/SettingBluetooth.cpp
+++ b/src/displayapp/screens/settings/SettingBluetooth.cpp
@@ -11,12 +11,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);
}
}
@@ -75,7 +75,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);
@@ -83,7 +83,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 fd1bc9b9..c58f6fca 100644
--- a/src/displayapp/screens/settings/SettingSetDate.cpp
+++ b/src/displayapp/screens/settings/SettingSetDate.cpp
@@ -100,7 +100,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 7fad33ae..67ea7afa 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,
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 08:53:35 +0000