From b1d70ae2ed57fe924d75ad221273a15504eac013 Mon Sep 17 00:00:00 2001 From: Lionel Elie Mamane Date: Sat, 9 Nov 2024 20:09:27 +0100 Subject: [PATCH 1/3] remove unused include --- src/displayapp/screens/Timer.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/displayapp/screens/Timer.h b/src/displayapp/screens/Timer.h index 0cb2bb0802..a07c729b4d 100644 --- a/src/displayapp/screens/Timer.h +++ b/src/displayapp/screens/Timer.h @@ -1,7 +1,6 @@ #pragma once #include "displayapp/screens/Screen.h" -#include "components/datetime/DateTimeController.h" #include "systemtask/SystemTask.h" #include "displayapp/LittleVgl.h" #include "displayapp/widgets/Counter.h" From 79ee8869043bd9d86af17dc93ba40f6c2096f934 Mon Sep 17 00:00:00 2001 From: Lionel Elie Mamane Date: Sat, 9 Nov 2024 20:07:19 +0100 Subject: [PATCH 2/3] spelling --- src/components/datetime/DateTimeController.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/datetime/DateTimeController.h b/src/components/datetime/DateTimeController.h index 5a453f2060..a005f9ac43 100644 --- a/src/components/datetime/DateTimeController.h +++ b/src/components/datetime/DateTimeController.h @@ -41,7 +41,7 @@ namespace Pinetime { * * used to update difference between utc and local time (see UtcOffset()) * - * parameters are in quarters of an our. Following the BLE CTS specification, + * parameters are in quarters of an hour. Following the BLE CTS specification, * timezone is expected to be constant over DST which will be reported in * dst field. */ From 2105a7b63da8d4065ebfc62e0057f225358eedfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Milants?= Date: Tue, 3 Dec 2024 20:11:08 +0100 Subject: [PATCH 3/3] Set version to 1.15.0 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b5669b003..3250982d6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10) set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose Debug or Release") -project(pinetime VERSION 1.14.0 LANGUAGES C CXX ASM) +project(pinetime VERSION 1.15.0 LANGUAGES C CXX ASM) set(CMAKE_C_STANDARD 99) set(CMAKE_CXX_STANDARD 20)