scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

fix issues after rebase on main

Browse source
This commit is contained in:
Patric Gruber 2024-01-02 16:07:35 +01:00
parent d78f26201b
commit 3b432cd310
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/displayapp/apps/Apps.h.in
View file

@ -35,6 +35,7 @@ namespace Pinetime {
SettingWatchFace, SettingWatchFace,
SettingTimeFormat, SettingTimeFormat,
SettingWeatherFormat, SettingWeatherFormat,
SettingHeartRate,
SettingDisplay, SettingDisplay,
SettingWakeUp, SettingWakeUp,
SettingSteps, SettingSteps,

6
src/displayapp/screens/settings/Settings.h
View file

@ -41,16 +41,14 @@ namespace Pinetime {
{Symbols::heartBeat, "Heartrate", Apps::SettingHeartRate}, {Symbols::heartBeat, "Heartrate", Apps::SettingHeartRate},
{Symbols::clock, "Date&Time", Apps::SettingSetDateTime}, {Symbols::clock, "Date&Time", Apps::SettingSetDateTime},
{Symbols::cloudSunRain, "Weather", Apps::SettingWeatherFormat}, {Symbols::cloudSunRain, "Weather", Apps::SettingWeatherFormat},
{Symbols::batteryHalf, "Battery", Apps::BatteryInfo},
{Symbols::batteryHalf, "Battery", Apps::BatteryInfo},
{Symbols::clock, "Chimes", Apps::SettingChimes}, {Symbols::clock, "Chimes", Apps::SettingChimes},
{Symbols::tachometer, "Shake Calib.", Apps::SettingShakeThreshold}, {Symbols::tachometer, "Shake Calib.", Apps::SettingShakeThreshold},
{Symbols::check, "Firmware", Apps::FirmwareValidation}, {Symbols::check, "Firmware", Apps::FirmwareValidation},
{Symbols::bluetooth, "Bluetooth", Apps::SettingBluetooth}, {Symbols::bluetooth, "Bluetooth", Apps::SettingBluetooth},
{Symbols::list, "About", Apps::SysInfo}, {Symbols::list, "About", Apps::SysInfo},
{Symbols::none, "None", Apps::None},
{Symbols::none, "None", Apps::None}, {Symbols::none, "None", Apps::None},
{Symbols::none, "None", Apps::None}, {Symbols::none, "None", Apps::None},