summaryrefslogtreecommitdiff
path: root/src/displayapp
diff options
context:
space:
mode:
Diffstat (limited to 'src/displayapp')
-rw-r--r--src/displayapp/DisplayApp.cpp4
-rw-r--r--src/displayapp/Messages.h2
-rw-r--r--src/displayapp/screens/BleIcon.cpp15
-rw-r--r--src/displayapp/screens/BleIcon.h2
-rw-r--r--src/displayapp/screens/PineTimeStyle.cpp20
-rw-r--r--src/displayapp/screens/PineTimeStyle.h3
-rw-r--r--src/displayapp/screens/WatchFaceDigital.cpp7
-rw-r--r--src/displayapp/screens/WatchFaceDigital.h3
-rw-r--r--src/displayapp/screens/WatchFaceTerminal.cpp13
-rw-r--r--src/displayapp/screens/WatchFaceTerminal.h1
-rw-r--r--src/displayapp/screens/settings/SettingAirplaneMode.cpp74
-rw-r--r--src/displayapp/screens/settings/SettingAirplaneMode.h7
-rw-r--r--src/displayapp/screens/settings/Settings.cpp37
-rw-r--r--src/displayapp/screens/settings/Settings.h3
14 files changed, 117 insertions, 74 deletions
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index 25ae9ad6..fdc6376c 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -293,8 +293,8 @@ void DisplayApp::Refresh() {
case Messages::BleFirmwareUpdateStarted:
LoadApp(Apps::FirmwareUpdate, DisplayApp::FullRefreshDirections::Down);
break;
- case Messages::AirplaneModeToggle:
- PushMessageToSystemTask(System::Messages::AirplaneModeToggle);
+ case Messages::BleRadioEnableToggle:
+ PushMessageToSystemTask(System::Messages::BleRadioEnableToggle);
break;
case Messages::UpdateDateTime:
// Added to remove warning
diff --git a/src/displayapp/Messages.h b/src/displayapp/Messages.h
index 62256b9e..58df4556 100644
--- a/src/displayapp/Messages.h
+++ b/src/displayapp/Messages.h
@@ -22,7 +22,7 @@ namespace Pinetime {
ShowPairingKey,
AlarmTriggered,
Clock,
- AirplaneModeToggle
+ BleRadioEnableToggle
};
}
}
diff --git a/src/displayapp/screens/BleIcon.cpp b/src/displayapp/screens/BleIcon.cpp
index a30d23bd..019f8039 100644
--- a/src/displayapp/screens/BleIcon.cpp
+++ b/src/displayapp/screens/BleIcon.cpp
@@ -2,11 +2,14 @@
#include "displayapp/screens/Symbols.h"
using namespace Pinetime::Applications::Screens;
-const char* BleIcon::GetIcon(Pinetime::Controllers::Ble::ConnectStates state) {
- if (state == Pinetime::Controllers::Ble::ConnectStates::Connected)
- return Symbols::bluetooth;
- else if (state == Pinetime::Controllers::Ble::ConnectStates::Airplane)
+const char* BleIcon::GetIcon(bool isRadioEnabled, bool isConnected) {
+ if(!isRadioEnabled) {
return Symbols::airplane;
- else
- return Symbols::none;
+ }
+
+ if (isConnected) {
+ return Symbols::bluetooth;
+ }
+
+ return Symbols::none;
}
diff --git a/src/displayapp/screens/BleIcon.h b/src/displayapp/screens/BleIcon.h
index d7410eae..d32dfad7 100644
--- a/src/displayapp/screens/BleIcon.h
+++ b/src/displayapp/screens/BleIcon.h
@@ -7,7 +7,7 @@ namespace Pinetime {
namespace Screens {
class BleIcon {
public:
- static const char* GetIcon(Pinetime::Controllers::Ble::ConnectStates state);
+ static const char* GetIcon(bool isRadioEnabled, bool isConnected);
};
}
}
diff --git a/src/displayapp/screens/PineTimeStyle.cpp b/src/displayapp/screens/PineTimeStyle.cpp
index f1f7f922..44bf47a4 100644
--- a/src/displayapp/screens/PineTimeStyle.cpp
+++ b/src/displayapp/screens/PineTimeStyle.cpp
@@ -42,6 +42,13 @@ namespace {
auto* screen = static_cast<PineTimeStyle*>(obj->user_data);
screen->UpdateSelected(obj, event);
}
+
+ bool IsBleIconVisible(bool isRadioEnabled, bool isConnected) {
+ if(!isRadioEnabled) {
+ return true;
+ }
+ return isConnected;
+ }
}
PineTimeStyle::PineTimeStyle(DisplayApp* app,
@@ -336,11 +343,13 @@ void PineTimeStyle::SetBatteryIcon() {
lv_label_set_text_static(batteryIcon, BatteryIcon::GetBatteryIcon(batteryPercent));
}
+
void PineTimeStyle::AlignIcons() {
- if (notificationState.Get() && bleState.Get() != Pinetime::Controllers::Ble::ConnectStates::Disconnected) {
+ bool isBleIconVisible = IsBleIconVisible(bleRadioEnabled.Get(), bleState.Get());
+ if (notificationState.Get() && isBleIconVisible) {
lv_obj_align(bleIcon, sidebar, LV_ALIGN_IN_TOP_MID, 8, 25);
lv_obj_align(notificationIcon, sidebar, LV_ALIGN_IN_TOP_MID, -8, 25);
- } else if (notificationState.Get() && bleState.Get() == Pinetime::Controllers::Ble::ConnectStates::Disconnected) {
+ } else if (notificationState.Get() && !isBleIconVisible) {
lv_obj_align(notificationIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 25);
} else {
lv_obj_align(bleIcon, sidebar, LV_ALIGN_IN_TOP_MID, 0, 25);
@@ -363,9 +372,10 @@ void PineTimeStyle::Refresh() {
}
}
- bleState = bleController.GetConnectState();
- if (bleState.IsUpdated()) {
- lv_label_set_text_static(bleIcon, BleIcon::GetIcon(bleState.Get()));
+ bleState = bleController.IsConnected();
+ bleRadioEnabled = bleController.IsRadioEnabled();
+ if (bleState.IsUpdated() || bleRadioEnabled.IsUpdated()) {
+ lv_label_set_text(bleIcon, BleIcon::GetIcon(bleRadioEnabled.Get(), bleState.Get()));
AlignIcons();
}
diff --git a/src/displayapp/screens/PineTimeStyle.h b/src/displayapp/screens/PineTimeStyle.h
index cb8f6804..5de9a5fa 100644
--- a/src/displayapp/screens/PineTimeStyle.h
+++ b/src/displayapp/screens/PineTimeStyle.h
@@ -51,7 +51,8 @@ namespace Pinetime {
DirtyValue<uint8_t> batteryPercentRemaining {};
DirtyValue<bool> isCharging {};
- DirtyValue<Controllers::Ble::ConnectStates> bleState {};
+ DirtyValue<bool> bleState {};
+ DirtyValue<bool> bleRadioEnabled {};
DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds>> currentDateTime {};
DirtyValue<bool> motionSensorOk {};
DirtyValue<uint32_t> stepCount {};
diff --git a/src/displayapp/screens/WatchFaceDigital.cpp b/src/displayapp/screens/WatchFaceDigital.cpp
index fd36aa22..56155d52 100644
--- a/src/displayapp/screens/WatchFaceDigital.cpp
+++ b/src/displayapp/screens/WatchFaceDigital.cpp
@@ -119,9 +119,10 @@ void WatchFaceDigital::Refresh() {
lv_label_set_text_static(batteryIcon, BatteryIcon::GetBatteryIcon(batteryPercent));
}
- bleState = bleController.GetConnectState();
- if (bleState.IsUpdated()) {
- lv_label_set_text_static(bleIcon, BleIcon::GetIcon(bleState.Get()));
+ bleState = bleController.IsConnected();
+ bleRadioEnabled = bleController.IsRadioEnabled();
+ if (bleState.IsUpdated() || bleRadioEnabled.IsUpdated()) {
+ lv_label_set_text(bleIcon, BleIcon::GetIcon(bleRadioEnabled.Get(), bleState.Get()));
}
lv_obj_realign(batteryIcon);
lv_obj_realign(batteryPlug);
diff --git a/src/displayapp/screens/WatchFaceDigital.h b/src/displayapp/screens/WatchFaceDigital.h
index 6cf11310..d33434c0 100644
--- a/src/displayapp/screens/WatchFaceDigital.h
+++ b/src/displayapp/screens/WatchFaceDigital.h
@@ -46,7 +46,8 @@ namespace Pinetime {
DirtyValue<uint8_t> batteryPercentRemaining {};
DirtyValue<bool> powerPresent {};
- DirtyValue<Controllers::Ble::ConnectStates> bleState {};
+ DirtyValue<bool> bleState {};
+ DirtyValue<bool> bleRadioEnabled {};
DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds>> currentDateTime {};
DirtyValue<bool> motionSensorOk {};
DirtyValue<uint32_t> stepCount {};
diff --git a/src/displayapp/screens/WatchFaceTerminal.cpp b/src/displayapp/screens/WatchFaceTerminal.cpp
index 033aad88..ccfbdd0b 100644
--- a/src/displayapp/screens/WatchFaceTerminal.cpp
+++ b/src/displayapp/screens/WatchFaceTerminal.cpp
@@ -114,11 +114,16 @@ void WatchFaceTerminal::Refresh() {
}
bleState = bleController.IsConnected();
- if (bleState.IsUpdated()) {
- if (bleState.Get()) {
- lv_label_set_text_static(connectState, "[STAT]#387b54 Connected#");
+ bleRadioEnabled = bleController.IsRadioEnabled();
+ if (bleState.IsUpdated() || bleRadioEnabled.IsUpdated()) {
+ if(!bleRadioEnabled.Get()) {
+ lv_label_set_text_static(connectState, "[STAT]#387b54 Disabled#");
} else {
- lv_label_set_text_static(connectState, "[STAT]#387b54 Disconnected#");
+ if (bleState.Get()) {
+ lv_label_set_text_static(connectState, "[STAT]#387b54 Connected#");
+ } else {
+ lv_label_set_text_static(connectState, "[STAT]#387b54 Disconnected#");
+ }
}
}
diff --git a/src/displayapp/screens/WatchFaceTerminal.h b/src/displayapp/screens/WatchFaceTerminal.h
index c3df82b4..78c7b8aa 100644
--- a/src/displayapp/screens/WatchFaceTerminal.h
+++ b/src/displayapp/screens/WatchFaceTerminal.h
@@ -47,6 +47,7 @@ namespace Pinetime {
DirtyValue<int> batteryPercentRemaining {};
DirtyValue<bool> powerPresent {};
DirtyValue<bool> bleState {};
+ DirtyValue<bool> bleRadioEnabled {};
DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds>> currentDateTime {};
DirtyValue<bool> motionSensorOk {};
DirtyValue<uint32_t> stepCount {};
diff --git a/src/displayapp/screens/settings/SettingAirplaneMode.cpp b/src/displayapp/screens/settings/SettingAirplaneMode.cpp
index 0a364ded..85172787 100644
--- a/src/displayapp/screens/settings/SettingAirplaneMode.cpp
+++ b/src/displayapp/screens/settings/SettingAirplaneMode.cpp
@@ -9,13 +9,16 @@
using namespace Pinetime::Applications::Screens;
namespace {
- static void event_handler(lv_obj_t* obj, lv_event_t event) {
- SettingAirplaneMode* screen = static_cast<SettingAirplaneMode*>(obj->user_data);
- screen->UpdateSelected(obj, event);
+ static void OnAirplaneModeEnabledEvent(lv_obj_t* obj, lv_event_t event) {
+ auto* screen = static_cast<SettingAirplaneMode*>(obj->user_data);
+ screen->OnAirplaneModeEnabled(obj, event);
}
-}
-constexpr std::array<const char*, 2> SettingAirplaneMode::options;
+ static void OnAirplaneModeDisabledEvent(lv_obj_t* obj, lv_event_t event) {
+ auto* screen = static_cast<SettingAirplaneMode*>(obj->user_data);
+ screen->OnAirplaneModeDisabled(obj, event);
+ }
+}
SettingAirplaneMode::SettingAirplaneMode(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Settings& settingsController)
: Screen(app), settingsController {settingsController} {
@@ -43,47 +46,48 @@ SettingAirplaneMode::SettingAirplaneMode(Pinetime::Applications::DisplayApp* app
lv_label_set_align(icon, LV_LABEL_ALIGN_CENTER);
lv_obj_align(icon, title, LV_ALIGN_OUT_LEFT_MID, -10, 0);
- for (unsigned int i = 0; i < options.size(); i++) {
- cbOption[i] = lv_checkbox_create(container1, nullptr);
- lv_checkbox_set_text(cbOption[i], options[i]);
- cbOption[i]->user_data = this;
- lv_obj_set_event_cb(cbOption[i], event_handler);
- SetRadioButtonStyle(cbOption[i]);
- }
+ cbEnabled = lv_checkbox_create(container1, nullptr);
+ lv_checkbox_set_text(cbEnabled, " Enable");
+ cbEnabled->user_data = this;
+ lv_obj_set_event_cb(cbEnabled, OnAirplaneModeEnabledEvent);
+ SetRadioButtonStyle(cbEnabled);
- if (settingsController.GetAirplaneMode() == false) {
- lv_checkbox_set_checked(cbOption[0], true);
- priorMode = false;
- } else {
- lv_checkbox_set_checked(cbOption[1], true);
+ cbDisabled = lv_checkbox_create(container1, nullptr);
+ lv_checkbox_set_text(cbDisabled, " Disable");
+ cbDisabled->user_data = this;
+ lv_obj_set_event_cb(cbDisabled, OnAirplaneModeDisabledEvent);
+ SetRadioButtonStyle(cbDisabled);
+
+ if (settingsController.GetBleRadioEnabled()) {
+ lv_checkbox_set_checked(cbDisabled, true);
priorMode = true;
+ } else {
+ lv_checkbox_set_checked(cbEnabled, true);
+ priorMode = false;
}
}
SettingAirplaneMode::~SettingAirplaneMode() {
lv_obj_clean(lv_scr_act());
// Do not call SaveSettings - see src/components/settings/Settings.h
- if (priorMode != settingsController.GetAirplaneMode()) {
- app->PushMessage(Pinetime::Applications::Display::Messages::AirplaneModeToggle);
+ if (priorMode != settingsController.GetBleRadioEnabled()) {
+ app->PushMessage(Pinetime::Applications::Display::Messages::BleRadioEnableToggle);
}
}
-void SettingAirplaneMode::UpdateSelected(lv_obj_t* object, lv_event_t event) {
+void SettingAirplaneMode::OnAirplaneModeEnabled(lv_obj_t* object, lv_event_t event) {
if (event == LV_EVENT_VALUE_CHANGED) {
- for (unsigned int i = 0; i < options.size(); i++) {
- if (object == cbOption[i]) {
- lv_checkbox_set_checked(cbOption[i], true);
-
- if (i == 0) {
- settingsController.SetAirplaneMode(false);
- };
- if (i == 1) {
- settingsController.SetAirplaneMode(true);
- };
-
- } else {
- lv_checkbox_set_checked(cbOption[i], false);
- }
- }
+ lv_checkbox_set_checked(cbEnabled, true);
+ lv_checkbox_set_checked(cbDisabled, false);
+ settingsController.SetBleRadioEnabled(false);
}
}
+
+void SettingAirplaneMode::OnAirplaneModeDisabled(lv_obj_t* object, lv_event_t event) {
+ if (event == LV_EVENT_VALUE_CHANGED) {
+ lv_checkbox_set_checked(cbEnabled, false);
+ lv_checkbox_set_checked(cbDisabled, true);
+ settingsController.SetBleRadioEnabled(true);
+ }
+}
+
diff --git a/src/displayapp/screens/settings/SettingAirplaneMode.h b/src/displayapp/screens/settings/SettingAirplaneMode.h
index fcc02228..b3478c64 100644
--- a/src/displayapp/screens/settings/SettingAirplaneMode.h
+++ b/src/displayapp/screens/settings/SettingAirplaneMode.h
@@ -17,12 +17,13 @@ namespace Pinetime {
SettingAirplaneMode(DisplayApp* app, Pinetime::Controllers::Settings& settingsController);
~SettingAirplaneMode() override;
- void UpdateSelected(lv_obj_t* object, lv_event_t event);
+ void OnAirplaneModeEnabled(lv_obj_t* object, lv_event_t event);
+ void OnAirplaneModeDisabled(lv_obj_t* object, lv_event_t event);
private:
- static constexpr std::array<const char*, 2> options = {" No", " Yes"};
Controllers::Settings& settingsController;
- lv_obj_t* cbOption[options.size()];
+ lv_obj_t* cbEnabled;
+ lv_obj_t* cbDisabled;
bool priorMode;
};
}
diff --git a/src/displayapp/screens/settings/Settings.cpp b/src/displayapp/screens/settings/Settings.cpp
index 7bc90b47..981b4973 100644
--- a/src/displayapp/screens/settings/Settings.cpp
+++ b/src/displayapp/screens/settings/Settings.cpp
@@ -21,7 +21,11 @@ Settings::Settings(Pinetime::Applications::DisplayApp* app, Pinetime::Controller
},
[this]() -> std::unique_ptr<Screen> {
return CreateScreen3();
- }},
+ },
+ [this]() -> std::unique_ptr<Screen> {
+ return CreateScreen4();
+ },
+ },
Screens::ScreenListModes::UpDown} {
}
@@ -34,7 +38,6 @@ bool Settings::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
}
std::unique_ptr<Screen> Settings::CreateScreen1() {
-
std::array<Screens::List::Applications, 4> applications {{
{Symbols::sun, "Display", Apps::SettingDisplay},
{Symbols::eye, "Wake Up", Apps::SettingWakeUp},
@@ -42,17 +45,17 @@ std::unique_ptr<Screen> Settings::CreateScreen1() {
{Symbols::home, "Watch face", Apps::SettingWatchFace},
}};
- return std::make_unique<Screens::List>(0, 3, app, settingsController, applications);
+ return std::make_unique<Screens::List>(0, 4, app, settingsController, applications);
}
std::unique_ptr<Screen> Settings::CreateScreen2() {
+ std::array<Screens::List::Applications, 4> applications {{
+ {Symbols::shoe, "Steps", Apps::SettingSteps},
+ {Symbols::clock, "Set date", Apps::SettingSetDate},
+ {Symbols::clock, "Set time", Apps::SettingSetTime},
+ {Symbols::batteryHalf, "Battery", Apps::BatteryInfo}}};
- std::array<Screens::List::Applications, 4> applications {{{Symbols::shoe, "Steps", Apps::SettingSteps},
- {Symbols::clock, "Set date", Apps::SettingSetDate},
- {Symbols::clock, "Set time", Apps::SettingSetTime},
- {Symbols::batteryHalf, "Battery", Apps::BatteryInfo}}};
-
- return std::make_unique<Screens::List>(1, 3, app, settingsController, applications);
+ return std::make_unique<Screens::List>(1, 4, app, settingsController, applications);
}
std::unique_ptr<Screen> Settings::CreateScreen3() {
@@ -61,8 +64,20 @@ std::unique_ptr<Screen> Settings::CreateScreen3() {
{Symbols::clock, "Chimes", Apps::SettingChimes},
{Symbols::tachometer, "Shake Calib.", Apps::SettingShakeThreshold},
{Symbols::check, "Firmware", Apps::FirmwareValidation},
- {Symbols::list, "About", Apps::SysInfo}
+ {Symbols::list, "Airplane mode", Apps::SettingAirplaneMode}
+ }};
+
+ return std::make_unique<Screens::List>(2, 4, app, settingsController, applications);
+}
+
+std::unique_ptr<Screen> Settings::CreateScreen4() {
+
+ std::array<Screens::List::Applications, 4> applications {{
+ {Symbols::list, "About", Apps::SysInfo},
+ {Symbols::none, "None", Apps::None},
+ {Symbols::none, "None", Apps::None},
+ {Symbols::none, "None", Apps::None}
}};
- return std::make_unique<Screens::List>(2, 3, app, settingsController, applications);
+ return std::make_unique<Screens::List>(3, 4, app, settingsController, applications);
}
diff --git a/src/displayapp/screens/settings/Settings.h b/src/displayapp/screens/settings/Settings.h
index 6c54cdeb..be090075 100644
--- a/src/displayapp/screens/settings/Settings.h
+++ b/src/displayapp/screens/settings/Settings.h
@@ -19,11 +19,12 @@ namespace Pinetime {
private:
Controllers::Settings& settingsController;
- ScreenList<3> screens;
+ ScreenList<4> screens;
std::unique_ptr<Screen> CreateScreen1();
std::unique_ptr<Screen> CreateScreen2();
std::unique_ptr<Screen> CreateScreen3();
+ std::unique_ptr<Screen> CreateScreen4();
};
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 12:43:29 +0000