Add a sleep tracker/smart alarm app

.devcontainer.json

@@ -2,7 +2,8 @@
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.154.2/containers/cpp
 {
 	"build": {
-		"dockerfile": "docker/Dockerfile"
+		"dockerfile": "docker/Dockerfile",
+		"context": "docker",
 	},
 	"customizations": {
 		"vscode": {

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.15.0 LANGUAGES C CXX ASM)
+project(pinetime VERSION 1.16.0 LANGUAGES C CXX ASM)
 
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_CXX_STANDARD 20)
@@ -31,6 +31,10 @@ if(BUILD_RESOURCES)
   set(BUILD_RESOURCES true)
 endif()
 
+if(ENABLE_CCACHE)
+  include(cmake/ccache.cmake)
+endif()
+
 set(TARGET_DEVICE "PINETIME" CACHE STRING "Target device")
 set_property(CACHE TARGET_DEVICE PROPERTY STRINGS PINETIME MOY_TFK5 MOY_TIN5 MOY_TON5 MOY_UNK)
 

CMakePresets.json

@@ -0,0 +1,72 @@
+{
+  "version": 3,
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 22,
+    "patch": 0
+  },
+  "configurePresets": [
+    {
+      "name": "base",
+      "description": "Default build using devcontainer tools",
+      "generator": "Ninja",
+      "hidden": true,
+      "cacheVariables": {
+        "ARM_NONE_EABI_TOOLCHAIN_PATH": {
+          "type": "PATH",
+          "value": "/opt/gcc-arm-none-eabi-10.3-2021.10"
+        },
+        "NRF5_SDK_PATH": {
+          "type": "PATH",
+          "value": "/opt/nRF5_SDK_15.3.0_59ac345"
+        },
+        "BUILD_DFU": {
+          "type": "BOOL",
+          "value": "ON"
+        },
+        "BUILD_RESOURCES": {
+          "type": "BOOL",
+          "value": "ON"
+        },
+        "TARGET_DEVICE": {
+          "type": "STRING",
+          "value": "PINETIME"
+        },
+        "ENABLE_CCACHE": {
+          "type": "BOOL",
+          "value": true
+        }
+      }
+    },
+    {
+      "name": "pinetime-debug",
+      "inherits": "base",
+      "displayName": "Pinetime Debug",
+      "description": "Debug build using Ninja",
+      "binaryDir": "build/debug",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug"
+      }
+    },
+    {
+      "name": "pinetime-release",
+      "inherits": "base",
+      "displayName": "Pinetime Release",
+      "description": "Release build using Ninja",
+      "binaryDir": "build/release",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release"
+      }
+    }
+  ],
+  "buildPresets": [
+    {
+      "name": "pinetime-release",
+      "configurePreset": "pinetime-release"
+    },
+    {
+      "name": "pinetime-debug",
+      "configurePreset": "pinetime-debug"
+    }
+  ]
+}

build.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set euo -pipefail
+
+cmake --preset pinetime-release
+cmake --build --preset pinetime-release

cmake/ccache.cmake

@@ -0,0 +1,14 @@
+find_program(CCACHE_EXECUTABLE ccache)
+
+if (CCACHE_EXECUTABLE)
+    message(STATUS "Activating ccache compiler cache.")
+    set(ccacheEnv
+        CCACHE_SLOPPINESS=pch_defines
+    )
+    foreach (lang IN ITEMS C CXX)
+        set(CMAKE_${lang}_COMPILER_LAUNCHER
+            ${CMAKE_COMMAND} -E env ${ccacheEnv} ${CCACHE_EXECUTABLE}
+        )
+    endforeach ()
+    message(WARNING "Ccache could not be activated because ccache executable was not found.")
+endif ()

docker/Dockerfile

@@ -12,14 +12,17 @@ RUN apt-get update -qq \
 # x86_64 / generic packages
       bash \
       build-essential \
+      ccache \
       cmake \
       git \
       make \
+      ninja-build \
       nodejs \
       python3 \
       python3-pip \
       python3-pil \
       python-is-python3 \
