Skip to content

Commit 8728ac2

Browse files
authored
Merge pull request #602 from Riksu9000/del_unused
Remove unused variables
2 parents f032929 + 2b30ff4 commit 8728ac2

4 files changed

Lines changed: 2 additions & 18 deletions

File tree

src/displayapp/DisplayApp.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,6 @@ void DisplayApp::InitHw() {
136136
brightnessController.Set(settingsController.GetBrightness());
137137
}
138138

139-
uint32_t acc = 0;
140-
uint32_t count = 0;
141-
bool toggle = true;
142139
void DisplayApp::Refresh() {
143140
TickType_t queueTimeout;
144141
TickType_t delta;

src/displayapp/screens/Notifications.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ Notifications::NotificationItem::NotificationItem(const char* title,
152152
uint8_t notifNb,
153153
Modes mode,
154154
Pinetime::Controllers::AlertNotificationService& alertNotificationService)
155-
: notifNr {notifNr}, notifNb {notifNb}, mode {mode}, alertNotificationService {alertNotificationService} {
155+
: mode {mode}, alertNotificationService {alertNotificationService} {
156156
lv_obj_t* container1 = lv_cont_create(lv_scr_act(), NULL);
157157

158158
lv_obj_set_style_local_bg_color(container1, LV_CONT_PART_MAIN, LV_STATE_DEFAULT, lv_color_hex(0x222222));

src/displayapp/screens/Notifications.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,13 @@ namespace Pinetime {
4343
void OnCallButtonEvent(lv_obj_t*, lv_event_t event);
4444

4545
private:
46-
uint8_t notifNr = 0;
47-
uint8_t notifNb = 0;
48-
char pageText[4];
49-
5046
lv_obj_t* container1;
51-
lv_obj_t* t1;
52-
lv_obj_t* l1;
53-
lv_obj_t* l2;
5447
lv_obj_t* bt_accept;
5548
lv_obj_t* bt_mute;
5649
lv_obj_t* bt_reject;
5750
lv_obj_t* label_accept;
5851
lv_obj_t* label_mute;
5952
lv_obj_t* label_reject;
60-
lv_obj_t* bottomPlaceholder;
6153
Modes mode;
6254
Pinetime::Controllers::AlertNotificationService& alertNotificationService;
6355
bool running = true;

src/main.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,13 @@ static constexpr uint32_t MaxTwiFrequencyWithoutHardwareBug {0x06200000};
8787
Pinetime::Drivers::TwiMaster twiMaster {NRF_TWIM1, MaxTwiFrequencyWithoutHardwareBug, pinTwiSda, pinTwiScl};
8888
Pinetime::Drivers::Cst816S touchPanel {twiMaster, touchPanelTwiAddress};
8989
#ifdef PINETIME_IS_RECOVERY
90-
static constexpr bool isFactory = true;
9190
#include "displayapp/DummyLittleVgl.h"
9291
#include "displayapp/DisplayAppRecovery.h"
93-
Pinetime::Components::LittleVgl lvgl {lcd, touchPanel};
9492
#else
95-
static constexpr bool isFactory = false;
9693
#include "displayapp/LittleVgl.h"
9794
#include "displayapp/DisplayApp.h"
98-
Pinetime::Components::LittleVgl lvgl {lcd, touchPanel};
9995
#endif
96+
Pinetime::Components::LittleVgl lvgl {lcd, touchPanel};
10097

10198
Pinetime::Drivers::Bma421 motionSensor {twiMaster, motionSensorTwiAddress};
10299
Pinetime::Drivers::Hrs3300 heartRateSensor {twiMaster, heartRateSensorTwiAddress};
@@ -105,8 +102,6 @@ TimerHandle_t debounceTimer;
105102
TimerHandle_t debounceChargeTimer;
106103
Pinetime::Controllers::Battery batteryController;
107104
Pinetime::Controllers::Ble bleController;
108-
void ble_manager_set_ble_connection_callback(void (*connection)());
109-
void ble_manager_set_ble_disconnection_callback(void (*disconnection)());
110105
static constexpr uint8_t pinTouchIrq = 28;
111106
static constexpr uint8_t pinPowerPresentIrq = 19;
112107

0 commit comments

Comments
 (0)