Merge branch 'main' into simple-calculator

InfiniTimeOrg · Dec 7, 2024 · f871487 · f871487
2 parents 9e3c665 + 2105a7b
commit f871487
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git 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)

diff --git 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.
        */

diff --git 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"