+      sudo \
       tar \
       unzip \
       wget \
@@ -62,8 +65,8 @@ RUN bash -c "source /opt/build.sh; GetNrfSdk;"
 # McuBoot
 RUN bash -c "source /opt/build.sh; GetMcuBoot;"
 
-# Add the infinitime user for connecting devcontainer
-RUN adduser infinitime
+# Add the infinitime user with sudo password "it" for developing in devcontainer
+RUN adduser infinitime && echo "infinitime:it" | chpasswd && usermod -aG sudo infinitime
 
 # Configure Git to accept the /sources directory as safe
 RUN git config --global --add safe.directory /sources

src/CMakeLists.txt

@@ -42,6 +42,7 @@ set(SDK_SOURCE_FILES
         "${NRF5_SDK_PATH}/modules/nrfx/drivers/src/nrfx_gpiote.c"
         "${NRF5_SDK_PATH}/modules/nrfx/soc/nrfx_atomic.c"
         "${NRF5_SDK_PATH}/modules/nrfx/drivers/src/nrfx_saadc.c"
+        "${NRF5_SDK_PATH}/modules/nrfx/drivers/src/nrfx_pwm.c"
 
         # FreeRTOS
         ${NRF5_SDK_PATH}/external/freertos/source/croutine.c
@@ -380,6 +381,7 @@ list(APPEND SOURCE_FILES
         displayapp/screens/Metronome.cpp
         displayapp/screens/Motion.cpp
         displayapp/screens/Weather.cpp
+        displayapp/screens/Calculator.cpp
         displayapp/screens/FirmwareValidation.cpp
         displayapp/screens/ApplicationList.cpp
         displayapp/screens/Notifications.cpp
@@ -395,6 +397,7 @@ list(APPEND SOURCE_FILES
         displayapp/screens/PassKey.cpp
         displayapp/screens/Error.cpp
         displayapp/screens/Alarm.cpp
+        displayapp/screens/Sleep.cpp
         displayapp/screens/Styles.cpp
         displayapp/screens/WeatherSymbols.cpp
         displayapp/Colors.cpp
@@ -467,6 +470,7 @@ list(APPEND SOURCE_FILES
         components/settings/Settings.cpp
         components/timer/Timer.cpp
         components/alarm/AlarmController.cpp
+        components/infinisleep/InfiniSleepController.cpp
         components/fs/FS.cpp
         drivers/Cst816s.cpp
         FreeRTOS/port.c
@@ -536,6 +540,7 @@ list(APPEND RECOVERY_SOURCE_FILES
         components/settings/Settings.cpp
         components/timer/Timer.cpp
         components/alarm/AlarmController.cpp
+        components/infinisleep/InfiniSleepController.cpp
         drivers/Cst816s.cpp
         FreeRTOS/port.c
         FreeRTOS/port_cmsis_systick.c
@@ -613,6 +618,7 @@ set(INCLUDE_FILES
         displayapp/screens/Timer.h
         displayapp/screens/Dice.h
         displayapp/screens/Alarm.h
+        displayapp/screens/Sleep.h
         displayapp/Colors.h
         displayapp/widgets/Counter.h
         displayapp/widgets/PageIndicator.h
@@ -655,6 +661,7 @@ set(INCLUDE_FILES
         components/settings/Settings.h
         components/timer/Timer.h
         components/alarm/AlarmController.h
+        components/infinisleep/InfiniSleepController.h
         drivers/Cst816s.h
         FreeRTOS/portmacro.h
         FreeRTOS/portmacro_cmsis.h

src/FreeRTOSConfig.h

@@ -62,6 +62,7 @@
 #define configTICK_RATE_HZ                      1024
 #define configMAX_PRIORITIES                    (3)
 #define configMINIMAL_STACK_SIZE                (120)
+#define configTOTAL_HEAP_SIZE                   (1024 * 39)
 #define configMAX_TASK_NAME_LEN                 (4)
 #define configUSE_16_BIT_TICKS                  0
 #define configIDLE_SHOULD_YIELD                 1