From 4fe058c6521763b809644ddd04bfbd697143d09f Mon Sep 17 00:00:00 2001 From: Elements6007 Date: Wed, 30 Nov 2022 15:18:42 -0500 Subject: [PATCH 1/2] combine --- sim/displayapp/screens/Missing.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sim/displayapp/screens/Missing.cpp b/sim/displayapp/screens/Missing.cpp index d671de8..15b8ae2 100644 --- a/sim/displayapp/screens/Missing.cpp +++ b/sim/displayapp/screens/Missing.cpp @@ -99,11 +99,8 @@ Missing::Missing(Pinetime::Applications::DisplayApp* app, Pinetime::Applications case Pinetime::Applications::Apps::SettingSteps: screen_lbl = "SettingSteps"; break; - case Pinetime::Applications::Apps::SettingSetDate: - screen_lbl = "SettingSetDate"; - break; - case Pinetime::Applications::Apps::SettingSetTime: - screen_lbl = "SettingSetTime"; + case Pinetime::Applications::Apps::SettingSetDateTime: + screen_lbl = "SettingSetDateTime"; break; case Pinetime::Applications::Apps::SettingChimes: screen_lbl = "SettingChimes"; From 45500e8f326199680ad2b8aa1b42fc983383fdcc Mon Sep 17 00:00:00 2001 From: Reinhold Gschweicher Date: Sun, 15 Jan 2023 22:39:46 +0100 Subject: [PATCH 2/2] InfiniTime: Update for Combined Date and Time Settings Update to develop branch after https://github.com/InfiniTimeOrg/InfiniTime/pull/1465 got merged. --- InfiniTime | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/InfiniTime b/InfiniTime index b56c5f2..a7f8b59 160000 --- a/InfiniTime +++ b/InfiniTime @@ -1 +1 @@ -Subproject commit b56c5f25f077d17b23677cdd0d4dc247ce7c421f +Subproject commit a7f8b59bfb1641dea7f30a267c6bf7e882d9edbf