Skip to content

Commit 5af3857

Browse files
sofarclaude
andcommitted
Remove SimpleWeatherService, Weather app, and weather from watch faces
Removes weather BLE service, Weather app screen, weather settings, and weather display from Digital, Terminal, and PineTimeStyle watch faces. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 384bde9 commit 5af3857

18 files changed

Lines changed: 12 additions & 224 deletions

src/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,6 @@ list(APPEND SOURCE_FILES
377377
displayapp/screens/FirmwareUpdate.cpp
378378
displayapp/screens/Metronome.cpp
379379
displayapp/screens/Motion.cpp
380-
displayapp/screens/Weather.cpp
381380
displayapp/screens/Calculator.cpp
382381
displayapp/screens/FirmwareValidation.cpp
383382
displayapp/screens/ApplicationList.cpp
@@ -395,7 +394,6 @@ list(APPEND SOURCE_FILES
395394
displayapp/screens/Error.cpp
396395
displayapp/screens/Alarm.cpp
397396
displayapp/screens/Styles.cpp
398-
displayapp/screens/WeatherSymbols.cpp
399397
displayapp/Colors.cpp
400398
displayapp/widgets/Counter.cpp
401399
displayapp/widgets/PageIndicator.cpp
@@ -407,7 +405,6 @@ list(APPEND SOURCE_FILES
407405
displayapp/screens/settings/Settings.cpp
408406
displayapp/screens/settings/SettingWatchFace.cpp
409407
displayapp/screens/settings/SettingTimeFormat.cpp
410-
displayapp/screens/settings/SettingWeatherFormat.cpp
411408
displayapp/screens/settings/SettingWakeUp.cpp
412409
displayapp/screens/settings/SettingDisplay.cpp
413410
displayapp/screens/settings/SettingHeartRate.cpp
@@ -455,7 +452,6 @@ list(APPEND SOURCE_FILES
455452
components/ble/DfuService.cpp
456453
components/ble/CurrentTimeService.cpp
457454
components/ble/AlertNotificationService.cpp
458-
components/ble/SimpleWeatherService.cpp
459455
components/ble/BatteryInformationService.cpp
460456
components/ble/FSService.cpp
461457
components/ble/ImmediateAlertService.cpp
@@ -524,7 +520,6 @@ list(APPEND RECOVERY_SOURCE_FILES
524520
components/ble/DfuService.cpp
525521
components/ble/CurrentTimeService.cpp
526522
components/ble/AlertNotificationService.cpp
527-
components/ble/SimpleWeatherService.cpp
528523
components/ble/BatteryInformationService.cpp
529524
components/ble/FSService.cpp
530525
components/ble/ImmediateAlertService.cpp
@@ -651,7 +646,6 @@ set(INCLUDE_FILES
651646
components/ble/BleClient.h
652647
components/ble/HeartRateService.h
653648
components/ble/MotionService.h
654-
components/ble/SimpleWeatherService.h
655649
components/settings/Settings.h
656650
components/timer/Timer.h
657651
components/stopwatch/StopWatchController.h

src/components/ble/NimbleController.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ NimbleController::NimbleController(Pinetime::System::SystemTask& systemTask,
4242
anService {systemTask, notificationManager},
4343
alertNotificationClient {systemTask, notificationManager},
4444
currentTimeService {dateTimeController},
45-
weatherService {dateTimeController},
4645
batteryInformationService {batteryController},
4746
immediateAlertService {systemTask, notificationManager},
4847
heartRateService {*this, heartRateController},
@@ -87,7 +86,6 @@ void NimbleController::Init() {
8786
deviceInformationService.Init();
8887
currentTimeClient.Init();
8988
currentTimeService.Init();
90-
weatherService.Init();
9189
anService.Init();
9290
dfuService.Init();
9391
batteryInformationService.Init();

src/components/ble/NimbleController.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include "components/ble/ImmediateAlertService.h"
2020
#include "components/ble/ServiceDiscovery.h"
2121
#include "components/ble/MotionService.h"
22-
#include "components/ble/SimpleWeatherService.h"
2322
#include "components/fs/FS.h"
2423

2524
namespace Pinetime {
@@ -57,10 +56,6 @@ namespace Pinetime {
5756
return anService;
5857
};
5958

60-
Pinetime::Controllers::SimpleWeatherService& weather() {
61-
return weatherService;
62-
};
63-
6459
uint16_t connHandle();
6560
void NotifyBatteryLevel(uint8_t level);
6661

@@ -88,7 +83,6 @@ namespace Pinetime {
8883
AlertNotificationService anService;
8984
AlertNotificationClient alertNotificationClient;
9085
CurrentTimeService currentTimeService;
91-
SimpleWeatherService weatherService;
9286
BatteryInformationService batteryInformationService;
9387
ImmediateAlertService immediateAlertService;
9488
HeartRateService heartRateService;

src/displayapp/Controllers.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ namespace Pinetime {
2121
class StopWatchController;
2222
class AlarmController;
2323
class BrightnessController;
24-
class SimpleWeatherService;
2524
class FS;
2625
class Timer;
2726
}
@@ -43,7 +42,6 @@ namespace Pinetime {
4342
Pinetime::Controllers::StopWatchController& stopWatchController;
4443
Pinetime::Controllers::AlarmController& alarmController;
4544
Pinetime::Controllers::BrightnessController& brightnessController;
46-
Pinetime::Controllers::SimpleWeatherService* weatherController;
4745
Pinetime::Controllers::FS& filesystem;
4846
Pinetime::Controllers::Timer& timer;
4947
Pinetime::System::SystemTask* systemTask;

src/displayapp/DisplayApp.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "displayapp/screens/BatteryInfo.h"
2626
#include "displayapp/screens/Steps.h"
2727
#include "displayapp/screens/Dice.h"
28-
#include "displayapp/screens/Weather.h"
2928
#include "displayapp/screens/PassKey.h"
3029
#include "displayapp/screens/Error.h"
3130
#include "displayapp/screens/Calculator.h"
@@ -40,7 +39,6 @@
4039
#include "displayapp/screens/settings/Settings.h"
4140
#include "displayapp/screens/settings/SettingWatchFace.h"
4241
#include "displayapp/screens/settings/SettingTimeFormat.h"
43-
#include "displayapp/screens/settings/SettingWeatherFormat.h"
4442
#include "displayapp/screens/settings/SettingWakeUp.h"
4543
#include "displayapp/screens/settings/SettingDisplay.h"
4644
#include "displayapp/screens/settings/SettingSteps.h"
@@ -120,7 +118,6 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
120118
stopWatchController,
121119
alarmController,
122120
brightnessController,
123-
nullptr,
124121
filesystem,
125122
timer,
126123
nullptr,
@@ -600,9 +597,6 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
600597
case Apps::SettingTimeFormat:
601598
currentScreen = std::make_unique<Screens::SettingTimeFormat>(settingsController);
602599
break;
603-
case Apps::SettingWeatherFormat:
604-
currentScreen = std::make_unique<Screens::SettingWeatherFormat>(settingsController);
605-
break;
606600
case Apps::SettingWakeUp:
607601
currentScreen = std::make_unique<Screens::SettingWakeUp>(settingsController);
608602
break;
@@ -716,10 +710,6 @@ void DisplayApp::Register(Pinetime::System::SystemTask* systemTask) {
716710
this->controllers.systemTask = systemTask;
717711
}
718712

719-
void DisplayApp::Register(Pinetime::Controllers::SimpleWeatherService* weatherService) {
720-
this->controllers.weatherController = weatherService;
721-
}
722-
723713
void DisplayApp::ApplyBrightness() {
724714
auto brightness = settingsController.GetBrightness();
725715
if (brightness != Controllers::BrightnessController::Levels::Low && brightness != Controllers::BrightnessController::Levels::Medium &&

src/displayapp/DisplayApp.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ namespace Pinetime {
4040
class HeartRateController;
4141
class MotionController;
4242
class TouchHandler;
43-
class SimpleWeatherService;
4443
}
4544

4645
namespace System {
@@ -78,7 +77,6 @@ namespace Pinetime {
7877
void SetFullRefresh(FullRefreshDirections direction);
7978

8079
void Register(Pinetime::System::SystemTask* systemTask);
81-
void Register(Pinetime::Controllers::SimpleWeatherService* weatherService);
8280

8381
private:
8482
Pinetime::Drivers::St7789& lcd;

src/displayapp/DisplayAppRecovery.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,3 @@ void DisplayApp::PushMessage(Display::Messages msg) {
114114

115115
void DisplayApp::Register(Pinetime::System::SystemTask* /*systemTask*/) {
116116
}
117-
118-
void DisplayApp::Register(Pinetime::Controllers::SimpleWeatherService* /*weatherService*/) {
119-
}

src/displayapp/DisplayAppRecovery.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ namespace Pinetime {
3535
class AlarmController;
3636
class BrightnessController;
3737
class FS;
38-
class SimpleWeatherService;
3938
}
4039

4140
namespace System {
@@ -70,7 +69,6 @@ namespace Pinetime {
7069

7170
void PushMessage(Pinetime::Applications::Display::Messages msg);
7271
void Register(Pinetime::System::SystemTask* systemTask);
73-
void Register(Pinetime::Controllers::SimpleWeatherService* weatherService);
7472

7573
private:
7674
TaskHandle_t taskHandle;

src/displayapp/apps/Apps.h.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,11 @@ namespace Pinetime {
2727
Calculator,
2828
Steps,
2929
Dice,
30-
Weather,
3130
PassKey,
3231
QuickSettings,
3332
Settings,
3433
SettingWatchFace,
3534
SettingTimeFormat,
36-
SettingWeatherFormat,
3735
SettingHeartRate,
3836
SettingDisplay,
3937
SettingWakeUp,

src/displayapp/apps/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ else ()
1212
set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Dice")
1313
set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Metronome")
1414
set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Calculator")
15-
set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Weather")
1615
#set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Motion")
1716
set(USERAPP_TYPES "${DEFAULT_USER_APP_TYPES}" CACHE STRING "List of user apps to build into the firmware")
1817
endif ()

0 commit comments

Comments
 (0)