Skip to content

Commit 384bde9

Browse files
sofarclaude
andcommitted
Remove NavigationService and Navigation app to save RAM
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 07c6a5e commit 384bde9

11 files changed

Lines changed: 1 addition & 28 deletions

File tree

src/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,6 @@ list(APPEND SOURCE_FILES
375375
displayapp/screens/SystemInfo.cpp
376376
displayapp/screens/Label.cpp
377377
displayapp/screens/FirmwareUpdate.cpp
378-
displayapp/screens/Navigation.cpp
379378
displayapp/screens/Metronome.cpp
380379
displayapp/screens/Motion.cpp
381380
displayapp/screens/Weather.cpp
@@ -457,7 +456,6 @@ list(APPEND SOURCE_FILES
457456
components/ble/CurrentTimeService.cpp
458457
components/ble/AlertNotificationService.cpp
459458
components/ble/SimpleWeatherService.cpp
460-
components/ble/NavigationService.cpp
461459
components/ble/BatteryInformationService.cpp
462460
components/ble/FSService.cpp
463461
components/ble/ImmediateAlertService.cpp
@@ -531,7 +529,6 @@ list(APPEND RECOVERY_SOURCE_FILES
531529
components/ble/FSService.cpp
532530
components/ble/ImmediateAlertService.cpp
533531
components/ble/ServiceDiscovery.cpp
534-
components/ble/NavigationService.cpp
535532
components/ble/HeartRateService.cpp
536533
components/ble/MotionService.cpp
537534
components/firmwarevalidator/FirmwareValidator.cpp

src/components/ble/NimbleController.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ void NimbleController::Init() {
8888
currentTimeClient.Init();
8989
currentTimeService.Init();
9090
weatherService.Init();
91-
navService.Init();
9291
anService.Init();
9392
dfuService.Init();
9493
batteryInformationService.Init();

src/components/ble/NimbleController.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "components/ble/FSService.h"
1818
#include "components/ble/HeartRateService.h"
1919
#include "components/ble/ImmediateAlertService.h"
20-
#include "components/ble/NavigationService.h"
2120
#include "components/ble/ServiceDiscovery.h"
2221
#include "components/ble/MotionService.h"
2322
#include "components/ble/SimpleWeatherService.h"
@@ -54,10 +53,6 @@ namespace Pinetime {
5453
int OnGAPEvent(ble_gap_event* event);
5554
void StartDiscovery();
5655

57-
Pinetime::Controllers::NavigationService& navigation() {
58-
return navService;
59-
};
60-
6156
Pinetime::Controllers::AlertNotificationService& alertService() {
6257
return anService;
6358
};
@@ -94,7 +89,6 @@ namespace Pinetime {
9489
AlertNotificationClient alertNotificationClient;
9590
CurrentTimeService currentTimeService;
9691
SimpleWeatherService weatherService;
97-
NavigationService navService;
9892
BatteryInformationService batteryInformationService;
9993
ImmediateAlertService immediateAlertService;
10094
HeartRateService heartRateService;

src/displayapp/Controllers.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ namespace Pinetime {
2424
class SimpleWeatherService;
2525
class FS;
2626
class Timer;
27-
class NavigationService;
2827
}
2928

3029
namespace System {
@@ -50,7 +49,6 @@ namespace Pinetime {
5049
Pinetime::System::SystemTask* systemTask;
5150
Pinetime::Applications::DisplayApp* displayApp;
5251
Pinetime::Components::LittleVgl& lvgl;
53-
Pinetime::Controllers::NavigationService* navigationService;
5452
};
5553
}
5654
}

src/displayapp/DisplayApp.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "displayapp/screens/Paddle.h"
1818
#include "displayapp/screens/StopWatch.h"
1919
#include "displayapp/screens/Metronome.h"
20-
#include "displayapp/screens/Navigation.h"
2120
#include "displayapp/screens/Notifications.h"
2221
#include "displayapp/screens/SystemInfo.h"
2322
#include "displayapp/screens/Tile.h"
@@ -126,8 +125,7 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
126125
timer,
127126
nullptr,
128127
this,
129-
lvgl,
130-
nullptr} {
128+
lvgl} {
131129
}
132130

133131
void DisplayApp::Start(System::BootErrors error) {
@@ -722,10 +720,6 @@ void DisplayApp::Register(Pinetime::Controllers::SimpleWeatherService* weatherSe
722720
this->controllers.weatherController = weatherService;
723721
}
724722

725-
void DisplayApp::Register(Pinetime::Controllers::NavigationService* NavigationService) {
726-
this->controllers.navigationService = NavigationService;
727-
}
728-
729723
void DisplayApp::ApplyBrightness() {
730724
auto brightness = settingsController.GetBrightness();
731725
if (brightness != Controllers::BrightnessController::Levels::Low && brightness != Controllers::BrightnessController::Levels::Medium &&

src/displayapp/DisplayApp.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ namespace Pinetime {
7979

8080
void Register(Pinetime::System::SystemTask* systemTask);
8181
void Register(Pinetime::Controllers::SimpleWeatherService* weatherService);
82-
void Register(Pinetime::Controllers::NavigationService* NavigationService);
8382

8483
private:
8584
Pinetime::Drivers::St7789& lcd;

src/displayapp/DisplayAppRecovery.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,3 @@ void DisplayApp::Register(Pinetime::System::SystemTask* /*systemTask*/) {
117117

118118
void DisplayApp::Register(Pinetime::Controllers::SimpleWeatherService* /*weatherService*/) {
119119
}
120-
121-
void DisplayApp::Register(Pinetime::Controllers::NavigationService* /*NavigationService*/) {
122-
}

src/displayapp/DisplayAppRecovery.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ namespace Pinetime {
3636
class BrightnessController;
3737
class FS;
3838
class SimpleWeatherService;
39-
class NavigationService;
4039
}
4140

4241
namespace System {
@@ -72,7 +71,6 @@ namespace Pinetime {
7271
void PushMessage(Pinetime::Applications::Display::Messages msg);
7372
void Register(Pinetime::System::SystemTask* systemTask);
7473
void Register(Pinetime::Controllers::SimpleWeatherService* weatherService);
75-
void Register(Pinetime::Controllers::NavigationService* NavigationService);
7674

7775
private:
7876
TaskHandle_t taskHandle;

src/displayapp/apps/Apps.h.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ namespace Pinetime {
2121
Paddle,
2222
Twos,
2323
HeartRate,
24-
Navigation,
2524
StopWatch,
2625
Metronome,
2726
Motion,

src/displayapp/apps/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ else ()
1111
set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Twos")
1212
set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Dice")
1313
set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Metronome")
14-
set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Navigation")
1514
set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Calculator")
1615
set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Weather")
1716
#set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Motion")

0 commit comments

Comments
 (0)