resolves conflicts

2022-01-02 22:27:43 +00:00 · 2022-01-02 22:27:43 +00:00 · cc259b6a4a
parent 94561b2331 e0013e7304
commit cc259b6a4a
236 changed files with 4120 additions and 1555 deletions
--- a/.clang-tidy
+++ b/.clang-tidy
@ -1,6 +1,7 @@
 Checks: '*,
  -altera-unroll-loops,
  -llvmlibc-callee-namespace,
  -llvmlibc-implementation-in-namespace,
  -llvmlibc-restrict-system-libc-headers,
  -llvm-header-guard,
  -llvm-namespace-comment,
@ -8,6 +9,7 @@ Checks: '*,
  -google-runtime-int,
  -google-readability-namespace-comments,
  -fuchsia-statically-constructed-objects,
  -cppcoreguidelines-prefer-member-initializer,
  -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
  -cppcoreguidelines-pro-bounds-constant-array-index,
  -cppcoreguidelines-pro-type-static-cast-downcast,
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@ -12,7 +12,9 @@
 	// Set *default* container specific settings.json values on container create.
 	"settings": { 
-		"terminal.integrated.shell.linux": "/bin/bash"
+		"terminal.integrated.shell.linux": "/bin/bash",
 		"editor.formatOnSave": true,
 		"clang-format.executable": "clang-format-12"
 	},
 	// Add the IDs of extensions you want installed when the container is created.
@ -33,4 +35,4 @@
 	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	// "remoteUser": "vscode"
 	"remoteUser": "infinitime"
-}
+}
--- a/.github/ISSUE_TEMPLATE/bug-report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yaml
@ -9,6 +9,7 @@ body:
        *Please, before opening a bug report, check if similar issues already exist. In that case, use those issues to provide your feedback instead.*
  - type: checkboxes
    attributes:
      label: Verification
      options:
      - label: I searched for similar bug reports and found none was relevant.
        required: true
--- a/.github/ISSUE_TEMPLATE/feature-request.yaml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yaml
@ -9,6 +9,7 @@ body:
        *Please, before opening a feature request, check if similar issues already exist. In that case, use those issues to provide your feedback instead.*
  - type: checkboxes
    attributes:
      label: Verification
      options:
      - label: I searched for similar feature request and found none was relevant.
        required: true
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -113,7 +113,7 @@ jobs:
        run:  |
          mkdir -p build
          cd build
-          cmake -DARM_NONE_EABI_TOOLCHAIN_PATH=${{ runner.temp }}/arm-none-eabi -DNRF5_SDK_PATH=${{ runner.temp }}/nrf5_sdk -DUSE_OPENOCD=1 -DBUILD_DFU=1 ../
+          cmake -G Ninja -DARM_NONE_EABI_TOOLCHAIN_PATH=${{ runner.temp }}/arm-none-eabi -DNRF5_SDK_PATH=${{ runner.temp }}/nrf5_sdk -DUSE_OPENOCD=1 -DBUILD_DFU=1 ../
        #########################################################################################
        # Make and Upload DFU Package
@ -125,8 +125,7 @@ jobs:
      - name: Make pinetime-mcuboot-app
        run:  |
-          cd build
+          cmake --build build --target pinetime-mcuboot-app
          make pinetime-mcuboot-app
      - name: Unzip DFU package
        run:  |
@ -144,8 +143,7 @@ jobs:
      - name: Make pinetime-app
        run:  |
-          cd build
+          cmake --build build --target pinetime-app
          make pinetime-app
      - name: Upload standalone firmware
        uses: actions/upload-artifact@v2
@ -158,8 +156,7 @@ jobs:
      - name: Make pinetime-recovery
        run:  |
-          cd build
+          cmake --build build --target pinetime-recovery
          make pinetime-recovery
      #########################################################################################
      # Finish
--- a/.gitignore
+++ b/.gitignore
@ -43,3 +43,7 @@ Testing/Temporary/
 #VSCODE
 .vscode/.cortex-debug.registers.state.json
 .vscode/.cortex-debug.peripherals.state.json
 #build files
 src/nRF5_SDK_15.3.0_59ac345
 src/arm-none-eabi
--- a/.gitmodules
+++ b/.gitmodules
@ -4,3 +4,6 @@
 [submodule "src/libs/littlefs"]
 	path = src/libs/littlefs
 	url = https://github.com/littlefs-project/littlefs.git
 [submodule "src/libs/QCBOR"]
 	path = src/libs/QCBOR
 	url = https://github.com/laurencelundblade/QCBOR.git
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.10)
-project(pinetime VERSION 1.6.0 LANGUAGES C CXX ASM)
+project(pinetime VERSION 1.7.1 LANGUAGES C CXX ASM)
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_CXX_STANDARD 14)
--- a/README.md
+++ b/README.md
@ -1,81 +1,33 @@
-# InfiniTime
+# [InfiniTime](https://github.com/InfiniTimeOrg/InfiniTime)
 [![Build PineTime Firmware](https://github.com/InfiniTimeOrg/InfiniTime/workflows/Build%20PineTime%20Firmware/badge.svg?branch=master)](https://github.com/InfiniTimeOrg/InfiniTime/actions)
-![InfiniTime logo](images/infinitime-logo.jpg "InfiniTime Logo")
+![InfiniTime logo](images/infinitime-logo-small.jpg "InfiniTime Logo")
-The goal of this project is to design an open-source firmware for the [Pinetime smartwatch](https://www.pine64.org/pinetime/) :
+Fast open-source firmware for the [PineTime smartwatch](https://www.pine64.org/pinetime/) with many features, written in modern C++.
 - Code written in **modern C++**;
 - Build system based on **CMake**;
 - Based on **[FreeRTOS 10.0.0](https://freertos.org)** real-time OS.
 - Using **[LittleVGL/LVGL 7](https://lvgl.io/)** as UI library...
 - ... and **[NimBLE 1.3.0](https://github.com/apache/mynewt-nimble)** as BLE stack.
 ## New to InfiniTime?
- - [Getting started with InfiniTime 1.0 (quick user guide, update bootloader and InfiniTime,...)](doc/gettingStarted/gettingStarted-1.0.md)
+ - [Getting started with InfiniTime](doc/gettingStarted/gettingStarted-1.0.md)
- - [Flash, upgrade (OTA), time synchronization,...](doc/gettingStarted/ota-gadgetbridge-nrfconnect.md)
+ - [Updating the software](doc/gettingStarted/updating-software.md)
 - [About the firmware and bootloader](doc/gettingStarted/about-software.md)
 ### Companion apps
 - [Gadgetbridge](https://gadgetbridge.org/) (Android)
 - [AmazFish](https://openrepos.net/content/piggz/amazfish/) (SailfishOS)
 - [Siglo](https://github.com/alexr4535/siglo) (Linux)
 - [InfiniLink](https://github.com/xan-m/InfiniLink) **[Experimental]** (iOS)
-## Overview
+## Development
 ![Pinetime screens](images/1.0.0/collage.png "PinetimeScreens")
 As of now, here is the list of achievements of this project:
 - Fast and optimized LCD driver
 - BLE communication
 - Rich user interface via display, touchscreen and pushbutton
 - Time synchronization via BLE
 - Notification via BLE
 - Heart rate measurements
 - Step counting
 - Wake-up on wrist rotation
 - Quick actions
    * Disable vibration on notification
    * Brightness settings
    * Flashlight
    * Settings
 - 3 watch faces:
    * Digital
    * Analog
    * [PineTimeStyle](https://wiki.pine64.org/wiki/PineTimeStyle)
 - Multiple 'apps' :
    * Music (control the playback of music on your phone)
    * Heart rate (measure your heart rate)
    * Navigation (displays navigation instructions coming from the companion app)
    * Notification (displays the last notification received)
    * Paddle (single player pong-like game)
    * Twos (2048 clone game)
    * Stopwatch
    * Steps (displays the number of steps taken)
    * Timer (set a countdown timer that will notify you when it expires)
    * Metronome (vibrates to a given bpm with a customizable beats per bar)
 - User settings:
    * Display timeout
    * Wake-up condition
    * Time format (12/24h)
    * Default watch face
    * Daily step goal
    * Battery status
    * Firmware validation
    * System information
 - Supported by 3 companion apps (development is in progress):
    * [Gadgetbridge](https://codeberg.org/Freeyourgadget/Gadgetbridge/) (on Android via F-Droid)
    * [Amazfish](https://openrepos.net/content/piggz/amazfish) (on SailfishOS and Linux)
    * [Siglo](https://github.com/alexr4535/siglo) (on Linux)
    * **[Experimental]** [WebBLEWatch](https://hubmartin.github.io/WebBLEWatch/) Synchronize time directly from your web browser. [video](https://youtu.be/IakiuhVDdrY)
    * **[Experimental]** [InfiniLink](https://github.com/xan-m/InfiniLink) (on iOS)
 - OTA (Over-the-air) update via BLE
 - [Bootloader](https://github.com/JF002/pinetime-mcuboot-bootloader) based on [MCUBoot](https://www.mcuboot.com)
 ## Documentation
 ### Develop
 - [Rough structure of the code](doc/code/Intro.md)
 - [How to implement an application](doc/code/Apps.md)
 - [Generate the fonts and symbols](src/displayapp/fonts/README.md)
 - [Creating a stopwatch in Pinetime(article)](https://pankajraghav.com/2021/04/03/PINETIME-STOPCLOCK.html)
 - [Tips on designing an app UI](doc/ui_guidelines.md)
 ### Contributing
 - [How to contribute?](/doc/contribute.md)
 - [Coding conventions](/doc/coding-convention.md)
 ### Build, flash and debug
@ -84,16 +36,11 @@ As of now, here is the list of achievements of this project:
 - [Files included in the release notes](doc/filesInReleaseNotes.md)
 - [Build the project](doc/buildAndProgram.md)
 - [Flash the firmware using OpenOCD and STLinkV2](doc/openOCD.md)
 - [Flash the firmware using SWD interface](doc/SWD.md)
 - [Build the project with Docker](doc/buildWithDocker.md)
 - [Build the project with VSCode](doc/buildWithVScode.md)
 - [Bootloader, OTA and DFU](./bootloader/README.md)
 - [Stub using NRF52-DK](./doc/PinetimeStubWithNrf52DK.md)
 - Logging with JLink RTT.
 - Using files from the releases
 ### Contribute
 - [How to contribute ?](doc/contribute.md)
 ### API
@ -103,30 +50,6 @@ As of now, here is the list of achievements of this project:
 - [Memory analysis](./doc/MemoryAnalysis.md)
 ### Using the firmware
 - [Integration with Gadgetbridge](doc/companionapps/Gadgetbridge.md)
 - [Integration with AmazFish](doc/companionapps/Amazfish.md)
 - [Firmware update, OTA](doc/companionapps/NrfconnectOTA.md)
 ## TODO - contribute
 This project is far from being finished, and there are still a lot of things to do for this project to become a firmware usable by the general public.
 Here a quick list out of my head of things to do for this project:
 - Improve BLE communication stability and reliability
 - Improve OTA and MCUBoot bootloader
 - Add more functionalities : Alarm, chronometer, configuration, activities, heart rate logging, games,...
 - Add more BLE functionalities : call notifications, agenda, configuration, data logging,...
 - Measure power consumption and improve battery life
 - Improve documentation, take better pictures and video than mine
 - Improve the UI
 - Create companion app for multiple OSes (Linux, Android, iOS) and platforms (desktop, ARM, mobile). Do not forget the other devices from Pine64 like [the Pinephone](https://www.pine64.org/pinephone/) and the [Pinebook Pro](https://www.pine64.org/pinebook-pro/).
 - Design a simple CI (preferably self-hosted and easy to reproduce).
 Do not hesitate to clone/fork the code, hack it and create pull-requests. I'll do my best to review and merge them :)
 ## Licenses
 This project is released under the GNU General Public License version 3 or, at your option, any later version.
--- a/bootloader/README.md
+++ b/bootloader/README.md
@ -115,8 +115,6 @@ sudo dfu.py -z /home/jf/nrf52/bootloader/dfu.zip -a <pinetime MAC address> --leg
 **Note** : dfu.py is a slightly modified version of [this repo](https://github.com/daniel-thompson/ota-dfu-python).
 See [this page](../doc/CompanionApps/NrfconnectOTA.md) for more info about OTA with NRFConect
 ### Firmware validation
 Once the OTA is done, InfiniTime will reset the watch to apply the update. When the watch reboots, the new firmware is running.
@ -126,12 +124,12 @@ If the new firmware is working correctly, open the application menu and tap on t
 Firmware validation application in the menu:
-![Firmware Validation App](../doc/CompanionApps/firmwareValidationApp.jpg "Firmware Validation App")
+![Firmware Validation App](../doc/bootloader/firmwareValidationApp.jpg "Firmware Validation App")
 The firmware is not validated yet. Tap 'Validate' to validate it, or 'Reset' to rollback to the previous version.
-![Firmware Not Validated](../doc/CompanionApps/firmwareNoValidated.jpg "Firmware Not Validated")
+![Firmware Not Validated](../doc/bootloader/firmwareNoValidated.jpg "Firmware Not Validated")
 The firmware is validated!
-![Firmware Validated](../doc/CompanionApps/firmwareValidated.jpg "Firmware Validated")
+![Firmware Validated](../doc/bootloader/firmwareValidated.jpg "Firmware Validated")
--- a/doc/BLEFS.md
+++ b/doc/BLEFS.md
@ -0,0 +1,167 @@
 # BLE FS
 ---
 The BLE FS protocol in InfiniTime is mostly Adafruit's BLE file transfer protocol, as described in [adafruit/Adafruit_CircuitPython_BLE_File_Transfer](https://github.com/adafruit/Adafruit_CircuitPython_BLE_File_Transfer). There are some deviations, such as the status codes. These will be described later in the document.
 ---
 ## UUIDs
 There are two relevant UUIDs in this protocol: the version characteristic, and the raw transfer characteristic.
 ### Version
 UUID: `adaf0100-4669-6c65-5472-616e73666572`
 The version characteristic returns the version of the protocol to which the sender adheres. It returns a single unsigned 32-bit integer. The latest version at the time of writing this is 4. 
 ### Transfer
 UUID: `adaf0200-4669-6c65-5472-616e73666572`
 The transfer characteristic is responsible for all the data transfer between the client and the watch. It supports write and notify. Writing a packet on the characteristic results in a response via notify.
 ---
 ## Usage
 The separator for paths is `/`, and absolute paths must start with `/`.
 All of the following commands and responses are transferred via the transfer characteristic
 ### Read file
 To begin reading a file, a header must first be sent. The header packet should be formatted like so:
 - Command (single byte): `0x10`
 - 1 byte of padding
 - Unsigned 16-bit integer encoding the length of the file path.
 - Unsigned 32-bit integer encoding the location at which to start reading the first chunk.
 - Unsigned 32-bit integer encoding the amount of bytes to be read.
 - File path: UTF-8 encoded string that is _not_ null terminated.
 To continue reading the file after this initial packet, the following packet should be sent until all the data has been received. No close command is required after the data has been received.
 - Command (single byte): `0x12`
 - Status: `0x01`
 - 2 bytes of padding
 - Unsigned 32-bit integer encoding the location at which to start reading the next chunk.
 - Unsigned 32-bit integer encoding the amount of bytes to be read. This may be different from the size in the header.
 Both of these commands receive the following response:
 - Command (single byte): `0x11`
 - Status (signed 8-bit integer)
 - 2 bytes of padding
 - Unsigned 32-bit integer encoding the offset of this chunk
 - Unsigned 32-bit integer encoding the total size of the file
 - Unsigned 32-bit integer encoding the amount of data in the current chunk
 - Contents of the current chunk
 ### Write file
 To begin writing to a file, a header must first be sent. The header packet should be formatted like so:
 - Command (single byte): `0x20`
 - 1 byte of padding
 - Unsigned 16-bit integer encoding the length of the file path.
 - Unsigned 32-bit integer encoding the location at which to start writing to the file.
 - Unsigned 64-bit integer encoding the unix timestamp with nanosecond resolution. This will be used as the modification time. At the time of writing, this is not implemented in InfiniTime, but may be in the future.
 - Unsigned 32-bit integer encoding the size of the file that will be sent
 - File path: UTF-8 encoded string that is _not_ null terminated.
 To continue reading the file after this initial packet, the following packet should be sent until all the data has been sent and a response had been received with 0 free space. No close command is required after the data has been received.
 - Command (single byte): `0x22`
 - Status: `0x01`
 - 2 bytes of padding.
 - Unsigned 32-bit integer encoding the location at which to write the next chunk.
 - Unsigned 32-bit integer encoding the amount of bytes to be written.
 - Data
 Both of these commands receive the following response:
 - Command (single byte): `0x21`
 - Status (signed 8-bit integer)
 - 2 bytes of padding
 - Unsigned 32-bit integer encoding the current offset in the file
 - Unsigned 64-bit integer encoding the unix timestamp with nanosecond resolution. This will be used as the modification time. At the time of writing, this is not implemented in InfiniTime, but may be in the future.
 - Unsigned 32-bit integer encoding the amount of data the client can send until the file is full.
 ### Delete file
 - Command (single byte): `0x30`
 - 1 byte of padding
 - Unsigned 16-bit integer encoding the length of the file path.
 - File path: UTF-8 encoded string that is _not_ null terminated.
 The response to this packet will be as follows:
 - Command (single byte): `0x31`
 - Status (signed 8-bit integer)
 ### Make directory
 - Command (single byte): `0x40`
 - 1 byte of padding
 - Unsigned 16-bit integer encoding the length of the file path.
 - 4 bytes of padding
 - Unsigned 64-bit integer encoding the unix timestamp with nanosecond resolution.
 - File path: UTF-8 encoded string that is _not_ null terminated.
 The response to this packet will be as follows:
 - Command (single byte): `0x41`
 - Status (signed 8-bit integer)
 - 6 bytes of padding
 - Unsigned 64-bit integer encoding the unix timestamp with nanosecond resolution.
 ### List directory
 Paths returned by this command are relative to the path given in the request
 - Command (single byte): `0x50`
 - 1 byte of padding
 - Unsigned 16-bit integer encoding the length of the file path.
 - File path: UTF-8 encoded string that is _not_ null terminated.
 The response to this packet will be as follows. Responses will be sent until the final entry, which will have entry number ==  total entries
 - Command (single byte): `0x51`
 - Status (signed 8-bit integer)
 - Unsigned 16-bit integer encoding the length of the file path.
 - Unsigned 32-bit integer encoding the entry number
 - Unsigned 32-bit integer encoding the total amount of entries
 - Flags: unsigned 32-bit integer
 	+ Bit 0: Set when entry is a directory
 	+ Bits 1-7: Reserved
 - Unsigned 64-bit integer encoding the unix timestamp  of the modification time with nanosecond resolution
 - Unsigned 32-bit integer encoding the size of the file
 - Path: UTF-8 encoded string that is _not_ null terminated.
 ### Move file or directory
 - Command (single byte): `0x60`
 - 1 byte of padding
 - Unsigned 16-bit integer encoding the length of the old path
 - Unsigned 16-bit integer encoding the length of the new path
 - Old path: UTF-8 encoded string that is _not_ null terminated.
 - 1 byte of padding
 - Newpath: UTF-8 encoded string that is _not_ null terminated.
 The response to this packet will be as follows:
 - Command (single byte): `0x61`
 - Status (signed 8-bit integer)
 ---
 ## Deviations
 This section describes the differences between Adafruit's spec and InfiniTime's implementation.
 ### Status codes
 The status codes returned by InfiniTime are a signed 8-bit integer, rather than an unsigned one as described in the spec.
 InfiniTime uses LittleFS error codes rather than the ones described in the spec. Those codes can be found in [lfs.h](https://github.com/littlefs-project/littlefs/blob/master/lfs.h#L70).
--- a/doc/MemoryAnalysis.md
+++ b/doc/MemoryAnalysis.md
@ -32,13 +32,13 @@ In this analysis, I used [Linkermapviz](https://github.com/PromyLOPh/linkermapvi
 ### Linkermapviz
-[Linkermapviz](https://github.com/PromyLOPh/linkermapviz) parses the MAP file and displays its content in a graphical way into an HTML page:
+[Linkermapviz](https://github.com/PromyLOPh/linkermapviz) parses the MAP file and displays its content on an HTML page as a graphic:
 ![linkermapviz](./memoryAnalysis/linkermapviz.png)
-Using this tool, you can easily see the size of each symbol relative to the other one, and check what is using most of the space,...
+Using this tool, you can compare the relative size of symbols. This can be helpful for checking memory usage at a glance.
-Also, as Linkermapviz is written in Python, you can easily modify it to adapt it to your firmware, export data in another format,... For example, [I modified it to parse the contents of the MAP file and export it in a CSV file](https://github.com/InfiniTimeOrg/InfiniTime/issues/313#issuecomment-842338620). I could later on open this file in LibreOffice Calc and use sort/filter functionality to search for specific symbols in specific files...
+Also, as Linkermapviz is written in Python, you can easily modify and adapt it to your firmware or export data in another format. For example, [here it is modified to parse the contents of the MAP file and export it in a CSV file](https://github.com/InfiniTimeOrg/InfiniTime/issues/313#issuecomment-842338620). This file could later be opened in LibreOffice Calc where sort/filter functionality could be used to search for specific symbols in specific files...
 ### Puncover
 [Puncover](https://github.com/HBehrens/puncover) is another useful tools that analyses the binary file generated by the compiler (the .out file that contains all debug information). It provides valuable information about the symbols (data and code): name, position, size, max stack of each functions, callers, callees...
@ -46,8 +46,8 @@ Also, as Linkermapviz is written in Python, you can easily modify it to adapt it
 Puncover is really easy to install:
- - clone the repo and cd into the cloned directory
+ - Clone the repo and cd into the cloned directory
- - setup a venv
+ - Setup a venv
    - `python -m virtualenv venv` 
    - `source venv/bin/activate`
 - Install : `pip install .`
@ -60,13 +60,13 @@ Puncover is really easy to install:
 - Launch a browser at http://localhost:5000/
 ### Analysis
-Using the MAP file and tools, we can easily see what symbols are using most of the FLASH memory space. In this case, with no surprise, fonts and graphics are the biggest flash space consumer.
+Using the MAP file and tools, we can easily see what symbols are using most of the flash memory. In this case, unsuprisingly, fonts and graphics are the largest use of flash memory.
 ![Puncover](./memoryAnalysis/puncover-all-symbols.png)
-This way, you can easily check what needs to be optimized : we should find a way to store big static data (like fonts and graphics) in the external flash memory, for example.
+This way, you can easily check what needs to be optimized. We should find a way to store big static data (like fonts and graphics) in the external flash memory, for example.
-It's always a good idea to check the flash memory space when working on the project : this way, you can easily check that your developments are using a reasonable amount of space. 
+It's always a good idea to check the flash memory space when working on the project. This way, you can easily check that your developments are using a reasonable amount of space. 
 ### Links
 - Analysis with linkermapviz : https://github.com/InfiniTimeOrg/InfiniTime/issues/313#issuecomment-842338620
@ -210,7 +210,7 @@ NRF_LOG_INFO("heap : %d", m.uordblks);
 ```
 #### Analysis
-According to my experimentation, InfiniTime uses ~6000bytes of heap most of the time. Except when the Navigation app is launched, where the heap usage increases to... more than 9500 bytes (meaning that the heap overflows and could potentially corrupt the stack!!!). This is a bug that should be fixed in #362.
+According to my experimentation, InfiniTime uses ~6000bytes of heap most of the time. Except when the Navigation app is launched, where the heap usage exceeds 9500 bytes (meaning that the heap overflows and could potentially corrupt the stack). This is a bug that should be fixed in #362.
 To know exactly what's consuming heap memory, you can `wrap` functions like `malloc()` into your own functions. In this wrapper, you can add logging code or put breakpoints:
@ -245,7 +245,7 @@ Using this technique, I was able to trace all malloc calls at boot (boot -> digi
 - https://www.embedded.com/mastering-stack-and-heap-for-system-reliability-part-3-avoiding-heap-errors/
 ## LVGL
-I did a deep analysis of the usage of the buffer dedicated for lvgl (managed by lv_mem).
+I did a deep analysis of the usage of the buffer dedicated to lvgl (managed by lv_mem).
 This buffer is used by lvgl to allocated memory for drivers (display/touch), screens, themes, and all widgets created by the apps.
 The usage of this buffer can be monitored using this code :
@ -256,7 +256,7 @@ lv_mem_monitor(&mon);
 NRF_LOG_INFO("\t Free %d / %d -- max %d", mon.free_size, mon.total_size, mon.max_used);
 ```
-The most interesting metric is `mon.max_used` which specifies the maximum number of bytes that were used from this buffer since the initialization of lvgl.
+The most interesting metric is `mon.max_used` which specifies the maximum number of bytes used from this buffer since the initialization of lvgl.
 According to my measurements, initializing the theme, display/touch driver and screens cost **4752** bytes!
 Then, initializing the digital clock face costs **1541 bytes**.
 For example a simple lv_label needs **~140 bytes** of memory.
--- a/doc/MotionService.md
+++ b/doc/MotionService.md
@ -3,13 +3,13 @@
 The motion service exposes step count and raw X/Y/Z motion value as READ and NOTIFY characteristics.
 ## Service
-The service UUID is **00020000-78fc-48fe-8e23-433b3a1942d0**
+The service UUID is **00030000-78fc-48fe-8e23-433b3a1942d0**
 ## Characteristics
-### Step count (UUID 00020001-78fc-48fe-8e23-433b3a1942d0)
+### Step count (UUID 00030001-78fc-48fe-8e23-433b3a1942d0)
 The current number of steps represented as a single `uint32_t` (4 bytes) value.
-### Raw motion values (UUID 00020002-78fc-48fe-8e23-433b3a1942d0)
+### Raw motion values (UUID 00030002-78fc-48fe-8e23-433b3a1942d0)
 The current raw motion values. This is a 3 `int16_t` array:
 - [0] : X
--- a/doc/NavigationService.md
+++ b/doc/NavigationService.md
@ -1,6 +1,6 @@
 # Navigation Service
 ## Introduction
-The navigation ble service provides 4 characteristics to allow the the watch to display navigation instructions from a companion application.  The intended purpose is when performing some outdoor activities, for example running or cycling.
+The navigation ble service provides 4 characteristics to allow the watch to display navigation instructions from a companion application. This service is intended to be used when performing some outdoor activities, for example running or cycling.
 The 4 characteristics are:
 flag (string) - Upcoming icon name
@ -22,7 +22,7 @@ This is a client supplied string describing the upcoming instruction such as "At
 This is a short string describing the distance to the upcoming instruction such as "50 m".
 ## Progress (UUID 00010004-78fc-48fe-8e23-433b3a1942d0)
-The percent complete in a uint8.  The watch displays this as an overall progress in a progress bar.
+The percent complete in a uint8. The watch displays this as an overall progress in a progress bar.
 ## Full icon list
 * arrive
--- a/doc/PinetimeStubWithNrf52DK.md
+++ b/doc/PinetimeStubWithNrf52DK.md
@ -1,11 +1,11 @@
 # Build a stub for PineTime using NRF52-DK
-[NRF52-DK](https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52-DK) is the official developpment kit for NRF52832 SoC from Nordic Semiconductor.
+[NRF52-DK](https://www.nordicsemi.com/Software-and-Tools/Development-Kits/nRF52-DK) is the official developpment kit for the NRF52832 SoC from Nordic Semiconductor used in the PineTime.
-It can be very useful for PineTime development:
+This development kit can be very useful for PineTime development:
- * You can use it embedded JLink SWD programmer/debugger to program and debug you code on the PineTime
+ * You can use its embedded JLink SWD programmer/debugger to program and debug your code on the PineTime
- * As it's based on the same SoC than the PineTime, you can program it to actually run the same code than the PineTime. 
+ * As it's based on the same SoC than the PineTime, you can program it to actually run the same code as the PineTime. 
-This page is about the 2nd point : we will build a stub that will allow us to run the same code than the one you could run on the PineTime. This will allow you to work more easily if you don't have a PineTime dev kit around, if you don't want to modify your dev kit for SWD programming, or if you want to use some feature from the DK (like power measurement).
+This page is about the 2nd point. We will build a stub that will allow us to run the same code you can run on the PineTime. This will allow you to work more easily if you don't have a PineTime dev kit around, if you don't want to modify your dev kit for SWD programming, or if you want to use some feature from the NRF52-DK (like power measurement).
 This stub only implements the display, the button and the BLE radio. The other features from the pintime are missing: 
 * heart rate sensor
@ -41,7 +41,7 @@ You just need to make the following connections:
 | P0.13 | Button IN (D3 in my case) |
 | GND | GND                         |
-You also need to enable the I/O expander to disconnect pins from buttons and led on the NRF52-DK and leave them available on the pin headers:
+You also need to enable the I/O expander to disconnect pins from the buttons and LED on the NRF52-DK and leave them available on the pin headers:
 | NRF52 -DK | NRF52- DK |
 | --------- | --------- |
--- a/doc/SPI-LCD-driver.md
+++ b/doc/SPI-LCD-driver.md
@ -1,6 +1,6 @@
 # The SPI LCD driver
 ## Introduction
-The LCD controller that drive the display of the Pinetime is the Sitronix ST7789V. This controller is easy to integrate with an MCU thanks to its SPI interface, and has some interesting features like:
+The LCD controller that drives the display of the Pinetime is the [Sitronix ST7789V](https://wiki.pine64.org/images/5/54/ST7789V_v1.6.pdf). This controller is easy to integrate with an MCU thanks to its SPI interface, and has some interesting features like:
 - an on-chip display data RAM that can store the whole framebuffer
 - partial screen update
 - hardware assisted vertical scrolling
--- a/doc/SWD.md
+++ b/doc/SWD.md
@ -0,0 +1,14 @@
 # How to flash InfiniTime using the SWD interface
 Download the files **bootloader.bin**, **image-x.y.z.bin** and **pinetime-graphics-x.y.z.bin** from the release page:
 ![Image file](imageFile.png)
 The bootloader reads a boot logo from the external SPI flash memory. The first step consists of flashing a tool in the MCU that will flash the boot logo into this SPI flash memory. This first step is optional but recommended (the bootloader will display garbage on screen for a few second if you don't do it).
 Using your SWD tool, flash **pinetime-graphics-x.y.z.bin** at offset **0x0000**. Reset the MCU and wait for a few seconds until the logo is completely drawn on the display.
 Then, using your SWD tool, flash these file at the following offsets:
 - bootloader.bin : **0x0000**
 - image-x.y.z.bin : **0x8000**
 Reset and voilà, you're running InfiniTime on your PineTime!
--- a/doc/ble.md
+++ b/doc/ble.md
@ -2,13 +2,14 @@
 ## Introduction
 This page describes the BLE implementation and API built in this firmware.
-**Note** : I'm a beginner in BLE related technologies and the information in this document reflects my current knowledge and understanding of the BLE stack. This information might be erroneous or incomplete. Feel free to submit a PR if you think you can improve it.
+**Note**: I'm a beginner in BLE related technologies and the information in this document reflects my current knowledge and understanding of the BLE stack. This information might be erroneous or incomplete. Feel free to submit a PR if you think you can improve it.
 ---
 ### Table of Contents
 - [BLE Connection](#ble-connection)
 - [BLE FS](#ble-fs)
 - [BLE UUIDs](#ble-uuids)
 - [BLE Services](#ble-services)
  - [CTS](#cts)
@ -51,6 +52,13 @@ If **CTS** is detected, it'll request the current time to the companion applicat
 ---
 ## BLE FS
 The documentation for BLE FS can be found here:
 [BLEFS.md](./BLEFS.md)
 ---
 ## BLE UUIDs
 When possible, InfiniTime tries to implement BLE services defined by the BLE specification. 
@ -72,12 +80,16 @@ The following custom services are implemented in InfiniTime:
     * [Navigation Service](NavigationService.md) : 00010000-78fc-48fe-8e23-433b3a1942d0
- - Since InfiniTime 0.13
+- Since InfiniTime 0.13
-     * Call characteristic (extension to the Alert Notification Service): 00020001-78fc-48fe-8e23-433b3a1942d0
+    * Call characteristic (extension to the Alert Notification Service): 00020001-78fc-48fe-8e23-433b3a1942d0
- 
+
-  
+
- - Since InfiniTime 1.7:
+- Since InfiniTime 1.7:
-   * [Motion Service](MotionService.md) :        00030000-78fc-48fe-8e23-433b3a1942d0
+    * [Motion Service](MotionService.md): 00030000-78fc-48fe-8e23-433b3a1942d0
 - Since InfiniTime 1.8:
    * [Weather Service](/src/components/ble/weather/WeatherService.h): 00040000-78fc-48fe-8e23-433b3a1942d0
 ---
@ -108,11 +120,11 @@ Reading a value from the firmware version characteristic will yield a UTF-8 enco
 #### Battery Level
-Reading from the battery level characteristic yields a single byte of data. This byte can be converted to an unsigned 8-bit integer which will be the battery percentage. This characteristic allows notify for updates as the value changes.
+Reading from the battery level characteristic yields a single byte of data. This byte can be converted to an unsigned 8-bit integer which will be the battery percentage. This characteristic allows notifications for updates as the value changes.
 #### Heart Rate
-Reading from the heart rate characteristic yields two bytes of data. I am not sure of the function of the first byte. It appears to always be zero. The second byte can be converted to an unsigned 8-bit integer which is the current heart rate. This characteristic also allows notify for updates as the value changes.
+Reading from the heart rate characteristic yields two bytes of data. I am not sure of the function of the first byte. It appears to always be zero. The second byte can be converted to an unsigned 8-bit integer which is the current heart rate. This characteristic also allows notifications for updates as the value changes.
 ---
@ -285,4 +297,4 @@ This characteristic expects a particular format:
 - Microsecond divided by `1e6*256` (`uint8`)
 - Binary 0001 (`uint8`)
-Write all of these together, encoded as little-endian, to the current time characteristic.
+Write all of these together, encoded as little-endian, to the current time characteristic.
--- a/doc/companionapps/firmwareNoValidated.jpg
+++ b/doc/companionapps/firmwareNoValidated.jpg
--- a/doc/companionapps/firmwareValidated.jpg
+++ b/doc/companionapps/firmwareValidated.jpg
--- a/doc/companionapps/firmwareValidationApp.jpg
+++ b/doc/companionapps/firmwareValidationApp.jpg
--- a/doc/branches.md
+++ b/doc/branches.md
@ -1,7 +1,7 @@
 # Branches
 The branching model of this project is based on the workflow named [Git flow](https://nvie.com/posts/a-successful-git-branching-model/).
-It is based on 2 main branches:
+The project is based on 2 main branches:
 - **master** : this branch is always ready to be deployed. It means that at any time, we should be able to build the branch and release a new version of the application.
 - **develop** : this branch contains the latest development that will be integrated in the next release once it's considered as stable.
@ -9,4 +9,4 @@ New features should be implemented in **feature branches** created from **develo
 To release a new version of the application, when develop is considered stable, a **release** branch is created from **develop**. This can be considered as a *release candidate* branch. When everything is OK, this release branch is merged into **master** and the release is generated (a tag is applied to git, the release note is finalized, binaries are built,...) from **master**.
-Git flow also supports the creation of **hotfix** branches when a bug is discovered in a released version. The **hotfix** branch is created from **master** and will be used only to implement a fix to this bug. Multiple hotfix branches can be created for the same release if more than one bugs are discovered.
+Git flow also supports the creation of **hotfix** branches when a bug is discovered in a released version. The **hotfix** branch is created from **master** and will be used only to implement a fix to this bug. Multiple hotfix branches can be created for the same release if multiple bugs are discovered.
--- a/doc/buildAndProgram.md
+++ b/doc/buildAndProgram.md
@ -4,7 +4,7 @@ To build this project, you'll need:
 - A cross-compiler : [ARM-GCC (9-2020-q2-update)](https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads/9-2020-q2-update)
 - The NRF52 SDK 15.3.0 : [nRF-SDK v15.3.0](https://developer.nordicsemi.com/nRF5_SDK/nRF5_SDK_v15.x.x/nRF5_SDK_15.3.0_59ac345.zip)
 - The Python 3 modules `cbor`, `intelhex`, `click` and `cryptography` modules for the `mcuboot` tool (see [requirements.txt](../tools/mcuboot/requirements.txt))
-   - To to keep the system clean a python virtual environment (`venv`) can be used to install the python modules into
+   - To keep the system clean, you can install python modules into a python virtual environment (`venv`)
     ```sh
 	 python -m venv .venv
 	 source .venv/bin/activate
@ -260,4 +260,4 @@ Finally, merge them together with **mergehex**:
 This file must be flashed at offset **0x00** of the internal memory of the NRF52832.
 #### spinor.bin
-This file is the MCUBoot image of the last stable version of the recovery firmware. It must be flashed at offset **0x00** of the external SPINOR flash memory.
+This file is the MCUBoot image of the last stable version of the recovery firmware. It must be flashed at offset **0x00** of the external SPINOR flash memory.
--- a/doc/code/Apps.md
+++ b/doc/code/Apps.md
@ -1,14 +1,15 @@
 # Apps
 This page will teach you:
- what apps in InfiniTime are
+- what screens and apps are in InfiniTime
 - how to implement your own app
 ## Theory
-Apps are the things you can launch from the app selection you get by swiping up.
+
-At the moment, settings and even the app launcher itself or the clock are implemented very similarly, this might change in the future though.
+The user interface of InfiniTime is made up of **screens**.
 Screens that are opened from the app launcher are considered **apps**.
 Every app in InfiniTime is it's own class.
-An instance of the class is created when the app is launched and destroyed when the user exits the app.
+An instance of the class is created when the app is launched, and destroyed when the user exits the app.
-They run inside the "displayapp" task (briefly discussed [here](./Intro.md)).
+Apps run inside the "displayapp" task (briefly discussed [here](./Intro.md)).
 Apps are responsible for everything drawn on the screen when they are running.
 By default, apps only do something (as in a function is executed) when they are created or when a touch event is detected.
@ -20,30 +21,24 @@ A destructor is needed to clean up LVGL and restore any changes (for example re-
 App classes can override `bool OnButtonPushed()`, `bool OnTouchEvent(TouchEvents event)` and `bool OnTouchEvent(uint16_t x, uint16_t y)` to implement their own functionality for those events.
 If an app only needs to display some text and do something upon a touch screen button press,
 it does not need to override any of these functions, as LVGL can also handle touch events for you.
-If you have any doubts, you can always look at how the other apps are doing things.
+If you have any doubts, you can always look at how the other apps function for reference.
 ### Continuous updating
-If your app needs to be updated continuously, yo can do so by overriding the `Refresh()` function in your class
+If your app needs to be updated continuously, you can do so by overriding the `Refresh()` function in your class
 and calling `lv_task_create` inside the constructor.
-An example call could look like this: <br>
+
-`taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);` <br>
+An example call could look like this:
 ```cpp
 taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
 ```
 With `taskRefresh` being a member variable of your class and of type `lv_task_t*`.
 Remember to delete the task again using `lv_task_del`.
-The function `RefreshTaskCallback` is inherited from screen and just calls your `Refresh` function.
+The function `RefreshTaskCallback` is inherited from `Screen` and just calls your `Refresh` function.
 ### Apps with multiple screens
 InfiniTime provides a mini-library in [displayapp/screens/ScreenList.h](/src/displayapp/screens/ScreenList.h)
 which makes it relatively  easy to add multiple screens to your app.
 To use it, #include it in the header file of your app and add a ScreenList member to your class.
 The template argument should be the number of screens you need.
 You will also need to add `CreateScreen` functions that return `std::unique_ptr<Screen>`
 to your class, one for every screen you have.
 There are still some things left to to that I won't cover here.
 To figure them out, have a look at the "apps" ApplicationList, Settings and SystemInfo.
 ## Creating your own app
-A minimal app could look like this: <br>
+A minimal app could look like this:
 MyApp.h:
 ```cpp
 #pragma once
@ -66,13 +61,13 @@ namespace Pinetime {
 MyApp.cpp:
 ```cpp
-#include "MyApp.h"
+#include "displayapp/screens/MyApp.h"
 #include "displayapp/DisplayApp.h"
 using namespace Pinetime::Applications::Screens;
 MyApp::MyApp(DisplayApp* app) : Screen(app) {
-  lv_obj_t* title = lv_label_create(lv_scr_act(), NULL);  
+  lv_obj_t* title = lv_label_create(lv_scr_act(), nullptr);
  lv_label_set_text_static(title, "My test application");
  lv_label_set_align(title, LV_LABEL_ALIGN_CENTER);
  lv_obj_align(title, lv_scr_act(), LV_ALIGN_CENTER, 0, 0);
@ -95,12 +90,10 @@ Now, go to the function `DisplayApp::LoadApp` and add another case to the switch
 The case will be the id you gave your app earlier.
 If your app needs any additional arguments, this is the place to pass them.
-If you want your app to be launched from the regular app launcher, go to [displayapp/screens/ApplicationList.cpp](/src/displayapp/screens/ApplicationList.cpp).
+If you want to add your app in the app launcher, add your app in [displayapp/screens/ApplicationList.cpp](/src/displayapp/screens/ApplicationList.cpp) to one of the `CreateScreen` functions, or add another `CreateScreen` function if there are no empty spaces for your app. If your app is a setting, do the same procedure in [displayapp/screens/settings/Settings.cpp](/src/displayapp/screens/settings/Settings.cpp).
 Add your app to one of the `CreateScreen` functions, or add another `CreateScreen` function if there are no empty spaces for your app. <br>
 If your app is a setting, do the same procedure in [displayapp/screens/settings/Settings.cpp](/src/displayapp/screens/settings/Settings.cpp).
 You should now be able to [build](../buildAndProgram.md) the firmware
 and flash it to your PineTime. Yay!
 Please remember to pay attention to the [UI guidelines](../ui_guidelines.md)
-when designing an app that you want to include in mainstream InfiniTime.
+when designing an app that you want to be included in InfiniTime.
--- a/doc/code/Intro.md
+++ b/doc/code/Intro.md
@ -21,11 +21,12 @@ Both functions are located inside [systemtask/SystemTask.cpp](/src/systemtask/Sy
 It also starts the **task "displayapp"**, which is responsible for launching and running apps, controlling the screen and handling touch events (or forwarding them to the active app).
 You can find the "displayapp" task inside [displayapp/DisplayApp.cpp](/src/displayapp/DisplayApp.cpp).
 There are also other tasks that are responsible for Bluetooth ("ll" and "ble" inside [libs/mynewt-nimble/porting/npl/freertos/src/nimble_port_freertos.c](/src/libs/mynewt-nimble/porting/npl/freertos/src/nimble_port_freertos.c))
-and periodic tasks like heartrate measurements ([heartratetask/HeartRateTask.cpp](/src/heartratetask/HeartRateTask.cpp)). <br>
+and periodic tasks like heartrate measurements ([heartratetask/HeartRateTask.cpp](/src/heartratetask/HeartRateTask.cpp)).
 While it is possible for you to create your own task when you need it, it is recommended to just add functionality to `SystemTask::Work()` if possible.
-If you absolutely need to create another task, try to guess how much [stack space](https://www.freertos.org/FAQMem.html#StackSize) (in words/4-byte packets)
+If you absolutely need to create another task, try to estimate how much [stack space](https://www.freertos.org/FAQMem.html#StackSize) (in words/4-byte packets)
 it will need instead of just typing in a large-ish number.
-You can use the define `configMINIMAL_STACK_SIZE` which is currently set to 120 words.
+You can use `configMINIMAL_STACK_SIZE` which is currently set to 120 words.
 ## Controllers
 Controllers in InfiniTime are singleton objects that can provide access to certain resources to apps.
--- a/doc/coding-convention.md
+++ b/doc/coding-convention.md
@ -0,0 +1,41 @@
 # Coding convention
 ## Language
 The language of this project is **C++**, and all new code must be written in C++. (Modern) C++ provides a lot of useful tools and functionalities that are beneficial for embedded software development like `constexpr`, `template` and anything that provides zero-cost abstraction.
 C code is accepted if it comes from another library like FreeRTOS, NimBLE, LVGL or the NRF-SDK.
 ## Coding style
 The most important rule to follow is to try to keep the code as easy to read and maintain as possible.
 Using an autoformatter is highly recommended, but make sure it's configured properly.
 There are preconfigured autoformatter rules for:
  * CLion (IntelliJ) in [.idea/codeStyles/Project.xml](/.idea/codeStyles/Project.xml)
  * `clang-format`
 Also use `clang-tidy` to check the code for other issues.
 If there are no preconfigured rules for your IDE, you can use one of the existing ones to configure your IDE.
 - **Indentation** : 2 spaces, no tabulation
 - **Opening brace** at the end of the line
 - **Naming** : Choose self-describing variable name
    - **class** : PascalCase
    - **namespace** : PascalCase
    - **variable** : camelCase, **no** prefix/suffix ('_', 'm_',...) for class members
 - **Include guard** : `#pragma once` (no `#ifdef __MODULE__ / #define __MODULE__ / #endif`)
 - **Includes** :
    - files from the project : `#include "relative/path/to/the/file.h"`
    - external files and std : `#include <file.h>`
    - use includes relative to included directories like `src`, not relative to the current file. Don't do: `#include "../file.h"`
 - Only use [primary spellings for operators and tokens](https://en.cppreference.com/w/cpp/language/operator_alternative)
 - Use auto sparingly. Don't use auto for [fundamental/built-in types](https://en.cppreference.com/w/cpp/language/types) and [fixed width integer types](https://en.cppreference.com/w/cpp/types/integer), except when initializing with a cast to avoid duplicating the type name.
 - Examples:
   - `auto* app = static_cast<DisplayApp*>(instance);`
   - `auto number = static_cast<uint8_t>(variable);`
   - `uint8_t returnValue = MyFunction();`
 - Use nullptr instead of NULL
--- a/doc/companionapps/Amazfish.md
+++ b/doc/companionapps/Amazfish.md
@ -1,16 +0,0 @@
 # Amazfish
 [Amazfish](https://openrepos.net/content/piggz/amazfish) is a companion app that supports many smartwatches and activity trackers running on [SailfishOS](https://sailfishos.org/).
 ## Features
 The following features are implemented:
 - Scanning & detection of Pinetime-JF / InfiniTime
 - Connection / disconnection
 - Time synchronization
 - Notifications
 - Music control
 - Navigation with Puremaps
 ## Demo
 [This video](https://seafile.codingfield.com/f/21c5d023452740279e36/) shows how to connect to the Pinetime and control the playback of the music on the phone.
 Amazfish and Sailfish OS are running on the [Pinephone](https://www.pine64.org/pinephone/), another awesome device from Pine64.
--- a/doc/companionapps/Gadgetbridge.md
+++ b/doc/companionapps/Gadgetbridge.md
@ -1,13 +0,0 @@
 # Integration with Gadgetbridge
 [Gadgetbridge](https://gadgetbridge.org/) is an Android application that supports many smartwatches and fitness trackers.
 The integration of InfiniTime (previously Pinetime-JF) is now merged into the master branch (https://codeberg.org/Freeyourgadget/Gadgetbridge/) and initial support is available [starting with version 0.47](https://codeberg.org/Freeyourgadget/Gadgetbridge/src/branch/master/CHANGELOG.md). Note that the official version is only available on F-Droid (as of May 2021), and the unofficial fork available on the Play Store is outdated and does not support Infinitime.
 ## Features
 The following features are implemented:
 - Scanning & detection of Pinetime-JF / InfiniTime
 - Connection / disconnection
 - Notifications
 ## Demo
 [This video](https://seafile.codingfield.com/f/0a2920b9d765462385e4/) shows how to scan, connect, send notification (using the debug screen) and disconnect from the Pinetime.
--- a/doc/companionapps/NrfconnectOTA.md
+++ b/doc/companionapps/NrfconnectOTA.md
@ -1,12 +0,0 @@
 # OTA using NRFConnect
 [NRFConnect](https://www.nordicsemi.com/Software-and-tools/Development-Tools/nRF-Connect-for-mobile) is a powerful application (running on Android and iOS) which allows to scan and connect to BLE devices.
 ## Features
 - Scanning, connect, disconnect
 - Time synchronization
 - OTA
 InfiniTime implements the Nordic DFU protocol for the OTA functionality. NRFConnect also supports this protocol.
 # Demo
 [This video](https://seafile.codingfield.com/f/a52b69683a05472a90c7/) shows how to use NRFConnect to update the firmware running on the Pinetime.
--- a/doc/contribute.md
+++ b/doc/contribute.md
@ -14,10 +14,6 @@ As the documentation is part of the source code, you can submit your improvement
 You want to fix a bug, add a cool new functionality or improve the code? See *How to submit a pull request below*.
 ## Spread the word
 The Pinetime is a cool open source project that deserves to be known. Talk about it around you, on social networks, on your blog,... and let people know that we are working on an open source firmware for a smartwatch!
 # How to submit a pull request?
 ## TL;DR
@ -25,7 +21,7 @@ The Pinetime is a cool open source project that deserves to be known. Talk about
 - Create a branch from develop
 - Work on a single subject in this branch. Create multiple branches/pulls-requests if you want to work on multiple subjects (bugs, features,...)
 - Test your modifications on the actual hardware
- - Check the code formatting against our coding conventions and [clang-format](../.clang-format) and [clang-tidy](../.clang-tidy)
+ - Check your code against the [coding conventions](/doc/coding-convention.md) and [clang-format](../.clang-format) and [clang-tidy](../.clang-tidy)
 - Clean your code and remove files that are not needed
 - Write documentation related to your new feature if applicable
 - Create a pull request and write a great description about it: what does your PR do, why, how,... Add pictures and video if possible
@ -38,9 +34,9 @@ If you want to fix a bug, add functionality or improve the code, you'll first ne
 When your feature branch is ready, **make sure it actually works** and **do not forget to write documentation** about it if it's relevant.
-**Creating a pull request containing modifications that haven't been tested is strongly discouraged.** If, for any reason, you cannot test your modifications but want to publish them anyway, **please mention it in the description**. This way, other contributors might be willing to test it and provide feedback about your code.
+**Creating a pull request containing modifications that haven't been tested is strongly discouraged.** If for any reason you cannot test your modifications, but want to publish them anyway, **please mention it in the description**. This way, other contributors might be willing to test it and provide feedback about your code.
-Also, before submitting your PR, check the coding style of your code against the **coding conventions** detailed below. This project also provides [clang-format](../.clang-format) and [clang-tidy](../.clang-tidy) configuration files. You can use them to ensure correct formatting of your code.
+Before submitting a PR, check your code against the [coding conventions](/doc/coding-convention.md). This project also provides [clang-format](../.clang-format) and [clang-tidy](../.clang-tidy) configuration files. You should use them to ensure correct formatting of your code.
 Don't forget to check the files you are going to commit and remove those which aren't necessary (config files from your IDE, for example). Remove old comments, commented code,...
@ -50,54 +46,16 @@ Other contributors can post comments about the pull request, maybe ask for more
 Once the pull request is reviewed and accepted, it'll be merged into **develop** and will be released in the next version of the firmware.
-## Why  all these rules?
+## Why all these rules?
-Reviewing pull requests is a **very time consuming task** for the creator of this project ([JF002](https://github.com/JF002)) and for other contributors who take the time to review them. Everything you do to make reviewing easier will **get your PR merged faster**.
+Reviewing pull requests is a **very time consuming task**. Everything you do to make reviewing easier will **get your PR merged faster**.
-When reviewing PRs, the author and contributors will first look at the **description**. If it's easy to understand what the PR does, why the modification is needed or interesting and how it's done, a good part of the work is already done : we understand the PR and its context.
+Reviewers will first look at the **description**. If it's easy to understand what the PR does, why the modification is needed or interesting and how it's done, a good part of the work is already done : we understand the PR and its context.
-Then, reviewing **a few files that were modified for a single purpose** is a lot more easier than to review 30 files modified for many reasons (bug fix, UI improvements, typos in doc,...), even if all these changes make sense. Also, it's possible that we agree on some modification but not on some other, so we won't be able to merge the PR because of the changes that are not accepted.
+Reviewing **a few files that were modified for a single purpose** is a lot easier than reviewing 30 files modified for many reasons (bug fix, UI improvements, typos in doc,...), even if all the changes make sense. Also, it's possible that we agree on some modification but not on another, so we won't be able to merge the PR because of the changes that are not accepted.
-We do our best to keep the code as consistent as possible. If the formatting of the code in your PR is not consistent with our code base, we'll ask you to review it, which will take more time.
+The code base should be kept as consistent as possible. If the formatting of your code is not consistent with the rest of the code base, we'll ask you to review it.
-The last step of the review consists of **testing** the modification. If it doesn't work out of the box, we'll ask your to review your code and to ensure that it works as expected.
+Lastly the changes are tested. If it doesn't work out of the box, we'll ask you to review your code and to ensure that it works as expected.
 It's totally normal for a PR to need some more work even after it was created, that's why we review them. But every round trip takes time, so it's good practice to try to reduce them as much as possible by following those simple rules.
 # Coding convention
 ## Language
 The language of this project is **C++**, and all new code must be written in C++. (Modern) C++ provides a lot of useful tools and functionalities that are beneficial for embedded software development like `constexpr`, `template` and anything that provides zero-cost abstraction.
 C code is accepted if it comes from another library like FreeRTOS, NimBLE, LVGL or the NRF-SDK.
 ## Coding style
 The most important rule to follow is to try to keep the code as easy to read and maintain as possible.
 Using an autoformatter is highly recommended, but make sure it's configured properly.
 There are preconfigured autoformatter rules for:
  * CLion (IntelliJ) in .idea/codeStyles/Project.xml
 If there are no preconfigured rules for your IDE, you can use one of the existing ones to configure your IDE.
 - **Indentation** : 2 spaces, no tabulation
 - **Opening brace** at the end of the line
 - **Naming** : Choose self-describing variable name
    - **class** : PascalCase
    - **namespace** : PascalCase
    - **variable** : camelCase, **no** prefix/suffix ('_', 'm_',...) for class members
 - **Include guard** : `#pragma once` (no `#ifdef __MODULE__ / #define __MODULE__ / #endif`)
 - **Includes** :
    - files from the project : `#include "relative/path/to/the/file.h"`
    - external files and std : `#include <file.h>`
 - Only use [primary spellings for operators and tokens](https://en.cppreference.com/w/cpp/language/operator_alternative)
 - Use auto sparingly. Don't use auto for [fundamental/built-in types](https://en.cppreference.com/w/cpp/language/types) and [fixed width integer types](https://en.cppreference.com/w/cpp/types/integer), except when initializing with a cast to avoid duplicating the type name.
 - Examples:
   - `auto* app = static_cast<DisplayApp*>(instance);`
   - `auto number = static_cast<uint8_t>(variable);`
   - `uint8_t returnValue = MyFunction();`
 - Use nullptr instead of NULL
--- a/doc/gettingStarted/about-software.md
+++ b/doc/gettingStarted/about-software.md
@ -0,0 +1,26 @@
 # Firmware, InfiniTime, Bootloader, Recovery firmware, OTA, DFU... What is it?
 You may have already encountered these words by reading the announcement, release notes, or [the wiki guide](https://wiki.pine64.org/wiki/Upgrade_PineTime_to_InfiniTime_1.0.0) and you may find them confusing if you're not familiar with the project.
 A **firmware** is software running on the embedded hardware of a device.
 InfiniTime has three distinct firmwares:
 - **[InfiniTime](https://github.com/InfiniTimeOrg/InfiniTime)** is the operating system.
 - **[The bootloader](https://github.com/JF002/pinetime-mcuboot-bootloader)** is responsible for safely applying firmware updates and runs before booting into InfiniTime.
 - **The recovery firmware** is a special *application firmware* than can be loaded by the bootloader on user request. This firmware can be useful in case of serious issue, when the main application firmware cannot perform an OTA update correctly.
 **OTA** (**O**ver **T**he **A**ir) refers to updating of the firmware over BLE (**B**luetooth **L**ow **E**nergy). This is a functionality that allows the user to update the firmware on their device wirelessly.
 **DFU** (**D**evice **F**irmware **U**pdate) is the file format and protocol used to send the update of the firmware to the watch over-the-air. InfiniTime implements the (legacy) DFU protocol from Nordic Semiconductor (NRF).
 ## Bootloader
 Most of the time, the bootloader just runs without your intervention (updating and loading the firmware).
 However, you can use the bootloader to rollback to the previous firmware, or load the recovery firmware using the push button:
 - Press and hold the button until the pine cone is drawn in **blue** to force the rollback of the previous version of the firmware, even if you've already validated the current one.
 - Press and hold the button until the pine cone is drawn in **red** to load the recovery firmware. This recovery firmware only provides BLE connectivity and OTA functionality.
 More info about the bootloader in [its project page](https://github.com/JF002/pinetime-mcuboot-bootloader/blob/master/README.md).
--- a/doc/gettingStarted/appmenu-071.jpg
+++ b/doc/gettingStarted/appmenu-071.jpg
--- a/doc/gettingStarted/appmenu.jpg
+++ b/doc/gettingStarted/appmenu.jpg
--- a/doc/gettingStarted/bootloader-1.0.jpg
+++ b/doc/gettingStarted/bootloader-1.0.jpg
--- a/doc/gettingStarted/gettingStarted-1.0.md
+++ b/doc/gettingStarted/gettingStarted-1.0.md
@ -1,119 +1,57 @@
-# Getting started with InfiniTime 1.0
+# Getting started with InfiniTime
-On April 22 2021, InfiniTime and Pine64 [announced the release of InfiniTime 1.0](https://www.pine64.org/2021/04/22/its-time-infinitime-1-0/) and the availability of PineTime smartwatches as *enthusiast grade end-user product*. This page aims to guide you with your first step with your new PineTime.
+On April 22 2021, InfiniTime and Pine64 [announced the release of InfiniTime 1.0.0](https://www.pine64.org/2021/04/22/its-time-infinitime-1-0/) and the availability of PineTime smartwatches as an *enthusiast grade end-user product*. This page aims to guide you with your first step with your new PineTime.
-## Firmware, InfiniTime, Bootloader, Recovery firmware, OTA, DFU... What is it?
+It is highly recommended to update the firmware to the latest version when you receive your watch and when a new InfiniTime version is released. More information on updating the firmware [here](/doc/gettingStarted/updating-software.md).
-You might have already seen these words by reading the announcement, release notes, or [the wiki guide](https://wiki.pine64.org/wiki/Upgrade_PineTime_to_InfiniTime_1.0.0) and, you may find them misleading if you're not familiar with the project.
+## InfiniTime quick user guide
 Basically, a **firmware** is just a software running on the embedded hardware of a device, the PineTime in this case.
 **InfiniTime** is based on 3 distinct **firmwares**:
 - **[InfiniTime](https://github.com/InfiniTimeOrg/InfiniTime)** itself, this is the *application firmware* running on the PineTime. This is the main firmware which provides most of the functionalities you'll use on a daily basis : bluetooth low-energy (BLE) connectivity, applications, watchfaces,...
 - **[The bootloader](https://github.com/JF002/pinetime-mcuboot-bootloader)** is responsible for safely applying **updates** of the *application firmware*, reverting them in case of issues and load the recovery firmware when requested.
 - **The recovery firmware** is a specific *application firmware* than can be loaded by the bootloader on user request. This firmware can be useful in case of serious issue, when the main application firmware cannot perform an OTA update correctly. Currently, this  recovery firmware is based on [InfiniTime 0.14.1](https://github.com/InfiniTimeOrg/InfiniTime/releases/tag/0.14.1).
 **OTA** and **DFU** refer to the update of the firmware over BLE (**B**luetooth **L**ow **E**nergy). **OTA** means **O**ver **T**he **A**ir, this is a functionality that allows the user to update the firmware how their device using a wireless communication like BLE. When we talk about **DFU** (**D**evice **F**irmware **U**pdate), we refer to the file format and protocol used to send the update of the firmware to the watch over-the-air. InfiniTime implement the (legacy) DFU protocol from Nordic Semiconductor (NRF).
 ## How to check the version of InfiniTime and the bootloader?
 Since September 2020, all PineTimes (devkits or sealed) are flashed using the **[first iteration of the bootloader](https://github.com/lupyuen/pinetime-rust-mynewt/releases/tag/v4.1.7)** and **[InfiniTime 0.7.1](https://github.com/InfiniTimeOrg/InfiniTime/releases/tag/0.7.1)**. There was no recovery firmware at that time.
 The bootloader only runs when the watch starts (from an empty battery, for example) or after a reset (after a successful OTA or a manual reset - long push on the button).
 You can recognize this first iteration of the bootloader with it greenish **PINETIME** logo.
 ![Old bootloader logo](oldbootloaderlogo.jpg)
 You can check the version of InfiniTime by opening the app *SystemInfo*. For version < 1.0:
 ![InfiniTime 0.7.1 Application menu](appmenu-071.jpg)
 ![InfiniTime 0.7.1 version](version-071.jpg)
 And for version >= 1.0 :
 ![InfiniTime 1.0 version](version-1.0.jpg)
 PineTime shipped from June 2021 (to be confirmed) will be flashed with the [new version of the bootloader](https://github.com/JF002/pinetime-mcuboot-bootloader/releases/tag/1.0.0), the [recovery firmware](https://github.com/InfiniTimeOrg/InfiniTime/releases/tag/0.14.1) and [InfiniTime 1.0](https://github.com/InfiniTimeOrg/InfiniTime/releases/tag/1.0.0).
 The bootloader is easily recognizable with it white pine cone that is progressively drawn in green. It also displays its own version on the bottom (1.0.0 as of now).
 ![Bootloader 1.0](bootloader-1.0.jpg)
 ## How to update your PineTime?
 To update your PineTime, you can use one of the compatible companion applications. Here are the main ones:
 - **[Amazfish](https://github.com/piggz/harbour-amazfish)** (Desktop Linux, mobile Linux, SailfishOS, runs on the PinebookPro and the Pinephone)
 - **[Gadgetbridge](https://www.gadgetbridge.org/)** (Android)
 - **[Siglo](https://github.com/alexr4535/siglo)** (Linux, GTK based)
 - **NRFConnect** (closed source, Android & iOS).
 See [this page](ota-gadgetbridge-nrfconnect.md) for more info about the OTA procedure using Gadgetbridge and NRFConnect.
 ### From InfiniTime 0.7.1 / old bootloader
 If your PineTime is currently running InfiniTime 0.7.1 and the old bootloader, we strongly recommend you update them to more recent version (Bootloader 1.0.0 and InfiniTime 1.0.0 as of now). We also recommend you install the recovery firmware once the bootloader is up-do-date.
 Using the companion app of your choice, you'll need to apply the OTA procedure for these 3 firmwares in this sequence (failing to follow this specific order might temporarily or permanently brick your device):
 1. Flash the latest version of InfiniTime. The file to upload is named **pinetime-mcuboot-app-dfu-x.y.z.zip**. Here is the link to [InfiniTime 1.0](https://github.com/InfiniTimeOrg/InfiniTime/releases/download/1.0.0/pinetime-mcuboot-app-dfu-1.0.0.zip).
 2. Update the bootloader by applying the OTA procedure with the file named [**reloader-mcuboot.zip** from the repo of the bootloader](https://github.com/JF002/pinetime-mcuboot-bootloader/releases/download/1.0.0/reloader-mcuboot.zip).
 3. Install the recovery firmware by applying the OTA procedure with the file named [**pinetime-mcuboot-recovery-loader-dfu-0.14.1.zip** from the version 0.14.1 of InfiniTime](https://github.com/InfiniTimeOrg/InfiniTime/releases/download/0.14.1/pinetime-mcuboot-recovery-loader-dfu-0.14.1.zip).
 You'll find more info about this process in [this wiki page](https://wiki.pine64.org/wiki/Upgrade_PineTime_to_InfiniTime_1.0.0). You can also see the procedure in video [here](https://video.codingfield.com/videos/watch/831077c5-16f3-47b4-9b2b-c4bbfecc6529) and [here (from Amazfish)](https://video.codingfield.com/videos/watch/f7bffb3d-a6a1-43c4-8f01-f4aeff4adf9e)
 ### From version > 1.0
 If you are already running the new "1.0.0" bootloader, all you have to do is update your version of InfiniTime when it'll be available. We'll write specific instructions when (if) we release a new version of the bootloader.
 ### Firmware validation
 The bootloader requires a (manual) validation of the firmware. If the watch reset with an updated firmware that was not validated, the bootloader will consider it as non-functioning and will revert to the previous version of the firmware. This is a safety feature to prevent bricking your device with a faulty firmware.
 You can validate your updated firmware on InfiniTime >= 1.0 by following this simple procedure:
 - From the watchface, swipe **right** to display the *Quick Actions menu*
 - Open the **Settings** app by tapping the *gear* icon on the bottom right
 - Swipe down and tap on the entry named **Firmware**
 - This app shows the version that is currently running. If it's not validated yet, it displays 2 buttons:
    - **Validate** to validate your firmware
    - **Reset** to reset the watch and revert to the previously running version of the firmware
 ## InfiniTime 1.0 quick user guide
 ### Setting the time
-By default, InfiniTime starts on the digital watchface. It'll probably display the epoch time (1 Jan 1970, 00:00). The time will be automatically synchronized once you connect on of the companion app to your PineTime using BLE connectivity. InfiniTime does not provide any way to manually set the time for now.
+By default, InfiniTime starts on the digital watchface. It'll probably display the epoch time (1 Jan 1970, 00:00).
 You can sync the time using companion apps.
 - Gadgetbridge automatically synchronizes the time when you connect it to your watch. More information on Gadgetbridge [here](/doc/gettingStarted/ota-gadgetbridge.md)
 - [Sync the time with NRFConnect](/doc/gettingStarted/time-nrfconnect.md)
 - Sync the time with your browser https://hubmartin.github.io/WebBLEWatch/
 You can also set the time in the settings without a companion app. (version >1.7.0)
 InfiniTime doesn't handle daylight savings automatically, so make sure to set the correct the time or sync it with a companion app.
 ### Digital watch face
 ![Digital watch face](ui/watchface.jpg)
 This is what the default digital watch face looks like. You can change watch faces in the settings.
 The indicator on the top left is visible if you have unread notifications
 On the top right there are status icons
 - The battery icon shows roughly how much charge is remaining
 - The Bluetooth icon is visible when the watch is connected to a companion app
 - A plug icon is shown when the watch is plugged into a charger.
 On the bottom left you can see your heart rate if you have the measurement enabled in the heart rate app.
 On the bottom right you can see how many steps you have taken today.
 ### Navigation in the menu
-![Quick actions](quickactions.jpg)
+![Application menu](ui/applist.jpg)
-![Settings](settings.jpg)
+![Notifications](ui/notifications.jpg)
-![Application menu](appmenu.jpg)
+![Quick actions](ui/quicksettings.jpg)
 ![Settings](ui/settings.jpg)
 - Swipe **down** to display the notification panel. Notification sent by your companion app will be displayed in this panel.
 - Swipe **up** to display the application menus. Apps (stopwatch, music, step, games,...) can be started from this menu.
 - Swipe **down** to display the notification panel. Notification sent by your companion app will be displayed here.
 - Swipe **right** to display the Quick Actions menu. This menu allows you to
    - Set the brightness of the display
    - Start the **flashlight** app
-    - Enable/disable vibrations on notifications (Do Not Disturb mode)
+    - Enable/disable notifications (Do Not Disturb mode)
    - Enter the **settings** menu
- - Settings
+       - Swipe up and down to see all options
-    - Display timeout
+ - Click the button to go back a screen.
-    - Wake up event (Tap, wrist rotation)
+ - You can hold the button for a short time to return to the watch face. (version >1.7.0)
    - Time format (12/24H)
    - Default watchface (digital / analog)
    - Battery info
    - Firmware validation
    - About (system info, firmware version,...)
 ### Bootloader
 Most of the time, the bootloader just runs without your intervention (update and load the firmware).
 However, you can enable 2 functionalities using the push button:
 - Push the button until the pine cone is drawn in **blue** to force the rollback of the previous version of the firmware, even if you've already validated the updated one
 - Push the button until the pine cone is drawn in **red** to load the recovery firmware. This recovery firmware only provides BLE connectivity and OTA functionality.
 More info about the bootloader in [its project page](https://github.com/JF002/pinetime-mcuboot-bootloader/blob/master/README.md).
--- a/doc/gettingStarted/oldbootloaderlogo.jpg
+++ b/doc/gettingStarted/oldbootloaderlogo.jpg
--- a/doc/gettingStarted/ota-gadgetbridge-nrfconnect.md
+++ b/doc/gettingStarted/ota-gadgetbridge-nrfconnect.md
@ -1,109 +0,0 @@
 # Flash and upgrade InfiniTime
 If you just want to flash or upgrade InfiniTime on your PineTime, this page is for you!
 - [InfiniTime releases and versions](#infinitime-releases-and-versions)
 - [How to upgrade Over-The-Air (OTA)](#how-to-upgrade-over-the-air-ota)
    - [Using Gadgetbridge](#using-gadgetbridge)
    - [Using NRFConnect](#Using-nrfconnect)
 - [How to flash InfiniTime using the SWD interface](#how-to-flash-infinitime-using-the-swd-interface)
 ## InfiniTime releases and versions
 All releases of InfiniTime are available on the [release page of the GitHub repo](https://github.com/InfiniTimeOrg/InfiniTime/releases).
 Versions that are tagged as **RELEASE CANDIDATE** are pre-release versions, that are available for testing before actually releasing a new stable version. If you want to help us debug the project and provide stable versions to other user, you can use them. If you want stable and tested version, you should not flash these release candidate version.
 Release files are available under the *Assets* button.
 ## How to upgrade Over-The-Air (OTA)
 OTA is the easiest method to upgrade InfiniTime. Note that it's only possible is your PineTime is already running InfiniTime (>= 0.7.1).
 2 companion apps provide support for OTA : 
 - [Gadgetbridge](https://gadgetbridge.org/) (open source, runs on Android, [available on F-Droid](https://f-droid.org/packages/nodomain.freeyourgadget.gadgetbridge/)). 
 - [NRFConnect](https://www.nordicsemi.com/Software-and-tools/Development-Tools/nRF-Connect-for-mobile) (close source, runs on Android and iOS).
 Both applications need you to download the **DFU file** of InfiniTime. This file contains the new version of InfiniTime that will be flashed into your device. It's called **dfu-x.y.z.zip** (ex: dfu-0.9.0.zip) in the release note.
 ![Dfu file](dfuFile.png )
 ### Using Gadgetbridge
 Launch Gadgetbridge and tap on the **"+"** button on the bottom right to add a new device:
 ![Gadgetbridge 0](gadgetbridge0.jpg)
 Wait for the scan to complete, your PineTime should be detected:
 ![Gadgetbridge 1](gadgetbridge1.jpg)
 Tap on it. Gadgdetbridge will pair and connect to your device:
 ![Gadgetbridge 2](gadgetbridge2.jpg)
 Now that Gadgetbridge is connected to your PineTime, use a file browser application (I'm using Seafile to browse my NAS) and browse to the DFU file (image-xxx.zip) you downloaded previously. Tap on it and open it using the Gadgetbridge application/firmware installer:
 ![Gadgetbridge 3](gadgetbridge3.jpg)
 Read carefully the warning and tap **Install**:
 ![Gadgetbridge 4](gadgetbridge4.jpg)
 Wait for the transfer to finish. Your PineTime should reset and reboot with the new version of InfiniTime!
 Don't forget to **validate** your firmware. In the InfiniTime go to the settings (swipe right, select gear icon) and Firmware option and click **validate**. Otherwise after reboot the previous firmware will be used.
 ![Gadgetbridge 5](gadgetbridge5.jpg)
 ### Using NRFConnect
 Open NRFConnect. Swipe down in the *Scanner* tab and wait for your device to appear:
 ![NRFConnect 0](nrfconnect0.jpg)
 Tap on the *Connect* button on the right of your device. NRFConnect will connect to your PineTime and discover its characteristics. Tap on the **DFU** button on the top right:
 ![NRFConnect 1](nrfconnect1.jpg)
 Select **Distribution packet (ZIP)**:
 ![NRFConnect 2](nrfconnect2.jpg)
 Browse to the DFU file you downloaded previously, the DFU transfer will start automatically. When the transfer is finished, your PineTime will reset and restart on the new version of InfiniTime!
 Don't forget to **validate** your firmware. In the InfiniTime go to the settings (swipe right, select gear icon) and Firmware option and click **validate**. Otherwise after reboot the previous firmware will be used.
 ![NRFConnect 3](nrfconnect3.jpg)
 ## How to flash InfiniTime using the SWD interface
 Download the files **bootloader.bin**, **image-x.y.z.bin** and **pinetime-graphics-x.y.z.bin** from the release page:
 ![Image file](imageFile.png )
 The bootloader reads a boot logo from the external SPI flash memory. The first step consists in flashing a tool in the MCU that will flash the boot logo into this SPI flash memory. This first step is optional but recommanded (the bootloader will display garbage on screen for a few second if you don't do it).
 Using your SWD tool, flash **pinetime-graphics-x.y.z.bin** at offset **0x0000**. Reset the MCU and wait for a few second, until the logo is completely drawn on the display.
 Then, using your SWD tool, flash those file at specific offset:
 - bootloader.bin : **0x0000**
 - image-x.y.z.bin : **0x8000**
 Reset and voilà, you're running InfiniTime on your PineTime!
 If you are using OpenOCD with a STLinkV2, you can find more info [on this page](../openOCD.md).
 ## How to synchronize the time
 ### Using Gadgetbridge
 Good news! Gadgetbridge **automatically** synchronizes the time when connecting to your PineTime!
 ### Using any Chromium-based web browser
 You can use it from your PC, Mac, Android. Browsers now have BLE support.
 https://hubmartin.github.io/WebBLEWatch/
 ### Using NRFConnect
 You must enable the **CTS** *GATT server* into NRFConnect so that InfiniTime can synchronize the time with your smartphone.
 Launch NRFConnect, tap the sandwich button on the top left and select *Configure GATT server*:
 ![NRFConnect CTS 0](nrfconnectcts0.jpg)
 Tap *Add service* and select the server configuration *Current Time service*. Tap OK and connect to your PineTime, it should automcatically sync the time once the connection is established!
 ![NRFConnect CTS 1](nrfconnectcts1.jpg)
--- a/doc/gettingStarted/ota-gadgetbridge.md
+++ b/doc/gettingStarted/ota-gadgetbridge.md
@ -0,0 +1,29 @@
 # Connecting to Gadgetbridge
 Launch Gadgetbridge and tap on the **"+"** button on the bottom right to add a new device:
 ![Gadgetbridge 0](gadgetbridge0.jpg)
 Wait for the scan to complete, your PineTime should be detected:
 ![Gadgetbridge 1](gadgetbridge1.jpg)
 Tap on it. Gadgdetbridge will pair and connect to your device:
 ![Gadgetbridge 2](gadgetbridge2.jpg)
 # Updating with Gadgetbridge
 Now that Gadgetbridge is connected to your PineTime, use a file browser application and find the DFU file (`pinetime-mcuboot-app-dfu-x.x.x.zip`) you downloaded previously. Tap on it and open it using the Gadgetbridge application/firmware installer:
 ![Gadgetbridge 3](gadgetbridge3.jpg)
 Read the warning carefully and tap **Install**:
 ![Gadgetbridge 4](gadgetbridge4.jpg)
 Wait for the transfer to finish. Your PineTime should reset and reboot with the new version of InfiniTime!
 Don't forget to **validate** your firmware. In the InfiniTime go to the settings (swipe right, select gear icon) and Firmware option and click **validate**. Otherwise after reboot the previous firmware will be used.
 ![Gadgetbridge 5](gadgetbridge5.jpg)
--- a/doc/gettingStarted/ota-nrfconnect.md
+++ b/doc/gettingStarted/ota-nrfconnect.md
@ -0,0 +1,22 @@
 # Updating with NRFConnect
 Open NRFConnect. Swipe down in the *Scanner* tab and wait for your device to appear:
 ![NRFConnect 0](nrfconnect0.jpg)
 Tap on the *Connect* button on the right of your device. NRFConnect will connect to your PineTime and discover its characteristics. Tap on the **DFU** button on the top right:
 ![NRFConnect 1](nrfconnect1.jpg)
 Select **Distribution packet (ZIP)**:
 ![NRFConnect 2](nrfconnect2.jpg)
 Find the DFU file (`pinetime-mcuboot-app-dfu-x.x.x.zip`) you downloaded previously, the DFU transfer will start automatically. When the transfer is finished, your PineTime will reset and restart on the new version of InfiniTime!
 Don't forget to **validate** your firmware. In the InfiniTime go to the settings (swipe right, select gear icon) and Firmware option and click **validate**. Otherwise after reboot the previous firmware will be used.
 ![NRFConnect 3](nrfconnect3.jpg)
 # Demo
 [This video](https://seafile.codingfield.com/f/a52b69683a05472a90c7/) shows how to use NRFConnect to update the firmware running on the Pinetime.
--- a/doc/gettingStarted/quickactions.jpg
+++ b/doc/gettingStarted/quickactions.jpg
--- a/doc/gettingStarted/settings.jpg
+++ b/doc/gettingStarted/settings.jpg
--- a/doc/gettingStarted/time-nrfconnect.md
+++ b/doc/gettingStarted/time-nrfconnect.md
@ -0,0 +1,11 @@
 ### Syncing time
 You must enable the **CTS** *GATT server* in NRFConnect so that InfiniTime can synchronize the time with your smartphone.
 Launch NRFConnect, tap the sandwich button on the top left and select *Configure GATT server*:
 ![NRFConnect CTS 0](nrfconnectcts0.jpg)
 Tap *Add service* and select the server configuration *Current Time service*. Tap OK and connect to your PineTime, it should automcatically sync the time once the connection is established!
 ![NRFConnect CTS 1](nrfconnectcts1.jpg)
--- a/doc/gettingStarted/ui/applist.jpg
+++ b/doc/gettingStarted/ui/applist.jpg
--- a/doc/gettingStarted/ui/notifications.jpg
+++ b/doc/gettingStarted/ui/notifications.jpg
--- a/doc/gettingStarted/ui/quicksettings.jpg
+++ b/doc/gettingStarted/ui/quicksettings.jpg
--- a/doc/gettingStarted/ui/settings.jpg
+++ b/doc/gettingStarted/ui/settings.jpg
--- a/doc/gettingStarted/ui/watchface.jpg
+++ b/doc/gettingStarted/ui/watchface.jpg
--- a/doc/gettingStarted/updating-software.md
+++ b/doc/gettingStarted/updating-software.md
@ -0,0 +1,41 @@
 # Updating InfiniTime
 If you just want to flash or upgrade InfiniTime on your PineTime, this page is for you! If you want more information about the software and the update procedure, check out [this](/doc/gettingStarted/about-software.md) page.
 ## Checking the version of InfiniTime
 You can check the InfiniTime version by first swiping right on the watchface to open quick settings, tapping the cogwheel to open settings, swipe up until you find an entry named "About" and tap on it.
 ![InfiniTime 1.0 version](version-1.0.jpg)
 PineTimes shipped after June 2021 will ship with the latest version of [the bootloader](https://github.com/JF002/pinetime-mcuboot-bootloader/releases/tag/1.0.0) and [recovery firmware](https://github.com/InfiniTimeOrg/InfiniTime/releases/tag/0.14.1)
 The bootloader is run right before booting into InfiniTime. It is easily recognizable with its white pine cone that is progressively drawn in green. It also displays its own version on the bottom (1.0.0 as of now).
 ![Bootloader 1.0](bootloader-1.0.jpg)
 ## Updating with companion apps
 To update your PineTime, you can use one of the [compatible companion applications](/README.md#companion-apps).
 The updating process differs slightly on every companion app, so you'll need to familiarize yourself with the companion app of your choice.
 All releases of InfiniTime are available on the [release page of the GitHub repo](https://github.com/InfiniTimeOrg/InfiniTime/releases) under assets.
 To update the firmware, you need to download the DFU of the firmware version that you'd like to install, for example `pinetime-mcuboot-app-dfu-1.6.0.zip`, and flash it with your companion app.
 We have prepared instructions for flashing InfiniTime with Gadgetbridge and NRFConnect.
 - [Updating with Gadgetbridge](/doc/gettingStarted/ota-gadgetbridge.md)
 - [Updating with NRFConnect](/doc/gettingStarted/ota-nrfconnect.md)
 ## Firmware validation
 Firmware updates must be manually validated. If the firmware isn't validated and the watch resets, the watch will revert to the previous firmware. This is a safety feature to prevent bricking your device with faulty firmware.
 You can validate your updated firmware on InfiniTime >= 1.0 by following this simple procedure:
 - From the watchface, swipe **right** to display the *quick settings menu*
 - Open settings by tapping the cogwheel on the bottom right
 - Swipe up until you find an entry named **Firmware** and tap on it
 - If the firmware is not validated yet, you can either validate the running firmware, or reset and revert to the previous firmware version
--- a/doc/gettingStarted/version-071.jpg
+++ b/doc/gettingStarted/version-071.jpg
--- a/doc/gettingStarted/version-1.0.jpg
+++ b/doc/gettingStarted/version-1.0.jpg
--- a/doc/openOCD.md
+++ b/doc/openOCD.md
@ -1,12 +1,12 @@
 # OpenOCD and STLink
 OpenOCD (**Open O**n **C**hip **D**ebugger) is an open source tool that interfaces with many SWD/JTAG debugger to provide debugging and *in-system* programming for embedded target devices.
-It supports the **NRF52** (the CPU of the PineTime) and the **STLinkV2**, a cheap SWD debugger.
+OpenOCD supports the **NRF52** (the CPU of the PineTime) and the **STLinkV2**, a cheap SWD debugger.
-It works on X86 computers, as well as ARM/ARM64 computers and SBC (like the RaspberryPi and Pine64 Pinebook Pro) !
+OpenOCD works on X86 computers, ARM/ARM64 computers, and SBCs (like the RaspberryPi and Pine64 Pinebook Pro)!
 ## Installation
-We will build OpenOCD from sources, as packages from Linux distributions are most of the time outdated and do not support the NRF52 correctly. 
+We will build OpenOCD from sources, as packages from Linux distributions are most of the time outdated and do not support the NRF52 properly.
 - Fetch the sources from GIT, and build and install it:
@ -27,7 +27,7 @@ sudo cp contrib/60-openocd.rules /etc/udev/rules.d/
 sudo udevadm control --reload-rules
 ```
- - You can now plug your STLinkV2 in a USB port and run OpenOCD to see if it's working correctly:
+ - You can now plug your STLinkV2 into a USB port and run OpenOCD to see if it's working correctly:
 ```
 $ openocd -f interface/stlink.cfg -f target/nrf52.cfg
@ -63,7 +63,7 @@ gdb_breakpoint_override hard
 source [find target/nrf52.cfg]
 ```
-This file specifies to OpenOCD which debugger and target it will be connected to..
+This file specifies to OpenOCD which debugger and target it will be connected to.
 Then, we use various *user files* to use OpenOCD to flash InfiniTime binary files.
--- a/doc/ui_guidelines.md
+++ b/doc/ui_guidelines.md
@ -4,13 +4,10 @@
 - Buttons should generally be at least 50px high
 - Buttons should generally be on the bottom edge
 - Make interactable objects **big**
 - Recommendations for inner padding, aka distance between buttons:
 	- When aligning 4 objects: 4px, e.g. Settings
 	- When aligning 3 objects: 6px, e.g. App list
 	- When aligning 2 objects: 10px, e.g. Quick settings
 - When using a page indicator, leave 8px for it on the right side
 	- It is acceptable to leave 8px on the left side as well to center the content
 - Top bar takes at least 20px + padding
 	- Top bar right icons move 8px to the left when using a page indicator
 - A black background helps to hide the screen border, allowing the UI to look less cramped when utilizing the entire display area.
 ![example layouts](./ui/example.png)
--- a/doc/versioning.md
+++ b/doc/versioning.md
@ -1,6 +1,6 @@
 # Versioning
-The versioning of this project is based on [Semantic versionning](https://semver.org/) :
+The versioning of this project is based on [Semantic versioning](https://semver.org/):
- - The **patch** is incremented when we fix a bug on a **released** version (most of the time using a **hotfix** branch).
+ - The **patch** is incremented when a bug is fixed on a **released** version (most of the time using a **hotfix** branch).
- - The **minor** is incremented when we release a new version with new features. It corresponds to a merge of **develop** into **master**.
+ - The **minor** is incremented when a new version with new features is released. It corresponds to a merge of **develop** into **master**.
- - The **major** should be incremented when a breaking change is made to the application. We still have to define what is a breaking change in the context of this project. For now, I suggest that it stays **0** until we have a fully functioning firmware suited for the final user.
+ - The **major** should be incremented when a breaking change is made to the application. We still have to define what is a breaking change in the context of this project.
--- a/images/infinitime-logo-github.jpg
+++ b/images/infinitime-logo-github.jpg
--- a/images/infinitime-logo-small.jpg
+++ b/images/infinitime-logo-small.jpg
--- a/src/BootloaderVersion.h
+++ b/src/BootloaderVersion.h
@ -1,5 +1,8 @@
 #pragma once
 #include <cstdint>
 #include <cstddef>
 namespace Pinetime {
  class BootloaderVersion {
  public:
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -154,6 +154,7 @@ set(NIMBLE_SRC
        libs/mynewt-nimble/nimble/controller/src/ble_ll_supp_cmd.c
        libs/mynewt-nimble/nimble/controller/src/ble_ll_hci_ev.c
        libs/mynewt-nimble/nimble/controller/src/ble_ll_rfmgmt.c
        libs/mynewt-nimble/nimble/controller/src/ble_ll_resolv.c
        libs/mynewt-nimble/porting/nimble/src/os_cputime.c
        libs/mynewt-nimble/porting/nimble/src/os_cputime_pwr2.c
        libs/mynewt-nimble/porting/nimble/src/os_mbuf.c
@ -357,6 +358,14 @@ set(LVGL_SRC
        libs/lvgl/src/lv_widgets/lv_win.c
        )
 set(QCBOR_SRC
        libs/QCBOR/src/ieee754.c
        libs/QCBOR/src/qcbor_decode.c
        libs/QCBOR/src/qcbor_encode.c
        libs/QCBOR/src/qcbor_err_to_str.c
        libs/QCBOR/src/UsefulBuf.c
        )
 list(APPEND IMAGE_FILES
        displayapp/icons/battery/os_battery_error.c
        displayapp/icons/battery/os_battery_100.c
@ -407,6 +416,7 @@ list(APPEND SOURCE_FILES
        displayapp/screens/Label.cpp
        displayapp/screens/FirmwareUpdate.cpp
        displayapp/screens/Music.cpp
        displayapp/screens/Weather.cpp
        displayapp/screens/Navigation.cpp
        displayapp/screens/Metronome.cpp
        displayapp/screens/Motion.cpp
@ -421,8 +431,10 @@ list(APPEND SOURCE_FILES
        displayapp/screens/BatteryInfo.cpp
        displayapp/screens/Steps.cpp
        displayapp/screens/Timer.cpp
        displayapp/screens/PassKey.cpp
        displayapp/screens/Error.cpp
        displayapp/screens/Alarm.cpp
        displayapp/screens/Styles.cpp
        displayapp/Colors.cpp
        ## Settings
@ -433,7 +445,6 @@ list(APPEND SOURCE_FILES
        displayapp/screens/settings/SettingWakeUp.cpp
        displayapp/screens/settings/SettingDisplay.cpp
        displayapp/screens/settings/SettingSteps.cpp
        displayapp/screens/settings/SettingPineTimeStyle.cpp
        displayapp/screens/settings/SettingSetDate.cpp
        displayapp/screens/settings/SettingSetTime.cpp
        displayapp/screens/settings/SettingChimes.cpp
@ -472,9 +483,11 @@ list(APPEND SOURCE_FILES
        components/ble/CurrentTimeService.cpp
        components/ble/AlertNotificationService.cpp
        components/ble/MusicService.cpp
        components/ble/weather/WeatherService.cpp
        components/ble/NavigationService.cpp
        displayapp/fonts/lv_font_navi_80.c
        components/ble/BatteryInformationService.cpp
        components/ble/FSService.cpp
        components/ble/ImmediateAlertService.cpp
        components/ble/ServiceDiscovery.cpp
        components/ble/HeartRateService.cpp
@ -508,6 +521,7 @@ list(APPEND SOURCE_FILES
        components/heartrate/Ptagc.cpp
        components/heartrate/HeartRateController.cpp
        buttonhandler/ButtonHandler.cpp
        touchhandler/TouchHandler.cpp
        )
@ -542,7 +556,9 @@ list(APPEND RECOVERY_SOURCE_FILES
        components/ble/CurrentTimeService.cpp
        components/ble/AlertNotificationService.cpp
        components/ble/MusicService.cpp
        components/ble/weather/WeatherService.cpp
        components/ble/BatteryInformationService.cpp
        components/ble/FSService.cpp
        components/ble/ImmediateAlertService.cpp
        components/ble/ServiceDiscovery.cpp
        components/ble/NavigationService.cpp
@ -568,6 +584,7 @@ list(APPEND RECOVERY_SOURCE_FILES
        components/heartrate/Ptagc.cpp
        components/motor/MotorController.cpp
        components/fs/FS.cpp
        buttonhandler/ButtonHandler.cpp
        touchhandler/TouchHandler.cpp
        )
@ -644,6 +661,9 @@ set(INCLUDE_FILES
        components/datetime/DateTimeController.h
        components/brightness/BrightnessController.h
        components/motion/MotionController.h
        components/firmwarevalidator/FirmwareValidator.h
        components/ble/BleController.h
        components/ble/NotificationManager.h
        components/ble/NimbleController.h
        components/ble/DeviceInformationService.h
        components/ble/CurrentTimeClient.h
@ -651,11 +671,13 @@ set(INCLUDE_FILES
        components/ble/DfuService.h
        components/firmwarevalidator/FirmwareValidator.h
        components/ble/BatteryInformationService.h
        components/ble/FSService.h
        components/ble/ImmediateAlertService.h
        components/ble/ServiceDiscovery.h
        components/ble/BleClient.h
        components/ble/HeartRateService.h
        components/ble/MotionService.h
        components/ble/weather/WeatherService.h
        components/settings/Settings.h
        components/timer/TimerController.h
        components/alarm/AlarmController.h
@ -682,6 +704,7 @@ set(INCLUDE_FILES
        components/heartrate/Ptagc.h
        components/heartrate/HeartRateController.h
        components/motor/MotorController.h
        buttonhandler/ButtonHandler.h
        touchhandler/TouchHandler.h
        )
@ -780,7 +803,7 @@ link_directories(
 )
-set(COMMON_FLAGS -MP -MD -mthumb -mabi=aapcs -Wall -Wno-unknown-pragmas -g3 -ffunction-sections -fdata-sections -fno-strict-aliasing -fno-builtin --short-enums -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wreturn-type -Werror=return-type -fstack-usage -fno-exceptions -fno-non-call-exceptions)
+set(COMMON_FLAGS -MP -MD -mthumb -mabi=aapcs -Wall -Wextra -Warray-bounds=2 -Wformat=2 -Wformat-overflow=2 -Wformat-truncation=2 -Wformat-nonliteral -ftree-vrp -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unknown-pragmas -Wno-expansion-to-defined -g3 -ffunction-sections -fdata-sections -fno-strict-aliasing -fno-builtin --short-enums -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wreturn-type -Werror=return-type -fstack-usage -fno-exceptions -fno-non-call-exceptions)
 add_definitions(-DCONFIG_GPIO_AS_PINRESET)
 add_definitions(-DNIMBLE_CFG_CONTROLLER)
 add_definitions(-DOS_CPUTIME_FREQ)
@ -802,10 +825,10 @@ add_library(nrf-sdk STATIC ${SDK_SOURCE_FILES})
 target_include_directories(nrf-sdk SYSTEM PUBLIC . ../)
 target_include_directories(nrf-sdk SYSTEM PUBLIC ${INCLUDES_FROM_LIBS})
 target_compile_options(nrf-sdk PRIVATE
-        $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -Og -g3>
+        $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -Wno-expansion-to-defined -Og -g3>
-        $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -Os>
+        $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -Wno-expansion-to-defined -O3>
-        $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -Og -fno-rtti>
+        $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -Wno-expansion-to-defined -Og -fno-rtti>
-        $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -Os -fno-rtti>
+        $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -Wno-expansion-to-defined -O3 -fno-rtti>
        $<$<COMPILE_LANGUAGE:ASM>: -MP -MD -x assembler-with-cpp>
        )
@ -833,6 +856,25 @@ target_compile_options(lvgl PRIVATE
        $<$<COMPILE_LANGUAGE:ASM>: -MP -MD -x assembler-with-cpp>
        )
 # QCBOR
 add_library(QCBOR STATIC ${QCBOR_SRC})
 target_include_directories(QCBOR SYSTEM PUBLIC libs/QCBOR/inc)
 # This is required with the current configuration
 target_compile_definitions(QCBOR PUBLIC QCBOR_DISABLE_FLOAT_HW_USE)
 # These are for space-saving
 target_compile_definitions(QCBOR PUBLIC QCBOR_DISABLE_PREFERRED_FLOAT)
 target_compile_definitions(QCBOR PUBLIC QCBOR_DISABLE_EXP_AND_MANTISSA)
 target_compile_definitions(QCBOR PUBLIC QCBOR_DISABLE_INDEFINITE_LENGTH_STRINGS)
 #target_compile_definitions(QCBOR PUBLIC QCBOR_DISABLE_INDEFINITE_LENGTH_ARRAYS)
 target_compile_definitions(QCBOR PUBLIC QCBOR_DISABLE_UNCOMMON_TAGS)
 target_compile_definitions(QCBOR PUBLIC USEFULBUF_CONFIG_LITTLE_ENDIAN)
 set_target_properties(QCBOR PROPERTIES LINKER_LANGUAGE C)
 target_compile_options(QCBOR PRIVATE
        $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
        $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
        $<$<COMPILE_LANGUAGE:ASM>: -MP -MD -x assembler-with-cpp>
        )
 # LITTLEFS_SRC
 add_library(littlefs STATIC ${LITTLEFS_SRC})
 target_include_directories(littlefs SYSTEM PUBLIC . ../)
@ -851,12 +893,12 @@ set(EXECUTABLE_FILE_NAME ${EXECUTABLE_NAME}-${pinetime_VERSION_MAJOR}.${pinetime
 set(NRF5_LINKER_SCRIPT "${CMAKE_SOURCE_DIR}/gcc_nrf52.ld")
 add_executable(${EXECUTABLE_NAME} ${SOURCE_FILES})
 set_target_properties(${EXECUTABLE_NAME} PROPERTIES OUTPUT_NAME ${EXECUTABLE_FILE_NAME})
-target_link_libraries(${EXECUTABLE_NAME} nimble nrf-sdk lvgl littlefs)
+target_link_libraries(${EXECUTABLE_NAME} nimble nrf-sdk lvgl littlefs QCBOR)
 target_compile_options(${EXECUTABLE_NAME} PUBLIC
-        $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -Og -g3>
+        $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -Wextra -Wformat -Wno-missing-field-initializers -Wno-unused-parameter -Og -g3>
-        $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -Os>
+        $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -Wextra -Wformat -Wno-missing-field-initializers -Wno-unused-parameter -Os>
-        $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -Og -g3 -fno-rtti>
+        $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -Wextra -Wformat -Wno-missing-field-initializers -Wno-unused-parameter -Og -g3 -fno-rtti>
-        $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -Os -fno-rtti>
+        $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -Wextra -Wformat -Wno-missing-field-initializers -Wno-unused-parameter -Os -fno-rtti>
        $<$<COMPILE_LANGUAGE:ASM>: -MP -MD -x assembler-with-cpp>
        )
@ -880,7 +922,7 @@ set(IMAGE_MCUBOOT_FILE_NAME ${EXECUTABLE_MCUBOOT_NAME}-image-${pinetime_VERSION_
 set(DFU_MCUBOOT_FILE_NAME ${EXECUTABLE_MCUBOOT_NAME}-dfu-${pinetime_VERSION_MAJOR}.${pinetime_VERSION_MINOR}.${pinetime_VERSION_PATCH}.zip)
 set(NRF5_LINKER_SCRIPT_MCUBOOT "${CMAKE_SOURCE_DIR}/gcc_nrf52-mcuboot.ld")
 add_executable(${EXECUTABLE_MCUBOOT_NAME} ${SOURCE_FILES})
-target_link_libraries(${EXECUTABLE_MCUBOOT_NAME} nimble nrf-sdk lvgl littlefs)
+target_link_libraries(${EXECUTABLE_MCUBOOT_NAME} nimble nrf-sdk lvgl littlefs QCBOR)
 set_target_properties(${EXECUTABLE_MCUBOOT_NAME} PROPERTIES OUTPUT_NAME ${EXECUTABLE_MCUBOOT_FILE_NAME})
 target_compile_options(${EXECUTABLE_MCUBOOT_NAME} PUBLIC
        $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -Og -g3>
@ -916,7 +958,7 @@ endif()
 set(EXECUTABLE_RECOVERY_NAME "pinetime-recovery")
 set(EXECUTABLE_RECOVERY_FILE_NAME ${EXECUTABLE_RECOVERY_NAME}-${pinetime_VERSION_MAJOR}.${pinetime_VERSION_MINOR}.${pinetime_VERSION_PATCH})
 add_executable(${EXECUTABLE_RECOVERY_NAME} ${RECOVERY_SOURCE_FILES})
-target_link_libraries(${EXECUTABLE_RECOVERY_NAME} nimble nrf-sdk littlefs)
+target_link_libraries(${EXECUTABLE_RECOVERY_NAME} nimble nrf-sdk littlefs QCBOR)
 set_target_properties(${EXECUTABLE_RECOVERY_NAME} PROPERTIES OUTPUT_NAME ${EXECUTABLE_RECOVERY_FILE_NAME})
 target_compile_definitions(${EXECUTABLE_RECOVERY_NAME} PUBLIC "PINETIME_IS_RECOVERY")
 target_compile_options(${EXECUTABLE_RECOVERY_NAME} PUBLIC
@ -946,7 +988,7 @@ set(EXECUTABLE_RECOVERY_MCUBOOT_FILE_NAME ${EXECUTABLE_RECOVERY_MCUBOOT_NAME}-${
 set(IMAGE_RECOVERY_MCUBOOT_FILE_NAME ${EXECUTABLE_RECOVERY_MCUBOOT_NAME}-image-${pinetime_VERSION_MAJOR}.${pinetime_VERSION_MINOR}.${pinetime_VERSION_PATCH}.bin)
 set(DFU_RECOVERY_MCUBOOT_FILE_NAME ${EXECUTABLE_RECOVERY_MCUBOOT_NAME}-dfu-${pinetime_VERSION_MAJOR}.${pinetime_VERSION_MINOR}.${pinetime_VERSION_PATCH}.zip)
 add_executable(${EXECUTABLE_RECOVERY_MCUBOOT_NAME} ${RECOVERY_SOURCE_FILES})
-target_link_libraries(${EXECUTABLE_RECOVERY_MCUBOOT_NAME} nimble nrf-sdk littlefs)
+target_link_libraries(${EXECUTABLE_RECOVERY_MCUBOOT_NAME} nimble nrf-sdk littlefs QCBOR)
 set_target_properties(${EXECUTABLE_RECOVERY_MCUBOOT_NAME} PROPERTIES OUTPUT_NAME ${EXECUTABLE_RECOVERY_MCUBOOT_FILE_NAME})
 target_compile_definitions(${EXECUTABLE_RECOVERY_MCUBOOT_NAME} PUBLIC "PINETIME_IS_RECOVERY")
 target_compile_options(${EXECUTABLE_RECOVERY_MCUBOOT_NAME} PUBLIC
@ -984,7 +1026,7 @@ endif()
 set(EXECUTABLE_RECOVERYLOADER_NAME "pinetime-recovery-loader")
 set(EXECUTABLE_RECOVERYLOADER_FILE_NAME ${EXECUTABLE_RECOVERYLOADER_NAME}-${pinetime_VERSION_MAJOR}.${pinetime_VERSION_MINOR}.${pinetime_VERSION_PATCH})
 add_executable(${EXECUTABLE_RECOVERYLOADER_NAME} ${RECOVERYLOADER_SOURCE_FILES})
-target_link_libraries(${EXECUTABLE_RECOVERYLOADER_NAME} nrf-sdk)
+target_link_libraries(${EXECUTABLE_RECOVERYLOADER_NAME} nrf-sdk QCBOR)
 set_target_properties(${EXECUTABLE_RECOVERYLOADER_NAME} PROPERTIES OUTPUT_NAME ${EXECUTABLE_RECOVERYLOADER_FILE_NAME})
 target_compile_options(${EXECUTABLE_RECOVERYLOADER_NAME} PUBLIC
        $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -Og -g3>
@ -1017,7 +1059,7 @@ set(EXECUTABLE_MCUBOOT_RECOVERYLOADER_FILE_NAME ${EXECUTABLE_MCUBOOT_RECOVERYLOA
 set(IMAGE_MCUBOOT_RECOVERYLOADER_FILE_NAME ${EXECUTABLE_MCUBOOT_RECOVERYLOADER_NAME}-image-${pinetime_VERSION_MAJOR}.${pinetime_VERSION_MINOR}.${pinetime_VERSION_PATCH}.bin)
 set(DFU_MCUBOOT_RECOVERYLOADER_FILE_NAME ${EXECUTABLE_MCUBOOT_RECOVERYLOADER_NAME}-dfu-${pinetime_VERSION_MAJOR}.${pinetime_VERSION_MINOR}.${pinetime_VERSION_PATCH}.zip)
 add_executable(${EXECUTABLE_MCUBOOT_RECOVERYLOADER_NAME} ${RECOVERYLOADER_SOURCE_FILES})
-target_link_libraries(${EXECUTABLE_MCUBOOT_RECOVERYLOADER_NAME} nrf-sdk)
+target_link_libraries(${EXECUTABLE_MCUBOOT_RECOVERYLOADER_NAME} nrf-sdk QCBOR)
 set_target_properties(${EXECUTABLE_MCUBOOT_RECOVERYLOADER_NAME} PROPERTIES OUTPUT_NAME ${EXECUTABLE_MCUBOOT_RECOVERYLOADER_FILE_NAME})
 target_compile_options(${EXECUTABLE_MCUBOOT_RECOVERYLOADER_NAME} PUBLIC
        $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -Og -g3>
--- a/src/Version.h.in
+++ b/src/Version.h.in
@ -2,6 +2,8 @@
@VERSION_EDIT_WARNING@
 #include <cstdint>
 namespace Pinetime {
  class Version {
    public:
--- a/src/buttonhandler/ButtonActions.h
+++ b/src/buttonhandler/ButtonActions.h
@ -0,0 +1,7 @@
 #pragma once
 namespace Pinetime {
  namespace Controllers {
    enum class ButtonActions { None, Click, DoubleClick, LongPress, LongerPress };
  }
 }
--- a/src/buttonhandler/ButtonHandler.cpp
+++ b/src/buttonhandler/ButtonHandler.cpp
@ -0,0 +1,78 @@
 #include "ButtonHandler.h"
 using namespace Pinetime::Controllers;
 void ButtonTimerCallback(TimerHandle_t xTimer) {
  auto* sysTask = static_cast<Pinetime::System::SystemTask*>(pvTimerGetTimerID(xTimer));
  sysTask->PushMessage(Pinetime::System::Messages::HandleButtonTimerEvent);
 }
 void ButtonHandler::Init(Pinetime::System::SystemTask* systemTask) {
  buttonTimer = xTimerCreate("buttonTimer", pdMS_TO_TICKS(200), pdFALSE, systemTask, ButtonTimerCallback);
 }
 ButtonActions ButtonHandler::HandleEvent(Events event) {
  static constexpr TickType_t doubleClickTime = pdMS_TO_TICKS(200);
  static constexpr TickType_t longPressTime = pdMS_TO_TICKS(400);
  static constexpr TickType_t longerPressTime = pdMS_TO_TICKS(2000);
  if (event == Events::Press) {
    buttonPressed = true;
  } else if (event == Events::Release) {
    releaseTime = xTaskGetTickCount();
    buttonPressed = false;
  }
  switch (state) {
    case States::Idle:
      if (event == Events::Press) {
        xTimerChangePeriod(buttonTimer, doubleClickTime, 0);
        xTimerStart(buttonTimer, 0);
        state = States::Pressed;
      }
      break;
    case States::Pressed:
      if (event == Events::Press) {
        if (xTaskGetTickCount() - releaseTime < doubleClickTime) {
          xTimerStop(buttonTimer, 0);
          state = States::Idle;
          return ButtonActions::DoubleClick;
        }
      } else if (event == Events::Release) {
        xTimerChangePeriod(buttonTimer, doubleClickTime, 0);
        xTimerStart(buttonTimer, 0);
      } else if (event == Events::Timer) {
        if (buttonPressed) {
          xTimerChangePeriod(buttonTimer, longPressTime - doubleClickTime, 0);
          xTimerStart(buttonTimer, 0);
          state = States::Holding;
        } else {
          state = States::Idle;
          return ButtonActions::Click;
        }
      }
      break;
    case States::Holding:
      if (event == Events::Release) {
        xTimerStop(buttonTimer, 0);
        state = States::Idle;
        return ButtonActions::Click;
      } else if (event == Events::Timer) {
        xTimerChangePeriod(buttonTimer, longerPressTime - longPressTime - doubleClickTime, 0);
        xTimerStart(buttonTimer, 0);
        state = States::LongHeld;
        return ButtonActions::LongPress;
      }
      break;
    case States::LongHeld:
      if (event == Events::Release) {
        xTimerStop(buttonTimer, 0);
        state = States::Idle;
      } else if (event == Events::Timer) {
        state = States::Idle;
        return ButtonActions::LongerPress;
      }
      break;
  }
  return ButtonActions::None;
 }
--- a/src/buttonhandler/ButtonHandler.h
+++ b/src/buttonhandler/ButtonHandler.h
@ -0,0 +1,24 @@
 #pragma once
 #include "ButtonActions.h"
 #include "systemtask/SystemTask.h"
 #include <FreeRTOS.h>
 #include <timers.h>
 namespace Pinetime {
  namespace Controllers {
    class ButtonHandler {
    public:
      enum class Events : uint8_t { Press, Release, Timer };
      void Init(Pinetime::System::SystemTask* systemTask);
      ButtonActions HandleEvent(Events event);
    private:
      enum class States : uint8_t { Idle, Pressed, Holding, LongHeld };
      TickType_t releaseTime = 0;
      TimerHandle_t buttonTimer;
      bool buttonPressed = false;
      States state = States::Idle;
    };
  }
 }
--- a/src/components/alarm/AlarmController.cpp
+++ b/src/components/alarm/AlarmController.cpp
@ -15,7 +15,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-#include "AlarmController.h"
+#include "components/alarm/AlarmController.h"
 #include "systemtask/SystemTask.h"
 #include "app_timer.h"
 #include "task.h"
--- a/src/components/alarm/AlarmController.h
+++ b/src/components/alarm/AlarmController.h
@ -18,7 +18,6 @@
 #pragma once
 #include <cstdint>
 #include "app_timer.h"
 #include "components/datetime/DateTimeController.h"
 namespace Pinetime {
--- a/src/components/battery/BatteryController.cpp
+++ b/src/components/battery/BatteryController.cpp
@ -1,8 +1,9 @@
-#include "BatteryController.h"
+#include "components/battery/BatteryController.h"
 #include "drivers/PinMap.h"
 #include <hal/nrf_gpio.h>
 #include <nrfx_saadc.h>
 #include <algorithm>
 #include <cmath>
 using namespace Pinetime::Controllers;
--- a/src/components/ble/AlertNotificationClient.cpp
+++ b/src/components/ble/AlertNotificationClient.cpp
@ -1,6 +1,6 @@
-#include "AlertNotificationClient.h"
+#include "components/ble/AlertNotificationClient.h"
 #include <algorithm>
-#include "NotificationManager.h"
+#include "components/ble/NotificationManager.h"
 #include "systemtask/SystemTask.h"
 using namespace Pinetime::Controllers;
--- a/src/components/ble/AlertNotificationClient.h
+++ b/src/components/ble/AlertNotificationClient.h
@ -7,7 +7,7 @@
 #include <host/ble_gap.h>
 #undef max
 #undef min
-#include "BleClient.h"
+#include "components/ble/BleClient.h"
 namespace Pinetime {
--- a/src/components/ble/AlertNotificationService.cpp
+++ b/src/components/ble/AlertNotificationService.cpp
@ -1,8 +1,8 @@
-#include "AlertNotificationService.h"
+#include "components/ble/AlertNotificationService.h"
 #include <hal/nrf_rtc.h>
 #include <cstring>
 #include <algorithm>
-#include "NotificationManager.h"
+#include "components/ble/NotificationManager.h"
 #include "systemtask/SystemTask.h"
 using namespace Pinetime::Controllers;
@ -53,8 +53,9 @@ int AlertNotificationService::OnAlert(uint16_t conn_handle, uint16_t attr_handle
    // Ignore notifications with empty message
    const auto packetLen = OS_MBUF_PKTLEN(ctxt->om);
-    if (packetLen <= headerSize)
+    if (packetLen <= headerSize) {
      return 0;
    }
    size_t bufferSize = std::min(packetLen + stringTerminatorSize, maxBufferSize);
    auto messageSize = std::min(maxMessageSize, (bufferSize - headerSize));
--- a/src/components/ble/BatteryInformationService.cpp
+++ b/src/components/ble/BatteryInformationService.cpp
@ -1,5 +1,5 @@
 #include "components/ble/BatteryInformationService.h"
 #include <nrf_log.h>
 #include "BatteryInformationService.h"
 #include "components/battery/BatteryController.h"
 using namespace Pinetime::Controllers;
--- a/src/components/ble/BleController.cpp
+++ b/src/components/ble/BleController.cpp
@ -1,4 +1,4 @@
-#include "BleController.h"
+#include "components/ble/BleController.h"
 using namespace Pinetime::Controllers;
--- a/src/components/ble/BleController.h
+++ b/src/components/ble/BleController.h
@ -9,7 +9,7 @@ namespace Pinetime {
    public:
      using BleAddress = std::array<uint8_t, 6>;
      enum class FirmwareUpdateStates { Idle, Running, Validated, Error };
-      enum class AddressTypes { Public, Random };
+      enum class AddressTypes { Public, Random, RPA_Public, RPA_Random };
      Ble() = default;
      bool IsConnected() const {
@ -48,6 +48,12 @@ namespace Pinetime {
      void AddressType(AddressTypes t) {
        addressType = t;
      }
      void SetPairingKey(uint32_t k) {
        pairingKey = k;
      }
      uint32_t GetPairingKey() const {
        return pairingKey;
      }
    private:
      bool isConnected = false;
@ -57,6 +63,7 @@ namespace Pinetime {
      FirmwareUpdateStates firmwareUpdateState = FirmwareUpdateStates::Idle;
      BleAddress address;
      AddressTypes addressType;
      uint32_t pairingKey = 0;
    };
  }
-}
+}
--- a/src/components/ble/CurrentTimeClient.cpp
+++ b/src/components/ble/CurrentTimeClient.cpp
@ -1,4 +1,4 @@
-#include "CurrentTimeClient.h"
+#include "components/ble/CurrentTimeClient.h"
 #include <hal/nrf_rtc.h>
 #include <nrf_log.h>
 #include "components/datetime/DateTimeController.h"
--- a/src/components/ble/CurrentTimeClient.h
+++ b/src/components/ble/CurrentTimeClient.h
@ -5,7 +5,7 @@
 #undef max
 #undef min
 #include <cstdint>
-#include "BleClient.h"
+#include "components/ble/BleClient.h"
 namespace Pinetime {
  namespace Controllers {
--- a/src/components/ble/CurrentTimeService.cpp
+++ b/src/components/ble/CurrentTimeService.cpp
@ -1,4 +1,4 @@
-#include "CurrentTimeService.h"
+#include "components/ble/CurrentTimeService.h"
 #include <hal/nrf_rtc.h>
 #include <nrf_log.h>
--- a/src/components/ble/DeviceInformationService.cpp
+++ b/src/components/ble/DeviceInformationService.cpp
@ -1,4 +1,4 @@
-#include "DeviceInformationService.h"
+#include "components/ble/DeviceInformationService.h"
 using namespace Pinetime::Controllers;
--- a/src/components/ble/DeviceInformationService.h
+++ b/src/components/ble/DeviceInformationService.h
@ -1,4 +1,5 @@
 #pragma once
 #include <cstdint>
 #define min // workaround: nimble's min/max macros conflict with libstdc++
 #define max
 #include <host/ble_gap.h>
--- a/src/components/ble/DfuService.cpp
+++ b/src/components/ble/DfuService.cpp
@ -1,4 +1,4 @@
-#include "DfuService.h"
+#include "components/ble/DfuService.h"
 #include <cstring>
 #include "components/ble/BleController.h"
 #include "drivers/SpiNorFlash.h"
--- a/src/components/ble/FSService.cpp
+++ b/src/components/ble/FSService.cpp
@ -0,0 +1,330 @@
 #include <nrf_log.h>
 #include "FSService.h"
 #include "components/ble/BleController.h"
 #include "systemtask/SystemTask.h"
 using namespace Pinetime::Controllers;
 constexpr ble_uuid16_t FSService::fsServiceUuid;
 constexpr ble_uuid128_t FSService::fsVersionUuid;
 constexpr ble_uuid128_t FSService::fsTransferUuid;
 int FSServiceCallback(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt* ctxt, void* arg) {
  auto* fsService = static_cast<FSService*>(arg);
  return fsService->OnFSServiceRequested(conn_handle, attr_handle, ctxt);
 }
 FSService::FSService(Pinetime::System::SystemTask& systemTask, Pinetime::Controllers::FS& fs)
  : systemTask {systemTask},
    fs {fs},
    characteristicDefinition {{.uuid = &fsVersionUuid.u,
                               .access_cb = FSServiceCallback,
                               .arg = this,
                               .flags = BLE_GATT_CHR_F_READ,
                               .val_handle = &versionCharacteristicHandle},
                              {
                                .uuid = &fsTransferUuid.u,
                                .access_cb = FSServiceCallback,
                                .arg = this,
                                .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ | BLE_GATT_CHR_F_NOTIFY,
                                .val_handle = &transferCharacteristicHandle,
                              },
                              {0}},
    serviceDefinition {
      {/* Device Information Service */
       .type = BLE_GATT_SVC_TYPE_PRIMARY,
       .uuid = &fsServiceUuid.u,
       .characteristics = characteristicDefinition},
      {0},
    } {
 }
 void FSService::Init() {
  int res = 0;
  res = ble_gatts_count_cfg(serviceDefinition);
  ASSERT(res == 0);
  res = ble_gatts_add_svcs(serviceDefinition);
  ASSERT(res == 0);
 }
 int FSService::OnFSServiceRequested(uint16_t connectionHandle, uint16_t attributeHandle, ble_gatt_access_ctxt* context) {
  if (attributeHandle == versionCharacteristicHandle) {
    NRF_LOG_INFO("FS_S : handle = %d", versionCharacteristicHandle);
    int res = os_mbuf_append(context->om, &fsVersion, sizeof(fsVersion));
    return (res == 0) ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES;
  }
  if (attributeHandle == transferCharacteristicHandle) {
    return FSCommandHandler(connectionHandle, context->om);
  }
  return 0;
 }
 int FSService::FSCommandHandler(uint16_t connectionHandle, os_mbuf* om) {
  auto command = static_cast<commands>(om->om_data[0]);
  NRF_LOG_INFO("[FS_S] -> FSCommandHandler Command %d", command);
  // Just always make sure we are awake...
  systemTask.PushMessage(Pinetime::System::Messages::StartFileTransfer);
  vTaskDelay(10);
  while (systemTask.IsSleeping()) {
    vTaskDelay(100); // 50ms
  }
  lfs_dir_t dir = {0};
  lfs_info info = {0};
  lfs_file f = {0};
  switch (command) {
    case commands::READ: {
      NRF_LOG_INFO("[FS_S] -> Read");
      auto* header = (ReadHeader*) om->om_data;
      uint16_t plen = header->pathlen;
      if (plen > maxpathlen) { //> counts for null term
        return -1;
      }
      memcpy(filepath, header->pathstr, plen);
      filepath[plen] = 0; // Copy and null teminate string
      ReadResponse resp;
      os_mbuf* om;
      resp.command = commands::READ_DATA;
      resp.status = 0x01;
      resp.chunkoff = header->chunkoff;
      int res = fs.Stat(filepath, &info);
      if (res == LFS_ERR_NOENT && info.type != LFS_TYPE_DIR) {
        resp.status = (int8_t) res;
        resp.chunklen = 0;
        resp.totallen = 0;
        om = ble_hs_mbuf_from_flat(&resp, sizeof(ReadResponse));
      } else {
        resp.chunklen = std::min(header->chunksize, info.size); // TODO add mtu somehow
        resp.totallen = info.size;
        fs.FileOpen(&f, filepath, LFS_O_RDONLY);
        fs.FileSeek(&f, header->chunkoff);
        uint8_t fileData[resp.chunklen] = {0};
        resp.chunklen = fs.FileRead(&f, fileData, resp.chunklen);
        om = ble_hs_mbuf_from_flat(&resp, sizeof(ReadResponse));
        os_mbuf_append(om, fileData, resp.chunklen);
        fs.FileClose(&f);
      }
      ble_gattc_notify_custom(connectionHandle, transferCharacteristicHandle, om);
      break;
    }
    case commands::READ_PACING: {
      NRF_LOG_INFO("[FS_S] -> Readpacing");
      auto* header = (ReadHeader*) om->om_data;
      ReadResponse resp;
      resp.command = commands::READ_DATA;
      resp.status = 0x01;
      resp.chunkoff = header->chunkoff;
      int res = fs.Stat(filepath, &info);
      if (res == LFS_ERR_NOENT && info.type != LFS_TYPE_DIR) {
        resp.status = (int8_t) res;
        resp.chunklen = 0;
        resp.totallen = 0;
      } else {
        resp.chunklen = std::min(header->chunksize, info.size); // TODO add mtu somehow
        resp.totallen = info.size;
        fs.FileOpen(&f, filepath, LFS_O_RDONLY);
        fs.FileSeek(&f, header->chunkoff);
      }
      os_mbuf* om;
      if (resp.chunklen > 0) {
        uint8_t fileData[resp.chunklen] = {0};
        resp.chunklen = fs.FileRead(&f, fileData, resp.chunklen);
        om = ble_hs_mbuf_from_flat(&resp, sizeof(ReadResponse));
        os_mbuf_append(om, fileData, resp.chunklen);
      } else {
        resp.chunklen = 0;
        om = ble_hs_mbuf_from_flat(&resp, sizeof(ReadResponse));
      }
      fs.FileClose(&f);
      ble_gattc_notify_custom(connectionHandle, transferCharacteristicHandle, om);
      break;
    }
    case commands::WRITE: {
      NRF_LOG_INFO("[FS_S] -> Write");
      auto* header = (WriteHeader*) om->om_data;
      uint16_t plen = header->pathlen;
      if (plen > maxpathlen) { //> counts for null term
        return -1;             // TODO make this actually return a BLE notif
      }
      memcpy(filepath, header->pathstr, plen);
      filepath[plen] = 0; // Copy and null teminate string
      fileSize = header->totalSize;
      WriteResponse resp;
      resp.command = commands::WRITE_PACING;
      resp.offset = header->offset;
      resp.modTime = 0;
      int res = fs.FileOpen(&f, filepath, LFS_O_RDWR | LFS_O_CREAT);
      if (res == 0) {
        fs.FileClose(&f);
        resp.status = (res == 0) ? 0x01 : (int8_t) res;
      }
      resp.freespace = std::min(fs.getSize() - (fs.GetFSSize() * fs.getBlockSize()), fileSize - header->offset);
      auto* om = ble_hs_mbuf_from_flat(&resp, sizeof(WriteResponse));
      ble_gattc_notify_custom(connectionHandle, transferCharacteristicHandle, om);
      break;
    }
    case commands::WRITE_DATA: {
      NRF_LOG_INFO("[FS_S] -> WriteData");
      auto* header = (WritePacing*) om->om_data;
      WriteResponse resp;
      resp.command = commands::WRITE_PACING;
      resp.offset = header->offset;
      int res = 0;
      if (!(res = fs.FileOpen(&f, filepath, LFS_O_RDWR | LFS_O_CREAT))) {
        if ((res = fs.FileSeek(&f, header->offset)) >= 0) {
          res = fs.FileWrite(&f, header->data, header->dataSize);
        }
        fs.FileClose(&f);
      }
      if (res < 0) {
        resp.status = (int8_t) res;
      }
      resp.freespace = std::min(fs.getSize() - (fs.GetFSSize() * fs.getBlockSize()), fileSize - header->offset);
      auto* om = ble_hs_mbuf_from_flat(&resp, sizeof(WriteResponse));
      ble_gattc_notify_custom(connectionHandle, transferCharacteristicHandle, om);
      break;
    }
    case commands::DELETE: {
      NRF_LOG_INFO("[FS_S] -> Delete");
      auto* header = (DelHeader*) om->om_data;
      uint16_t plen = header->pathlen;
      char path[plen + 1] = {0};
      memcpy(path, header->pathstr, plen);
      path[plen] = 0; // Copy and null teminate string
      DelResponse resp {};
      resp.command = commands::DELETE_STATUS;
      int res = fs.FileDelete(path);
      resp.status = (res == 0) ? 0x01 : (int8_t) res;
      auto* om = ble_hs_mbuf_from_flat(&resp, sizeof(DelResponse));
      ble_gattc_notify_custom(connectionHandle, transferCharacteristicHandle, om);
      break;
    }
    case commands::MKDIR: {
      NRF_LOG_INFO("[FS_S] -> MKDir");
      auto* header = (MKDirHeader*) om->om_data;
      uint16_t plen = header->pathlen;
      char path[plen + 1] = {0};
      memcpy(path, header->pathstr, plen);
      path[plen] = 0; // Copy and null teminate string
      MKDirResponse resp {};
      resp.command = commands::MKDIR_STATUS;
      resp.modification_time = 0;
      int res = fs.DirCreate(path);
      resp.status = (res == 0) ? 0x01 : (int8_t) res;
      auto* om = ble_hs_mbuf_from_flat(&resp, sizeof(MKDirResponse));
      ble_gattc_notify_custom(connectionHandle, transferCharacteristicHandle, om);
      break;
    }
    case commands::LISTDIR: {
      NRF_LOG_INFO("[FS_S] -> ListDir");
      ListDirHeader* header = (ListDirHeader*) om->om_data;
      uint16_t plen = header->pathlen;
      char path[plen + 1] = {0};
      path[plen] = 0; // Copy and null teminate string
      memcpy(path, header->pathstr, plen);
      ListDirResponse resp {};
      resp.command = commands::LISTDIR_ENTRY;
      resp.status = 0x01;
      resp.totalentries = 0;
      resp.entry = 0;
      resp.modification_time = 0;
      int res = fs.DirOpen(path, &dir);
      if (res != 0) {
        resp.status = (int8_t) res;
        auto* om = ble_hs_mbuf_from_flat(&resp, sizeof(ListDirResponse));
        ble_gattc_notify_custom(connectionHandle, transferCharacteristicHandle, om);
        break;
      };
      while (fs.DirRead(&dir, &info)) {
        resp.totalentries++;
      }
      fs.DirRewind(&dir);
      while (true) {
        res = fs.DirRead(&dir, &info);
        if (res <= 0) {
          break;
        }
        switch (info.type) {
          case LFS_TYPE_REG: {
            resp.flags = 0;
            resp.file_size = info.size;
            break;
          }
          case LFS_TYPE_DIR: {
            resp.flags = 1;
            resp.file_size = 0;
            break;
          }
        }
        // strcpy(resp.path, info.name);
        resp.path_length = strlen(info.name);
        auto* om = ble_hs_mbuf_from_flat(&resp, sizeof(ListDirResponse));
        os_mbuf_append(om, info.name, resp.path_length);
        ble_gattc_notify_custom(connectionHandle, transferCharacteristicHandle, om);
        /*
         * Todo Figure out how to know when the previous Notify was TX'd
         * For now just delay 100ms to make sure that the data went out...
         */
        vTaskDelay(100); // Allow stuff to actually go out over the BLE conn
        resp.entry++;
      }
      assert(fs.DirClose(&dir) == 0);
      resp.file_size = 0;
      resp.path_length = 0;
      resp.flags = 0;
      auto* om = ble_hs_mbuf_from_flat(&resp, sizeof(ListDirResponse));
      ble_gattc_notify_custom(connectionHandle, transferCharacteristicHandle, om);
      break;
    }
    case commands::MOVE: {
      NRF_LOG_INFO("[FS_S] -> Move");
      MoveHeader* header = (MoveHeader*) om->om_data;
      uint16_t plen = header->OldPathLength;
      // Null Terminate string
      header->pathstr[plen] = 0;
      char path[header->NewPathLength + 1] = {0};
      memcpy(path, &header->pathstr[plen + 1], header->NewPathLength);
      path[header->NewPathLength] = 0; // Copy and null teminate string
      MoveResponse resp {};
      resp.command = commands::MOVE_STATUS;
      int8_t res = (int8_t) fs.Rename(header->pathstr, path);
      resp.status = (res == 0) ? 1 : res;
      auto* om = ble_hs_mbuf_from_flat(&resp, sizeof(MoveResponse));
      ble_gattc_notify_custom(connectionHandle, transferCharacteristicHandle, om);
    }
    default:
      break;
  }
  NRF_LOG_INFO("[FS_S] -> done ");
  systemTask.PushMessage(Pinetime::System::Messages::StopFileTransfer);
  return 0;
 }
 // Loads resp with file data given a valid filepath header and resp
 void FSService::prepareReadDataResp(ReadHeader* header, ReadResponse* resp) {
  // uint16_t plen = header->pathlen;
  resp->command = commands::READ_DATA;
  resp->chunkoff = header->chunkoff;
  resp->status = 0x01;
  struct lfs_info info = {};
  int res = fs.Stat(filepath, &info);
  if (res == LFS_ERR_NOENT && info.type != LFS_TYPE_DIR) {
    resp->status = 0x03;
    resp->chunklen = 0;
    resp->totallen = 0;
  } else {
    lfs_file f;
    resp->chunklen = std::min(header->chunksize, info.size);
    resp->totallen = info.size;
    fs.FileOpen(&f, filepath, LFS_O_RDONLY);
    fs.FileSeek(&f, header->chunkoff);
    resp->chunklen = fs.FileRead(&f, resp->chunk, resp->chunklen);
    fs.FileClose(&f);
  }
 }
--- a/src/components/ble/FSService.h
+++ b/src/components/ble/FSService.h
@ -0,0 +1,191 @@
 #pragma once
 #define min // workaround: nimble's min/max macros conflict with libstdc++
 #define max
 #include <host/ble_gap.h>
 #undef max
 #undef min
 #include "components/fs/FS.h"
 namespace Pinetime {
  namespace System {
    class SystemTask;
  }
  namespace Controllers {
    class Ble;
    class FSService {
    public:
      FSService(Pinetime::System::SystemTask& systemTask, Pinetime::Controllers::FS& fs);
      void Init();
      int OnFSServiceRequested(uint16_t connectionHandle, uint16_t attributeHandle, ble_gatt_access_ctxt* context);
      void NotifyFSRaw(uint16_t connectionHandle);
    private:
      Pinetime::System::SystemTask& systemTask;
      Pinetime::Controllers::FS& fs;
      static constexpr uint16_t FSServiceId {0xFEBB};
      static constexpr uint16_t fsVersionId {0x0100};
      static constexpr uint16_t fsTransferId {0x0200};
      uint16_t fsVersion = {0x0004};
      static constexpr uint16_t maxpathlen = 256;
      static constexpr ble_uuid16_t fsServiceUuid {
        .u {.type = BLE_UUID_TYPE_16},
        .value = {0xFEBB}}; // {0x72, 0x65, 0x66, 0x73, 0x6e, 0x61, 0x72, 0x54, 0x65, 0x6c, 0x69, 0x46, 0xBB, 0xFE, 0xAF, 0xAD}};
      static constexpr ble_uuid128_t fsVersionUuid {
        .u {.type = BLE_UUID_TYPE_128},
        .value = {0x72, 0x65, 0x66, 0x73, 0x6e, 0x61, 0x72, 0x54, 0x65, 0x6c, 0x69, 0x46, 0x00, 0x01, 0xAF, 0xAD}};
      static constexpr ble_uuid128_t fsTransferUuid {
        .u {.type = BLE_UUID_TYPE_128},
        .value = {0x72, 0x65, 0x66, 0x73, 0x6e, 0x61, 0x72, 0x54, 0x65, 0x6c, 0x69, 0x46, 0x00, 0x02, 0xAF, 0xAD}};
      struct ble_gatt_chr_def characteristicDefinition[3];
      struct ble_gatt_svc_def serviceDefinition[2];
      uint16_t versionCharacteristicHandle;
      uint16_t transferCharacteristicHandle;
      enum class commands : uint8_t {
        INVALID = 0x00,
        READ = 0x10,
        READ_DATA = 0x11,
        READ_PACING = 0x12,
        WRITE = 0x20,
        WRITE_PACING = 0x21,
        WRITE_DATA = 0x22,
        DELETE = 0x30,
        DELETE_STATUS = 0x31,
        MKDIR = 0x40,
        MKDIR_STATUS = 0x41,
        LISTDIR = 0x50,
        LISTDIR_ENTRY = 0x51,
        MOVE = 0x60,
        MOVE_STATUS = 0x61
      };
      enum class FSState : uint8_t {
        IDLE = 0x00,
        READ = 0x01,
        WRITE = 0x02,
      };
      FSState state;
      char filepath[maxpathlen]; // TODO ..ugh fixed filepath len
      int fileSize;
      using ReadHeader = struct __attribute__((packed)) {
        commands command;
        uint8_t padding;
        uint16_t pathlen;
        uint32_t chunkoff;
        uint32_t chunksize;
        char pathstr[];
      };
      using ReadResponse = struct __attribute__((packed)) {
        commands command;
        uint8_t status;
        uint16_t padding;
        uint32_t chunkoff;
        uint32_t totallen;
        uint32_t chunklen;
        uint8_t chunk[];
      };
      using ReadPacing = struct __attribute__((packed)) {
        commands command;
        uint8_t status;
        uint16_t padding;
        uint32_t chunkoff;
        uint32_t chunksize;
      };
      using WriteHeader = struct __attribute__((packed)) {
        commands command;
        uint8_t padding;
        uint16_t pathlen;
        uint32_t offset;
        uint64_t modTime;
        uint32_t totalSize;
        char pathstr[];
      };
      using WriteResponse = struct __attribute__((packed)) {
        commands command;
        uint8_t status;
        uint16_t padding;
        uint32_t offset;
        uint64_t modTime;
        uint32_t freespace;
      };
      using WritePacing = struct __attribute__((packed)) {
        commands command;
        uint8_t status;
        uint16_t padding;
        uint32_t offset;
        uint32_t dataSize;
        uint8_t data[];
      };
      using ListDirHeader = struct __attribute__((packed)) {
        commands command;
        uint8_t padding;
        uint16_t pathlen;
        char pathstr[];
      };
      using ListDirResponse = struct __attribute__((packed)) {
        commands command;
        uint8_t status;
        uint16_t path_length;
        uint32_t entry;
        uint32_t totalentries;
        uint32_t flags;
        uint64_t modification_time;
        uint32_t file_size;
        char path[];
      };
      using MKDirHeader = struct __attribute__((packed)) {
        commands command;
        uint8_t padding;
        uint16_t pathlen;
        uint32_t padding2;
        uint64_t time;
        char pathstr[];
      };
      using MKDirResponse = struct __attribute__((packed)) {
        commands command;
        uint8_t status;
        uint32_t padding1;
        uint16_t padding2;
        uint64_t modification_time;
      };
      using DelHeader = struct __attribute__((packed)) {
        commands command;
        uint8_t padding;
        uint16_t pathlen;
        char pathstr[];
      };
      using DelResponse = struct __attribute__((packed)) {
        commands command;
        uint8_t status;
      };
      using MoveHeader = struct __attribute__((packed)) {
        commands command;
        uint8_t padding;
        uint16_t OldPathLength;
        uint16_t NewPathLength;
        char pathstr[];
      };
      using MoveResponse = struct __attribute__((packed)) {
        commands command;
        uint8_t status;
      };
      int FSCommandHandler(uint16_t connectionHandle, os_mbuf* om);
      void prepareReadDataResp(ReadHeader* header, ReadResponse* resp);
    };
  }
 }
--- a/src/components/ble/HeartRateService.cpp
+++ b/src/components/ble/HeartRateService.cpp
@ -1,4 +1,4 @@
-#include "HeartRateService.h"
+#include "components/ble/HeartRateService.h"
 #include "components/heartrate/HeartRateController.h"
 #include "systemtask/SystemTask.h"
--- a/src/components/ble/ImmediateAlertService.cpp
+++ b/src/components/ble/ImmediateAlertService.cpp
@ -1,6 +1,6 @@
-#include "ImmediateAlertService.h"
+#include "components/ble/ImmediateAlertService.h"
 #include <cstring>
-#include "NotificationManager.h"
+#include "components/ble/NotificationManager.h"
 #include "systemtask/SystemTask.h"
 using namespace Pinetime::Controllers;
--- a/src/components/ble/MotionService.cpp
+++ b/src/components/ble/MotionService.cpp
@ -1,11 +1,11 @@
-#include "MotionService.h"
+#include "components/ble/MotionService.h"
-#include "components/motion//MotionController.h"
+#include "components/motion/MotionController.h"
 #include "systemtask/SystemTask.h"
 using namespace Pinetime::Controllers;
 namespace {
-  // 0002yyxx-78fc-48fe-8e23-433b3a1942d0
+  // 0003yyxx-78fc-48fe-8e23-433b3a1942d0
  constexpr ble_uuid128_t CharUuid(uint8_t x, uint8_t y) {
    return ble_uuid128_t{
      .u = {.type = BLE_UUID_TYPE_128},
@ -13,7 +13,7 @@ namespace {
    };
  }
-  // 00020000-78fc-48fe-8e23-433b3a1942d0
+  // 00030000-78fc-48fe-8e23-433b3a1942d0
  constexpr ble_uuid128_t BaseUuid() {
    return CharUuid(0x00, 0x00);
  }
--- a/src/components/ble/MusicService.cpp
+++ b/src/components/ble/MusicService.cpp
@ -15,7 +15,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-#include "MusicService.h"
+#include "components/ble/MusicService.h"
 #include "systemtask/SystemTask.h"
 namespace {
--- a/src/components/ble/NavigationService.cpp
+++ b/src/components/ble/NavigationService.cpp
@ -16,7 +16,7 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-#include "NavigationService.h"
+#include "components/ble/NavigationService.h"
 #include "systemtask/SystemTask.h"
--- a/src/components/ble/NimbleController.cpp
+++ b/src/components/ble/NimbleController.cpp
@ -1,4 +1,6 @@
-#include "NimbleController.h"
+#include "components/ble/NimbleController.h"
 #include <cstring>
 #include <hal/nrf_rtc.h>
 #define min // workaround: nimble's min/max macros conflict with libstdc++
 #define max
@ -6,13 +8,16 @@
 #include <host/ble_hs.h>
 #include <host/ble_hs_id.h>
 #include <host/util/util.h>
-#undef max
+#include <controller/ble_ll.h>
-#undef min
+#include <controller/ble_hw.h>
 #include <services/gap/ble_svc_gap.h>
 #include <services/gatt/ble_svc_gatt.h>
 #undef max
 #undef min
 #include "components/ble/BleController.h"
 #include "components/ble/NotificationManager.h"
 #include "components/datetime/DateTimeController.h"
 #include "components/fs/FS.h"
 #include "systemtask/SystemTask.h"
 using namespace Pinetime::Controllers;
@ -24,37 +29,44 @@ NimbleController::NimbleController(Pinetime::System::SystemTask& systemTask,
                                   Controllers::Battery& batteryController,
                                   Pinetime::Drivers::SpiNorFlash& spiNorFlash,
                                   Controllers::HeartRateController& heartRateController,
-                                   Controllers::MotionController& motionController)
+                                   Controllers::MotionController& motionController,
                                   Controllers::FS& fs)
  : systemTask {systemTask},
    bleController {bleController},
    dateTimeController {dateTimeController},
    notificationManager {notificationManager},
    spiNorFlash {spiNorFlash},
    fs {fs},
    dfuService {systemTask, bleController, spiNorFlash},
    currentTimeClient {dateTimeController},
    anService {systemTask, notificationManager},
    alertNotificationClient {systemTask, notificationManager},
    currentTimeService {dateTimeController},
    musicService {systemTask},
    weatherService {systemTask, dateTimeController},
    navService {systemTask},
    batteryInformationService {batteryController},
    immediateAlertService {systemTask, notificationManager},
    heartRateService {systemTask, heartRateController},
-    motionService{systemTask, motionController},
+    motionService {systemTask, motionController},
    fsService {systemTask, fs},
    serviceDiscovery({&currentTimeClient, &alertNotificationClient}) {
 }
 void nimble_on_reset(int reason) {
-  NRF_LOG_INFO("Resetting state; reason=%d\n", reason);
+  NRF_LOG_INFO("Nimble lost sync, resetting state; reason=%d", reason);
 }
 void nimble_on_sync(void) {
-    int rc;
+  int rc;
-    rc = ble_hs_util_ensure_addr(0);
+  NRF_LOG_INFO("Nimble is synced");
    ASSERT(rc == 0);
-    nptr->StartAdvertising();
+  rc = ble_hs_util_ensure_addr(0);
  ASSERT(rc == 0);
  nptr->StartAdvertising();
 }
 int GAPEventCallback(struct ble_gap_event* event, void* arg) {
@ -69,6 +81,7 @@ void NimbleController::Init() {
  nptr = this;
  ble_hs_cfg.reset_cb = nimble_on_reset;
  ble_hs_cfg.sync_cb = nimble_on_sync;
  ble_hs_cfg.store_status_cb = ble_store_util_status_rr;
  ble_svc_gap_init();
  ble_svc_gatt_init();
@ -77,6 +90,7 @@ void NimbleController::Init() {
  currentTimeClient.Init();
  currentTimeService.Init();
  musicService.Init();
  weatherService.Init();
  navService.Init();
  anService.Init();
  dfuService.Init();
@ -84,6 +98,7 @@ void NimbleController::Init() {
  immediateAlertService.Init();
  heartRateService.Init();
  motionService.Init();
  fsService.Init();
  int rc;
  rc = ble_hs_util_ensure_addr(0);
@ -97,28 +112,36 @@ void NimbleController::Init() {
  Pinetime::Controllers::Ble::BleAddress address;
  rc = ble_hs_id_copy_addr(addrType, address.data(), nullptr);
  ASSERT(rc == 0);
-  bleController.AddressType((addrType == 0) ? Ble::AddressTypes::Public : Ble::AddressTypes::Random);
+
  bleController.Address(std::move(address));
  switch (addrType) {
    case BLE_OWN_ADDR_PUBLIC:
      bleController.AddressType(Ble::AddressTypes::Public);
      break;
    case BLE_OWN_ADDR_RANDOM:
      bleController.AddressType(Ble::AddressTypes::Random);
      break;
    case BLE_OWN_ADDR_RPA_PUBLIC_DEFAULT:
      bleController.AddressType(Ble::AddressTypes::RPA_Public);
      break;
    case BLE_OWN_ADDR_RPA_RANDOM_DEFAULT:
      bleController.AddressType(Ble::AddressTypes::RPA_Random);
      break;
  }
  rc = ble_gatts_start();
  ASSERT(rc == 0);
-  if (!ble_gap_adv_active() && !bleController.IsConnected())
+  RestoreBond();
-    StartAdvertising();
+
  StartAdvertising();
 }
 void NimbleController::StartAdvertising() {
  int rc;
  /* set adv parameters */
  struct ble_gap_adv_params adv_params;
  struct ble_hs_adv_fields fields;
  /* advertising payload is split into advertising data and advertising
     response, because all data cannot fit into single packet; name of device
     is sent as response to scan request */
  struct ble_hs_adv_fields rsp_fields;
  /* fill all fields and parameters with zeros */
  memset(&adv_params, 0, sizeof(adv_params));
  memset(&fields, 0, sizeof(fields));
  memset(&rsp_fields, 0, sizeof(rsp_fields));
@ -141,10 +164,11 @@ void NimbleController::StartAdvertising() {
  fields.uuids128_is_complete = 1;
  fields.tx_pwr_lvl = BLE_HS_ADV_TX_PWR_LVL_AUTO;
-  rsp_fields.name = (uint8_t*) deviceName;
+  rsp_fields.name = reinterpret_cast<const uint8_t*>(deviceName);
  rsp_fields.name_len = strlen(deviceName);
  rsp_fields.name_is_complete = 1;
  int rc;
  rc = ble_gap_adv_set_fields(&fields);
  ASSERT(rc == 0);
@ -159,15 +183,14 @@ int NimbleController::OnGAPEvent(ble_gap_event* event) {
  switch (event->type) {
    case BLE_GAP_EVENT_ADV_COMPLETE:
      NRF_LOG_INFO("Advertising event : BLE_GAP_EVENT_ADV_COMPLETE");
-      NRF_LOG_INFO("reason=%d; status=%d", event->adv_complete.reason, event->connect.status);
+      NRF_LOG_INFO("reason=%d; status=%0X", event->adv_complete.reason, event->connect.status);
      StartAdvertising();
      break;
    case BLE_GAP_EVENT_CONNECT:
      NRF_LOG_INFO("Advertising event : BLE_GAP_EVENT_CONNECT");
      /* A new connection was established or a connection attempt failed. */
-      NRF_LOG_INFO("connection %s; status=%d ", event->connect.status == 0 ? "established" : "failed", event->connect.status);
+      NRF_LOG_INFO("Connect event : BLE_GAP_EVENT_CONNECT");
      NRF_LOG_INFO("connection %s; status=%0X ", event->connect.status == 0 ? "established" : "failed", event->connect.status);
      if (event->connect.status != 0) {
        /* Connection failed; resume advertising. */
@ -186,10 +209,14 @@ int NimbleController::OnGAPEvent(ble_gap_event* event) {
      break;
    case BLE_GAP_EVENT_DISCONNECT:
-      NRF_LOG_INFO("Advertising event : BLE_GAP_EVENT_DISCONNECT");
+      /* Connection terminated; resume advertising. */
      NRF_LOG_INFO("Disconnect event : BLE_GAP_EVENT_DISCONNECT");
      NRF_LOG_INFO("disconnect reason=%d", event->disconnect.reason);
-      /* Connection terminated; resume advertising. */
+      if (event->disconnect.conn.sec_state.bonded) {
        PersistBond(event->disconnect.conn);
      }
      currentTimeClient.Reset();
      alertNotificationClient.Reset();
      connectionHandle = BLE_HS_CONN_HANDLE_NONE;
@ -199,18 +226,67 @@ int NimbleController::OnGAPEvent(ble_gap_event* event) {
      break;
    case BLE_GAP_EVENT_CONN_UPDATE:
      NRF_LOG_INFO("Advertising event : BLE_GAP_EVENT_CONN_UPDATE");
      /* The central has updated the connection parameters. */
-      NRF_LOG_INFO("update status=%d ", event->conn_update.status);
+      NRF_LOG_INFO("Update event : BLE_GAP_EVENT_CONN_UPDATE");
      NRF_LOG_INFO("update status=%0X ", event->conn_update.status);
      break;
    case BLE_GAP_EVENT_CONN_UPDATE_REQ:
      /* The central has requested updated connection parameters */
      NRF_LOG_INFO("Update event : BLE_GAP_EVENT_CONN_UPDATE_REQ");
      NRF_LOG_INFO("update request : itvl_min=%d itvl_max=%d latency=%d supervision=%d",
                   event->conn_update_req.peer_params->itvl_min,
                   event->conn_update_req.peer_params->itvl_max,
                   event->conn_update_req.peer_params->latency,
                   event->conn_update_req.peer_params->supervision_timeout);
      break;
    case BLE_GAP_EVENT_ENC_CHANGE:
      /* Encryption has been enabled or disabled for this connection. */
-      NRF_LOG_INFO("encryption change event; status=%d ", event->enc_change.status);
+      NRF_LOG_INFO("Security event : BLE_GAP_EVENT_ENC_CHANGE");
      NRF_LOG_INFO("encryption change event; status=%0X ", event->enc_change.status);
      if (event->enc_change.status == 0) {
        struct ble_gap_conn_desc desc;
        ble_gap_conn_find(event->enc_change.conn_handle, &desc);
        if (desc.sec_state.bonded) {
          PersistBond(desc);
        }
        NRF_LOG_INFO("new state: encrypted=%d authenticated=%d bonded=%d key_size=%d",
                     desc.sec_state.encrypted,
                     desc.sec_state.authenticated,
                     desc.sec_state.bonded,
                     desc.sec_state.key_size);
      }
      break;
    case BLE_GAP_EVENT_PASSKEY_ACTION:
      /* Authentication has been requested for this connection.
       *
       * BLE authentication is determined by the combination of I/O capabilities
       * on the central and peripheral. When the peripheral is display only and
       * the central has a keyboard and display then passkey auth is selected.
       * When both the central and peripheral have displays and support yes/no
       * buttons then numeric comparison is selected. We currently advertise
       * display capability only so we only handle the "display" action here.
       *
       * Standards insist that the rand() PRNG be deterministic.
       * Use the tinycrypt prng here since rand() is predictable.
       */
      NRF_LOG_INFO("Security event : BLE_GAP_EVENT_PASSKEY_ACTION");
      if (event->passkey.params.action == BLE_SM_IOACT_DISP) {
        struct ble_sm_io pkey = {0};
        pkey.action = event->passkey.params.action;
        pkey.passkey = ble_ll_rand() % 1000000;
        bleController.SetPairingKey(pkey.passkey);
        systemTask.PushMessage(Pinetime::System::Messages::OnPairing);
        ble_sm_inject_io(event->passkey.conn_handle, &pkey);
      }
      break;
    case BLE_GAP_EVENT_SUBSCRIBE:
-      NRF_LOG_INFO("subscribe event; conn_handle=%d attr_handle=%d "
+      NRF_LOG_INFO("Subscribe event; conn_handle=%d attr_handle=%d "
                   "reason=%d prevn=%d curn=%d previ=%d curi=???\n",
                   event->subscribe.conn_handle,
                   event->subscribe.attr_handle,
@ -219,26 +295,24 @@ int NimbleController::OnGAPEvent(ble_gap_event* event) {
                   event->subscribe.cur_notify,
                   event->subscribe.prev_indicate);
-      if(event->subscribe.reason == BLE_GAP_SUBSCRIBE_REASON_TERM) {
+      if (event->subscribe.reason == BLE_GAP_SUBSCRIBE_REASON_TERM) {
        heartRateService.UnsubscribeNotification(event->subscribe.conn_handle, event->subscribe.attr_handle);
        motionService.UnsubscribeNotification(event->subscribe.conn_handle, event->subscribe.attr_handle);
-      }
+      } else if (event->subscribe.prev_notify == 0 && event->subscribe.cur_notify == 1) {
      else if(event->subscribe.prev_notify == 0 && event->subscribe.cur_notify == 1) {
        heartRateService.SubscribeNotification(event->subscribe.conn_handle, event->subscribe.attr_handle);
        motionService.SubscribeNotification(event->subscribe.conn_handle, event->subscribe.attr_handle);
-      }
+      } else if (event->subscribe.prev_notify == 1 && event->subscribe.cur_notify == 0) {
      else if(event->subscribe.prev_notify == 1 && event->subscribe.cur_notify == 0) {
        heartRateService.UnsubscribeNotification(event->subscribe.conn_handle, event->subscribe.attr_handle);
        motionService.UnsubscribeNotification(event->subscribe.conn_handle, event->subscribe.attr_handle);
      }
      break;
    case BLE_GAP_EVENT_MTU:
-      NRF_LOG_INFO("mtu update event; conn_handle=%d cid=%d mtu=%d\n",
+      NRF_LOG_INFO("MTU Update event; conn_handle=%d cid=%d mtu=%d", event->mtu.conn_handle, event->mtu.channel_id, event->mtu.value);
        event->mtu.conn_handle, event->mtu.channel_id, event->mtu.value);
      break;
    case BLE_GAP_EVENT_REPEAT_PAIRING: {
      NRF_LOG_INFO("Pairing event : BLE_GAP_EVENT_REPEAT_PAIRING");
      /* We already have a bond with the peer, but it is attempting to
       * establish a new secure link.  This app sacrifices security for
       * convenience: just throw away the old bond and accept the new link.
@ -257,6 +331,8 @@ int NimbleController::OnGAPEvent(ble_gap_event* event) {
    case BLE_GAP_EVENT_NOTIFY_RX: {
      /* Peer sent us a notification or indication. */
      /* Attribute data is contained in event->notify_rx.attr_data. */
      NRF_LOG_INFO("Notify event : BLE_GAP_EVENT_NOTIFY_RX");
      size_t notifSize = OS_MBUF_PKTLEN(event->notify_rx.om);
      NRF_LOG_INFO("received %s; conn_handle=%d attr_handle=%d "
@ -268,10 +344,17 @@ int NimbleController::OnGAPEvent(ble_gap_event* event) {
      alertNotificationClient.OnNotification(event);
    } break;
-      /* Attribute data is contained in event->notify_rx.attr_data. */
+
    case BLE_GAP_EVENT_NOTIFY_TX:
      NRF_LOG_INFO("Notify event : BLE_GAP_EVENT_NOTIFY_TX");
      break;
    case BLE_GAP_EVENT_IDENTITY_RESOLVED:
      NRF_LOG_INFO("Identity event : BLE_GAP_EVENT_IDENTITY_RESOLVED");
      break;
    default:
-      //      NRF_LOG_INFO("Advertising event : %d", event->type);
+      NRF_LOG_INFO("UNHANDLED GAP event : %d", event->type);
      break;
  }
  return 0;
@ -292,3 +375,82 @@ void NimbleController::NotifyBatteryLevel(uint8_t level) {
    batteryInformationService.NotifyBatteryLevel(connectionHandle, level);
  }
 }
 void NimbleController::PersistBond(struct ble_gap_conn_desc& desc) {
  union ble_store_key key;
  union ble_store_value our_sec, peer_sec, peer_cccd_set[MYNEWT_VAL(BLE_STORE_MAX_CCCDS)] = {0};
  int rc;
  memset(&key, 0, sizeof key);
  memset(&our_sec, 0, sizeof our_sec);
  key.sec.peer_addr = desc.peer_id_addr;
  rc = ble_store_read_our_sec(&key.sec, &our_sec.sec);
  if (memcmp(&our_sec.sec, &bondId, sizeof bondId) == 0) {
    return;
  }
  memcpy(&bondId, &our_sec.sec, sizeof bondId);
  memset(&key, 0, sizeof key);
  memset(&peer_sec, 0, sizeof peer_sec);
  key.sec.peer_addr = desc.peer_id_addr;
  rc += ble_store_read_peer_sec(&key.sec, &peer_sec.sec);
  if (rc == 0) {
    memset(&key, 0, sizeof key);
    key.cccd.peer_addr = desc.peer_id_addr;
    int peer_count = 0;
    ble_store_util_count(BLE_STORE_OBJ_TYPE_CCCD, &peer_count);
    for (int i = 0; i < peer_count; i++) {
      key.cccd.idx = peer_count;
      ble_store_read_cccd(&key.cccd, &peer_cccd_set[i].cccd);
    }
    /* Wakeup Spi and SpiNorFlash before accessing the file system
     * This should be fixed in the FS driver
     */
    systemTask.PushMessage(Pinetime::System::Messages::GoToRunning);
    systemTask.PushMessage(Pinetime::System::Messages::DisableSleeping);
    vTaskDelay(10);
    lfs_file_t file_p;
    rc = fs.FileOpen(&file_p, "/bond.dat", LFS_O_WRONLY | LFS_O_CREAT);
    if (rc == 0) {
      fs.FileWrite(&file_p, reinterpret_cast<uint8_t*>(&our_sec.sec), sizeof our_sec);
      fs.FileWrite(&file_p, reinterpret_cast<uint8_t*>(&peer_sec.sec), sizeof peer_sec);
      fs.FileWrite(&file_p, reinterpret_cast<const uint8_t*>(&peer_count), 1);
      for (int i = 0; i < peer_count; i++) {
        fs.FileWrite(&file_p, reinterpret_cast<uint8_t*>(&peer_cccd_set[i].cccd), sizeof(struct ble_store_value_cccd));
      }
      fs.FileClose(&file_p);
    }
    systemTask.PushMessage(Pinetime::System::Messages::EnableSleeping);
  }
 }
 void NimbleController::RestoreBond() {
  lfs_file_t file_p;
  union ble_store_value sec, cccd;
  uint8_t peer_count = 0;
  if (fs.FileOpen(&file_p, "/bond.dat", LFS_O_RDONLY) == 0) {
    memset(&sec, 0, sizeof sec);
    fs.FileRead(&file_p, reinterpret_cast<uint8_t*>(&sec.sec), sizeof sec);
    ble_store_write_our_sec(&sec.sec);
    memset(&sec, 0, sizeof sec);
    fs.FileRead(&file_p, reinterpret_cast<uint8_t*>(&sec.sec), sizeof sec);
    ble_store_write_peer_sec(&sec.sec);
    fs.FileRead(&file_p, &peer_count, 1);
    for (int i = 0; i < peer_count; i++) {
      fs.FileRead(&file_p, reinterpret_cast<uint8_t*>(&cccd.cccd), sizeof(struct ble_store_value_cccd));
      ble_store_write_cccd(&cccd.cccd);
    }
    fs.FileClose(&file_p);
    fs.FileDelete("/bond.dat");
  }
 }
--- a/src/components/ble/NimbleController.h
+++ b/src/components/ble/NimbleController.h
@ -7,19 +7,22 @@
 #include <host/ble_gap.h>
 #undef max
 #undef min
-#include "AlertNotificationClient.h"
+#include "components/ble/AlertNotificationClient.h"
-#include "AlertNotificationService.h"
+#include "components/ble/AlertNotificationService.h"
-#include "BatteryInformationService.h"
+#include "components/ble/BatteryInformationService.h"
-#include "CurrentTimeClient.h"
+#include "components/ble/CurrentTimeClient.h"
-#include "CurrentTimeService.h"
+#include "components/ble/CurrentTimeService.h"
-#include "DeviceInformationService.h"
+#include "components/ble/DeviceInformationService.h"
-#include "DfuService.h"
+#include "components/ble/DfuService.h"
-#include "ImmediateAlertService.h"
+#include "components/ble/HeartRateService.h"
-#include "MusicService.h"
+#include "components/ble/ImmediateAlertService.h"
-#include "NavigationService.h"
+#include "components/ble/MusicService.h"
-#include "ServiceDiscovery.h"
+#include "components/ble/NavigationService.h"
-#include "HeartRateService.h"
+#include "components/ble/ServiceDiscovery.h"
-#include "MotionService.h"
+#include "components/ble/MotionService.h"
 #include "components/ble/weather/WeatherService.h"
 #include "components/fs/FS.h"
 #include "components/ble/FSService.h"
 namespace Pinetime {
  namespace Drivers {
@ -45,7 +48,8 @@ namespace Pinetime {
                       Controllers::Battery& batteryController,
                       Pinetime::Drivers::SpiNorFlash& spiNorFlash,
                       Controllers::HeartRateController& heartRateController,
-                       Controllers::MotionController& motionController);
+                       Controllers::MotionController& motionController,
                       Pinetime::Controllers::FS& fs);
      void Init();
      void StartAdvertising();
      int OnGAPEvent(ble_gap_event* event);
@ -70,6 +74,9 @@ namespace Pinetime {
      Pinetime::Controllers::AlertNotificationService& alertService() {
        return anService;
      };
      Pinetime::Controllers::WeatherService& weather() {
        return weatherService;
      };
      uint16_t connHandle();
      void NotifyBatteryLevel(uint8_t level);
@ -79,12 +86,16 @@ namespace Pinetime {
      }
    private:
      void PersistBond(struct ble_gap_conn_desc& desc);
      void RestoreBond();
      static constexpr const char* deviceName = "InfiniTime";
      Pinetime::System::SystemTask& systemTask;
      Pinetime::Controllers::Ble& bleController;
      DateTime& dateTimeController;
      Pinetime::Controllers::NotificationManager& notificationManager;
      Pinetime::Drivers::SpiNorFlash& spiNorFlash;
      Pinetime::Controllers::FS& fs;
      Pinetime::Controllers::DfuService dfuService;
      DeviceInformationService deviceInformationService;
@ -93,23 +104,25 @@ namespace Pinetime {
      AlertNotificationClient alertNotificationClient;
      CurrentTimeService currentTimeService;
      MusicService musicService;
      WeatherService weatherService;
      NavigationService navService;
      BatteryInformationService batteryInformationService;
      ImmediateAlertService immediateAlertService;
      HeartRateService heartRateService;
      MotionService motionService;
      FSService fsService;
      ServiceDiscovery serviceDiscovery;
-      uint8_t addrType; // 1 = Random, 0 = PUBLIC
+      uint8_t addrType;
      uint16_t connectionHandle = BLE_HS_CONN_HANDLE_NONE;
      uint8_t fastAdvCount = 0;
      uint8_t bondId[16] = {0};
      ble_uuid128_t dfuServiceUuid {
        .u {.type = BLE_UUID_TYPE_128},
        .value = {0x23, 0xD1, 0xBC, 0xEA, 0x5F, 0x78, 0x23, 0x15, 0xDE, 0xEF, 0x12, 0x12, 0x30, 0x15, 0x00, 0x00}};
      ServiceDiscovery serviceDiscovery;
    };
-  static NimbleController* nptr;
+    static NimbleController* nptr;
  }
 }
--- a/src/components/ble/NotificationManager.cpp
+++ b/src/components/ble/NotificationManager.cpp
@ -1,4 +1,4 @@
-#include "NotificationManager.h"
+#include "components/ble/NotificationManager.h"
 #include <cstring>
 #include <algorithm>
--- a/src/components/ble/ServiceDiscovery.cpp
+++ b/src/components/ble/ServiceDiscovery.cpp
@ -1,6 +1,6 @@
-#include "ServiceDiscovery.h"
+#include "components/ble/ServiceDiscovery.h"
 #include <libraries/log/nrf_log.h>
-#include "BleClient.h"
+#include "components/ble/BleClient.h"
 using namespace Pinetime::Controllers;
--- a/src/components/ble/weather/WeatherData.h
+++ b/src/components/ble/weather/WeatherData.h
@ -0,0 +1,385 @@
 /*  Copyright (C) 2021 Avamander
    This file is part of InfiniTime.
    InfiniTime is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published
    by the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
    InfiniTime is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 #pragma once
 /**
 * Different weather events, weather data structures used by {@link WeatherService.h}
 *
 * How to upload events to the timeline?
 *
 * All timeline write payloads are simply CBOR-encoded payloads of the structs described below.
 *
 * All payloads have a mandatory header part and the dynamic part that
 * depends on the event type specified in the header. If you don't,
 * you'll get an error returned. Data is relatively well-validated,
 * so keep in the bounds of the data types given.
 *
 * Write all struct members (CamelCase keys) into a single finite-sized map, and write it to the characteristic.
 * Mind the MTU.
 *
 * How to debug?
 *
 * There's a Screen that you can compile into your firmware that shows currently valid events.
 * You can adapt that to display something else. That part right now is very much work in progress
 * because the exact requirements are not yet known.
 *
 *
 * Implemented based on and other material:
 * https://en.wikipedia.org/wiki/METAR
 * https://www.weather.gov/jetstream/obscurationtypes
 * http://www.faraim.org/aim/aim-4-03-14-493.html
 */
 namespace Pinetime {
  namespace Controllers {
    class WeatherData {
    public:
      /**
       * Visibility obscuration types
       */
      enum class obscurationtype {
        /** No obscuration */
        None = 0,
        /** Water particles suspended in the air; low visibility; does not fall */
        Fog = 1,
        /** Tiny, dry particles in the air; invisible to the eye; opalescent */
        Haze = 2,
        /** Small fire-created particles suspended in the air */
        Smoke = 3,
        /** Fine rock powder, from for example volcanoes */
        Ash = 4,
        /** Fine particles of earth suspended in the air by the wind */
        Dust = 5,
        /** Fine particles of sand suspended in the air by the wind */
        Sand = 6,
        /** Water particles suspended in the air; low-ish visibility; temperature is near dewpoint */
        Mist = 7,
        /** This is SPECIAL in the sense that the thing raining down is doing the obscuration */
        Precipitation = 8,
        Length
      };
      /**
       * Types of precipitation
       */
      enum class precipitationtype {
        /**
         * No precipitation
         *
         * Theoretically we could just _not_ send the event, but then
         * how do we differentiate between no precipitation and
         * no information about precipitation
         */
        None = 0,
        /** Drops larger than a drizzle; also widely separated drizzle */
        Rain = 1,
        /** Fairly uniform rain consisting of fine drops */
        Drizzle = 2,
        /** Rain that freezes upon contact with objects and ground */
        FreezingRain = 3,
        /** Rain + hail; ice pellets; small translucent frozen raindrops */
        Sleet = 4,
        /** Larger ice pellets; falling separately or in irregular clumps */
        Hail = 5,
        /** Hail with smaller grains of ice; mini-snowballs */
        SmallHail = 6,
        /** Snow... */
        Snow = 7,
        /** Frozen drizzle; very small snow crystals */
        SnowGrains = 8,
        /** Needles; columns or plates of ice. Sometimes described as "diamond dust". In very cold regions */
        IceCrystals = 9,
        /** It's raining down ash, e.g. from a volcano */
        Ash = 10,
        Length
      };
      /**
       * These are special events that can "enhance" the "experience" of existing weather events
       */
      enum class specialtype {
        /** Strong wind with a sudden onset that lasts at least a minute */
        Squall = 0,
        /** Series of waves in a water body caused by the displacement of a large volume of water */
        Tsunami = 1,
        /** Violent; rotating column of air */
        Tornado = 2,
        /** Unplanned; unwanted; uncontrolled fire in an area */
        Fire = 3,
        /** Thunder and/or lightning */
        Thunder = 4,
        Length
      };
      /**
       * These are used for weather timeline manipulation
       * that isn't just adding to the stack of weather events
       */
      enum class controlcodes {
        /** How much is stored already */
        GetLength = 0,
        /** This wipes the entire timeline */
        DelTimeline = 1,
        /** There's a currently valid timeline event with the given type */
        HasValidEvent = 3,
        Length
      };
      /**
       * Events have types
       * then they're easier to parse after sending them over the air
       */
      enum class eventtype : uint8_t {
        /** @see obscuration */
        Obscuration = 0,
        /** @see precipitation */
        Precipitation = 1,
        /** @see wind */
        Wind = 2,
        /** @see temperature */
        Temperature = 3,
        /** @see airquality */
        AirQuality = 4,
        /** @see special */
        Special = 5,
        /** @see pressure */
        Pressure = 6,
        /** @see location */
        Location = 7,
        /** @see cloud */
        Clouds = 8,
        /** @see humidity */
        Humidity = 9,
        Length
      };
      /**
       * Valid event query
       *
       * NOTE: Not currently available, until needs are better known
       */
      class ValidEventQuery {
      public:
        static constexpr controlcodes code = controlcodes::HasValidEvent;
        eventtype eventType;
      };
      /** The header used for further parsing */
      class TimelineHeader {
      public:
        /**
         * UNIX timestamp
         * TODO: This is currently WITH A TIMEZONE OFFSET!
         * Please send events with the timestamp offset by the timezone.
         **/
        uint64_t timestamp;
        /**
         * Time in seconds until the event expires
         *
         * 32 bits ought to be enough for everyone
         *
         * If there's a newer event of the same type then it overrides this one, even if it hasn't expired
         */
        uint32_t expires;
        /**
         * What type of weather-related event
         */
        eventtype eventType;
      };
      /** Specifies how cloudiness is stored */
      class Clouds : public TimelineHeader {
      public:
        /** Cloud coverage in percentage, 0-100% */
        uint8_t amount;
      };
      /** Specifies how obscuration is stored */
      class Obscuration : public TimelineHeader {
      public:
        /** Type of precipitation */
        obscurationtype type;
        /**
         * Visibility distance in meters
         * 65535 is reserved for unspecified
         */
        uint16_t amount;
      };
      /** Specifies how precipitation is stored */
      class Precipitation : public TimelineHeader {
      public:
        /** Type of precipitation */
        precipitationtype type;
        /**
         * How much is it going to rain? In millimeters
         * 255 is reserved for unspecified
         **/
        uint8_t amount;
      };
      /**
       * How wind speed is stored
       *
       * In order to represent bursts of wind instead of constant wind,
       * you have minimum and maximum speeds.
       *
       * As direction can fluctuate wildly and some watchfaces might wish to display it nicely,
       * we're following the aerospace industry weather report option of specifying a range.
       */
      class Wind : public TimelineHeader {
      public:
        /** Meters per second */
        uint8_t speedMin;
        /** Meters per second */
        uint8_t speedMax;
        /** Unitless direction between 0-255; approximately 1 unit per 0.71 degrees */
        uint8_t directionMin;
        /** Unitless direction between 0-255; approximately 1 unit per 0.71 degrees */
        uint8_t directionMax;
      };
      /**
       * How temperature is stored
       *
       * As it's annoying to figure out the dewpoint on the watch,
       * please send it from the companion
       *
       * We don't do floats, picodegrees are not useful. Make sure to multiply.
       */
      class Temperature : public TimelineHeader {
      public:
        /**
         * Temperature °C but multiplied by 100 (e.g. -12.50°C becomes -1250)
         * -32768 is reserved for "no data"
         */
        int16_t temperature;
        /**
         * Dewpoint °C but multiplied by 100 (e.g. -12.50°C becomes -1250)
         * -32768 is reserved for "no data"
         */
        int16_t dewPoint;
      };
      /**
       * How location info is stored
       *
       * This can be mostly static with long expiration,
       * as it usually is, but it could change during a trip for ex.
       * so we allow changing it dynamically.
       *
       * Location info can be for some kind of map watchface
       * or daylight calculations, should those be required.
       *
       */
      class Location : public TimelineHeader {
      public:
        /** Location name */
        std::string location;
        /** Altitude relative to sea level in meters */
        int16_t altitude;
        /** Latitude, EPSG:3857 (Google Maps, Openstreetmaps datum) */
        int32_t latitude;
        /** Longitude, EPSG:3857 (Google Maps, Openstreetmaps datum) */
        int32_t longitude;
      };
      /**
       * How humidity is stored
       */
      class Humidity : public TimelineHeader {
      public:
        /** Relative humidity, 0-100% */
        uint8_t humidity;
      };
      /**
       * How air pressure is stored
       */
      class Pressure : public TimelineHeader {
      public:
        /** Air pressure in hectopascals (hPa) */
        int16_t pressure;
      };
      /**
       * How special events are stored
       */
      class Special : public TimelineHeader {
      public:
        /** Special event's type */
        specialtype type;
      };
      /**
       * How air quality is stored
       *
       * These events are a bit more complex because the topic is not simple,
       * the intention is to heavy-lift the annoying preprocessing from the watch
       * this allows watchface or watchapp makers to generate accurate alerts and graphics
       *
       * If this needs further enforced standardization, pull requests are welcome
       */
      class AirQuality : public TimelineHeader {
      public:
        /**
         * The name of the pollution
         *
         * for the sake of better compatibility with watchapps
         * that might want to use this data for say visuals
         * don't localize the name.
         *
         * Ideally watchapp itself localizes the name, if it's at all needed.
         *
         * E.g.
         * For generic ones use "PM0.1", "PM5", "PM10"
         * For chemical compounds use the molecular formula e.g. "NO2", "CO2", "O3"
         * For pollen use the genus, e.g. "Betula" for birch or "Alternaria" for that mold's spores
         */
        std::string polluter;
        /**
         * Amount of the pollution in SI units,
         * otherwise it's going to be difficult to create UI, alerts
         * and so on and for.
         *
         * See more:
         * https://ec.europa.eu/environment/air/quality/standards.htm
         * http://www.ourair.org/wp-content/uploads/2012-aaqs2.pdf
         *
         * Example units:
         * count/m³ for pollen
         * µgC/m³ for micrograms of organic carbon
         * µg/m³ sulfates, PM0.1, PM1, PM2, PM10 and so on, dust
         * mg/m³ CO2, CO
         * ng/m³ for heavy metals
         *
         * List is not comprehensive, should be improved.
         * The current ones are what watchapps assume!
         *
         * Note: ppb and ppm to concentration should be calculated on the companion, using
         * the correct formula (taking into account temperature and air pressure)
         *
         * Note2: The amount is off by times 100, for two decimal places of precision.
         * E.g. 54.32µg/m³ is 5432
         *
         */
        uint32_t amount;
      };
    };
  }
 }
--- a/src/components/ble/weather/WeatherService.cpp
+++ b/src/components/ble/weather/WeatherService.cpp
@ -0,0 +1,604 @@
 /*  Copyright (C) 2021 Avamander
    This file is part of InfiniTime.
    InfiniTime is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published
    by the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
    InfiniTime is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 #include <qcbor/qcbor_spiffy_decode.h>
 #include "WeatherService.h"
 #include "libs/QCBOR/inc/qcbor/qcbor.h"
 #include "systemtask/SystemTask.h"
 int WeatherCallback(uint16_t connHandle, uint16_t attrHandle, struct ble_gatt_access_ctxt* ctxt, void* arg) {
  return static_cast<Pinetime::Controllers::WeatherService*>(arg)->OnCommand(connHandle, attrHandle, ctxt);
 }
 namespace Pinetime {
  namespace Controllers {
    WeatherService::WeatherService(System::SystemTask& system, DateTime& dateTimeController)
      : system(system), dateTimeController(dateTimeController) {
      nullHeader = &nullTimelineheader;
      nullTimelineheader->timestamp = 0;
    }
    void WeatherService::Init() {
      uint8_t res = 0;
      res = ble_gatts_count_cfg(serviceDefinition);
      ASSERT(res == 0);
      res = ble_gatts_add_svcs(serviceDefinition);
      ASSERT(res == 0);
    }
    int WeatherService::OnCommand(uint16_t connHandle, uint16_t attrHandle, struct ble_gatt_access_ctxt* ctxt) {
      if (ctxt->op == BLE_GATT_ACCESS_OP_WRITE_CHR) {
        const uint8_t packetLen = OS_MBUF_PKTLEN(ctxt->om); // NOLINT(cppcoreguidelines-pro-bounds-pointer-arithmetic)
        if (packetLen <= 0) {
          return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
        }
        // Decode
        QCBORDecodeContext decodeContext;
        UsefulBufC encodedCbor = {ctxt->om->om_data, OS_MBUF_PKTLEN(ctxt->om)}; // NOLINT(cppcoreguidelines-pro-bounds-pointer-arithmetic)
        QCBORDecode_Init(&decodeContext, encodedCbor, QCBOR_DECODE_MODE_NORMAL);
        // KINDLY provide us a fixed-length map
        QCBORDecode_EnterMap(&decodeContext, nullptr);
        // Always encodes to the smallest number of bytes based on the value
        int64_t tmpTimestamp = 0;
        QCBORDecode_GetInt64InMapSZ(&decodeContext, "Timestamp", &tmpTimestamp);
        if (QCBORDecode_GetError(&decodeContext) != QCBOR_SUCCESS) {
          CleanUpQcbor(&decodeContext);
          return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
        }
        int64_t tmpExpires = 0;
        QCBORDecode_GetInt64InMapSZ(&decodeContext, "Expires", &tmpExpires);
        if (QCBORDecode_GetError(&decodeContext) != QCBOR_SUCCESS || tmpExpires < 0 || tmpExpires > 4294967295) {
          CleanUpQcbor(&decodeContext);
          return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
        }
        int64_t tmpEventType = 0;
        QCBORDecode_GetInt64InMapSZ(&decodeContext, "EventType", &tmpEventType);
        if (QCBORDecode_GetError(&decodeContext) != QCBOR_SUCCESS || tmpEventType < 0 ||
            tmpEventType >= static_cast<int64_t>(WeatherData::eventtype::Length)) {
          CleanUpQcbor(&decodeContext);
          return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
        }
        switch (static_cast<WeatherData::eventtype>(tmpEventType)) {
          case WeatherData::eventtype::AirQuality: {
            std::unique_ptr<WeatherData::AirQuality> airquality = std::make_unique<WeatherData::AirQuality>();
            airquality->timestamp = tmpTimestamp;
            airquality->eventType = static_cast<WeatherData::eventtype>(tmpEventType);
            airquality->expires = tmpExpires;
            UsefulBufC stringBuf; // TODO: Everything ok with lifecycle here?
            QCBORDecode_GetTextStringInMapSZ(&decodeContext, "Polluter", &stringBuf);
            if (UsefulBuf_IsNULLOrEmptyC(stringBuf) != 0) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            airquality->polluter = std::string(static_cast<const char*>(stringBuf.ptr), stringBuf.len);
            int64_t tmpAmount = 0;
            QCBORDecode_GetInt64InMapSZ(&decodeContext, "Amount", &tmpAmount);
            if (tmpAmount < 0 || tmpAmount > 4294967295) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            airquality->amount = tmpAmount; // NOLINT(bugprone-narrowing-conversions,cppcoreguidelines-narrowing-conversions)
            if (!AddEventToTimeline(std::move(airquality))) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            break;
          }
          case WeatherData::eventtype::Obscuration: {
            std::unique_ptr<WeatherData::Obscuration> obscuration = std::make_unique<WeatherData::Obscuration>();
            obscuration->timestamp = tmpTimestamp;
            obscuration->eventType = static_cast<WeatherData::eventtype>(tmpEventType);
            obscuration->expires = tmpExpires;
            int64_t tmpType = 0;
            QCBORDecode_GetInt64InMapSZ(&decodeContext, "Type", &tmpType);
            if (tmpType < 0 || tmpType >= static_cast<int64_t>(WeatherData::obscurationtype::Length)) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            obscuration->type = static_cast<WeatherData::obscurationtype>(tmpType);
            int64_t tmpAmount = 0;
            QCBORDecode_GetInt64InMapSZ(&decodeContext, "Amount", &tmpAmount);
            if (tmpAmount < 0 || tmpAmount > 65535) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            obscuration->amount = tmpAmount; // NOLINT(bugprone-narrowing-conversions,cppcoreguidelines-narrowing-conversions)
            if (!AddEventToTimeline(std::move(obscuration))) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            break;
          }
          case WeatherData::eventtype::Precipitation: {
            std::unique_ptr<WeatherData::Precipitation> precipitation = std::make_unique<WeatherData::Precipitation>();
            precipitation->timestamp = tmpTimestamp;
            precipitation->eventType = static_cast<WeatherData::eventtype>(tmpEventType);
            precipitation->expires = tmpExpires;
            int64_t tmpType = 0;
            QCBORDecode_GetInt64InMapSZ(&decodeContext, "Type", &tmpType);
            if (tmpType < 0 || tmpType >= static_cast<int64_t>(WeatherData::precipitationtype::Length)) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            precipitation->type = static_cast<WeatherData::precipitationtype>(tmpType);
            int64_t tmpAmount = 0;
            QCBORDecode_GetInt64InMapSZ(&decodeContext, "Amount", &tmpAmount);
            if (tmpAmount < 0 || tmpAmount > 255) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            precipitation->amount = tmpAmount; // NOLINT(bugprone-narrowing-conversions,cppcoreguidelines-narrowing-conversions)
            if (!AddEventToTimeline(std::move(precipitation))) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            break;
          }
          case WeatherData::eventtype::Wind: {
            std::unique_ptr<WeatherData::Wind> wind = std::make_unique<WeatherData::Wind>();
            wind->timestamp = tmpTimestamp;
            wind->eventType = static_cast<WeatherData::eventtype>(tmpEventType);
            wind->expires = tmpExpires;
            int64_t tmpMin = 0;
            QCBORDecode_GetInt64InMapSZ(&decodeContext, "SpeedMin", &tmpMin);
            if (tmpMin < 0 || tmpMin > 255) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            wind->speedMin = tmpMin; // NOLINT(bugprone-narrowing-conversions,cppcoreguidelines-narrowing-conversions)
            int64_t tmpMax = 0;
            QCBORDecode_GetInt64InMapSZ(&decodeContext, "SpeedMin", &tmpMax);
            if (tmpMax < 0 || tmpMax > 255) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            wind->speedMax = tmpMax; // NOLINT(bugprone-narrowing-conversions,cppcoreguidelines-narrowing-conversions)
            int64_t tmpDMin = 0;
            QCBORDecode_GetInt64InMapSZ(&decodeContext, "DirectionMin", &tmpDMin);
            if (tmpDMin < 0 || tmpDMin > 255) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            wind->directionMin = tmpDMin; // NOLINT(bugprone-narrowing-conversions,cppcoreguidelines-narrowing-conversions)
            int64_t tmpDMax = 0;
            QCBORDecode_GetInt64InMapSZ(&decodeContext, "DirectionMax", &tmpDMax);
            if (tmpDMax < 0 || tmpDMax > 255) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            wind->directionMax = tmpDMax; // NOLINT(bugprone-narrowing-conversions,cppcoreguidelines-narrowing-conversions)
            if (!AddEventToTimeline(std::move(wind))) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            break;
          }
          case WeatherData::eventtype::Temperature: {
            std::unique_ptr<WeatherData::Temperature> temperature = std::make_unique<WeatherData::Temperature>();
            temperature->timestamp = tmpTimestamp;
            temperature->eventType = static_cast<WeatherData::eventtype>(tmpEventType);
            temperature->expires = tmpExpires;
            int64_t tmpTemperature = 0;
            QCBORDecode_GetInt64InMapSZ(&decodeContext, "Temperature", &tmpTemperature);
            if (tmpTemperature < -32768 || tmpTemperature > 32767) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            temperature->temperature =
              static_cast<int16_t>(tmpTemperature); // NOLINT(bugprone-narrowing-conversions,cppcoreguidelines-narrowing-conversions)
            int64_t tmpDewPoint = 0;
            QCBORDecode_GetInt64InMapSZ(&decodeContext, "DewPoint", &tmpDewPoint);
            if (tmpDewPoint < -32768 || tmpDewPoint > 32767) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            temperature->dewPoint =
              static_cast<int16_t>(tmpDewPoint); // NOLINT(bugprone-narrowing-conversions,cppcoreguidelines-narrowing-conversions)
            if (!AddEventToTimeline(std::move(temperature))) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            break;
          }
          case WeatherData::eventtype::Special: {
            std::unique_ptr<WeatherData::Special> special = std::make_unique<WeatherData::Special>();
            special->timestamp = tmpTimestamp;
            special->eventType = static_cast<WeatherData::eventtype>(tmpEventType);
            special->expires = tmpExpires;
            int64_t tmpType = 0;
            QCBORDecode_GetInt64InMapSZ(&decodeContext, "Type", &tmpType);
            if (tmpType < 0 || tmpType >= static_cast<int64_t>(WeatherData::specialtype::Length)) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            special->type = static_cast<WeatherData::specialtype>(tmpType);
            if (!AddEventToTimeline(std::move(special))) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            break;
          }
          case WeatherData::eventtype::Pressure: {
            std::unique_ptr<WeatherData::Pressure> pressure = std::make_unique<WeatherData::Pressure>();
            pressure->timestamp = tmpTimestamp;
            pressure->eventType = static_cast<WeatherData::eventtype>(tmpEventType);
            pressure->expires = tmpExpires;
            int64_t tmpPressure = 0;
            QCBORDecode_GetInt64InMapSZ(&decodeContext, "Pressure", &tmpPressure);
            if (tmpPressure < 0 || tmpPressure >= 65535) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            pressure->pressure = tmpPressure; // NOLINT(bugprone-narrowing-conversions,cppcoreguidelines-narrowing-conversions)
            if (!AddEventToTimeline(std::move(pressure))) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            break;
          }
          case WeatherData::eventtype::Location: {
            std::unique_ptr<WeatherData::Location> location = std::make_unique<WeatherData::Location>();
            location->timestamp = tmpTimestamp;
            location->eventType = static_cast<WeatherData::eventtype>(tmpEventType);
            location->expires = tmpExpires;
            UsefulBufC stringBuf; // TODO: Everything ok with lifecycle here?
            QCBORDecode_GetTextStringInMapSZ(&decodeContext, "Location", &stringBuf);
            if (UsefulBuf_IsNULLOrEmptyC(stringBuf) != 0) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            location->location = std::string(static_cast<const char*>(stringBuf.ptr), stringBuf.len);
            int64_t tmpAltitude = 0;
            QCBORDecode_GetInt64InMapSZ(&decodeContext, "Altitude", &tmpAltitude);
            if (tmpAltitude < -32768 || tmpAltitude >= 32767) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            location->altitude = static_cast<int16_t>(tmpAltitude);
            int64_t tmpLatitude = 0;
            QCBORDecode_GetInt64InMapSZ(&decodeContext, "Latitude", &tmpLatitude);
            if (tmpLatitude < -2147483648 || tmpLatitude >= 2147483647) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            location->latitude = static_cast<int32_t>(tmpLatitude);
            int64_t tmpLongitude = 0;
            QCBORDecode_GetInt64InMapSZ(&decodeContext, "Longitude", &tmpLongitude);
            if (tmpLongitude < -2147483648 || tmpLongitude >= 2147483647) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            location->latitude = static_cast<int32_t>(tmpLongitude);
            if (!AddEventToTimeline(std::move(location))) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            break;
          }
          case WeatherData::eventtype::Clouds: {
            std::unique_ptr<WeatherData::Clouds> clouds = std::make_unique<WeatherData::Clouds>();
            clouds->timestamp = tmpTimestamp;
            clouds->eventType = static_cast<WeatherData::eventtype>(tmpEventType);
            clouds->expires = tmpExpires;
            int64_t tmpAmount = 0;
            QCBORDecode_GetInt64InMapSZ(&decodeContext, "Amount", &tmpAmount);
            if (tmpAmount < 0 || tmpAmount > 255) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            clouds->amount = static_cast<uint8_t>(tmpAmount);
            if (!AddEventToTimeline(std::move(clouds))) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            break;
          }
          case WeatherData::eventtype::Humidity: {
            std::unique_ptr<WeatherData::Humidity> humidity = std::make_unique<WeatherData::Humidity>();
            humidity->timestamp = tmpTimestamp;
            humidity->eventType = static_cast<WeatherData::eventtype>(tmpEventType);
            humidity->expires = tmpExpires;
            int64_t tmpType = 0;
            QCBORDecode_GetInt64InMapSZ(&decodeContext, "Humidity", &tmpType);
            if (tmpType < 0 || tmpType >= 255) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            humidity->humidity = static_cast<uint8_t>(tmpType);
            if (!AddEventToTimeline(std::move(humidity))) {
              CleanUpQcbor(&decodeContext);
              return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
            }
            break;
          }
          default: {
            CleanUpQcbor(&decodeContext);
            return BLE_ATT_ERR_INVALID_ATTR_VALUE_LEN;
          }
        }
        QCBORDecode_ExitMap(&decodeContext);
        GetTimelineLength();
        TidyTimeline();
        if (QCBORDecode_Finish(&decodeContext) != QCBOR_SUCCESS) {
          return BLE_ATT_ERR_INSUFFICIENT_RES;
        }
      } else if (ctxt->op == BLE_GATT_ACCESS_OP_READ_CHR) {
        // Encode
        uint8_t buffer[64];
        QCBOREncodeContext encodeContext;
        /* TODO: This is very much still a test endpoint
         *  it needs a characteristic UUID check
         *  and actual implementations that show
         *  what actually has to be read.
         *  WARN: Consider commands not part of the API for now!
         */
        QCBOREncode_Init(&encodeContext, UsefulBuf_FROM_BYTE_ARRAY(buffer));
        QCBOREncode_OpenMap(&encodeContext);
        QCBOREncode_AddTextToMap(&encodeContext, "test", UsefulBuf_FROM_SZ_LITERAL("test"));
        QCBOREncode_AddInt64ToMap(&encodeContext, "test", 1ul);
        QCBOREncode_CloseMap(&encodeContext);
        UsefulBufC encodedEvent;
        auto uErr = QCBOREncode_Finish(&encodeContext, &encodedEvent);
        if (uErr != 0) {
          return BLE_ATT_ERR_INSUFFICIENT_RES;
        }
        auto res = os_mbuf_append(ctxt->om, &buffer, sizeof(buffer));
        if (res == 0) {
          return BLE_ATT_ERR_INSUFFICIENT_RES;
        }
        return 0;
      }
      return 0;
    }
    std::unique_ptr<WeatherData::Clouds>& WeatherService::GetCurrentClouds() {
      uint64_t currentTimestamp = GetCurrentUnixTimestamp();
      for (auto&& header : this->timeline) {
        if (header->eventType == WeatherData::eventtype::Clouds && IsEventStillValid(header, currentTimestamp)) {
          return reinterpret_cast<std::unique_ptr<WeatherData::Clouds>&>(header);
        }
      }
      return reinterpret_cast<std::unique_ptr<WeatherData::Clouds>&>(*this->nullHeader);
    }
    std::unique_ptr<WeatherData::Obscuration>& WeatherService::GetCurrentObscuration() {
      uint64_t currentTimestamp = GetCurrentUnixTimestamp();
      for (auto&& header : this->timeline) {
        if (header->eventType == WeatherData::eventtype::Obscuration && IsEventStillValid(header, currentTimestamp)) {
          return reinterpret_cast<std::unique_ptr<WeatherData::Obscuration>&>(header);
        }
      }
      return reinterpret_cast<std::unique_ptr<WeatherData::Obscuration>&>(*this->nullHeader);
    }
    std::unique_ptr<WeatherData::Precipitation>& WeatherService::GetCurrentPrecipitation() {
      uint64_t currentTimestamp = GetCurrentUnixTimestamp();
      for (auto&& header : this->timeline) {
        if (header->eventType == WeatherData::eventtype::Precipitation && IsEventStillValid(header, currentTimestamp)) {
          return reinterpret_cast<std::unique_ptr<WeatherData::Precipitation>&>(header);
        }
      }
      return reinterpret_cast<std::unique_ptr<WeatherData::Precipitation>&>(*this->nullHeader);
    }
    std::unique_ptr<WeatherData::Wind>& WeatherService::GetCurrentWind() {
      uint64_t currentTimestamp = GetCurrentUnixTimestamp();
      for (auto&& header : this->timeline) {
        if (header->eventType == WeatherData::eventtype::Wind && IsEventStillValid(header, currentTimestamp)) {
          return reinterpret_cast<std::unique_ptr<WeatherData::Wind>&>(header);
        }
      }
      return reinterpret_cast<std::unique_ptr<WeatherData::Wind>&>(*this->nullHeader);
    }
    std::unique_ptr<WeatherData::Temperature>& WeatherService::GetCurrentTemperature() {
      uint64_t currentTimestamp = GetCurrentUnixTimestamp();
      for (auto&& header : this->timeline) {
        if (header->eventType == WeatherData::eventtype::Temperature && IsEventStillValid(header, currentTimestamp)) {
          return reinterpret_cast<std::unique_ptr<WeatherData::Temperature>&>(header);
        }
      }
      return reinterpret_cast<std::unique_ptr<WeatherData::Temperature>&>(*this->nullHeader);
    }
    std::unique_ptr<WeatherData::Humidity>& WeatherService::GetCurrentHumidity() {
      uint64_t currentTimestamp = GetCurrentUnixTimestamp();
      for (auto&& header : this->timeline) {
        if (header->eventType == WeatherData::eventtype::Humidity && IsEventStillValid(header, currentTimestamp)) {
          return reinterpret_cast<std::unique_ptr<WeatherData::Humidity>&>(header);
        }
      }
      return reinterpret_cast<std::unique_ptr<WeatherData::Humidity>&>(*this->nullHeader);
    }
    std::unique_ptr<WeatherData::Pressure>& WeatherService::GetCurrentPressure() {
      uint64_t currentTimestamp = GetCurrentUnixTimestamp();
      for (auto&& header : this->timeline) {
        if (header->eventType == WeatherData::eventtype::Pressure && IsEventStillValid(header, currentTimestamp)) {
          return reinterpret_cast<std::unique_ptr<WeatherData::Pressure>&>(header);
        }
      }
      return reinterpret_cast<std::unique_ptr<WeatherData::Pressure>&>(*this->nullHeader);
    }
    std::unique_ptr<WeatherData::Location>& WeatherService::GetCurrentLocation() {
      uint64_t currentTimestamp = GetCurrentUnixTimestamp();
      for (auto&& header : this->timeline) {
        if (header->eventType == WeatherData::eventtype::Location && IsEventStillValid(header, currentTimestamp)) {
          return reinterpret_cast<std::unique_ptr<WeatherData::Location>&>(header);
        }
      }
      return reinterpret_cast<std::unique_ptr<WeatherData::Location>&>(*this->nullHeader);
    }
    std::unique_ptr<WeatherData::AirQuality>& WeatherService::GetCurrentQuality() {
      uint64_t currentTimestamp = GetCurrentUnixTimestamp();
      for (auto&& header : this->timeline) {
        if (header->eventType == WeatherData::eventtype::AirQuality && IsEventStillValid(header, currentTimestamp)) {
          return reinterpret_cast<std::unique_ptr<WeatherData::AirQuality>&>(header);
        }
      }
      return reinterpret_cast<std::unique_ptr<WeatherData::AirQuality>&>(*this->nullHeader);
    }
    size_t WeatherService::GetTimelineLength() const {
      return timeline.size();
    }
    bool WeatherService::AddEventToTimeline(std::unique_ptr<WeatherData::TimelineHeader> event) {
      if (timeline.size() == timeline.max_size()) {
        return false;
      }
      timeline.push_back(std::move(event));
      return true;
    }
    bool WeatherService::HasTimelineEventOfType(const WeatherData::eventtype type) const {
      uint64_t currentTimestamp = GetCurrentUnixTimestamp();
      for (auto&& header : timeline) {
        if (header->eventType == type && IsEventStillValid(header, currentTimestamp)) {
          return true;
        }
      }
      return false;
    }
    void WeatherService::TidyTimeline() {
      uint64_t timeCurrent = GetCurrentUnixTimestamp();
      timeline.erase(std::remove_if(std::begin(timeline),
                                    std::end(timeline),
                                    [&](std::unique_ptr<WeatherData::TimelineHeader> const& header) {
                                      return !IsEventStillValid(header, timeCurrent);
                                    }),
                     std::end(timeline));
      std::sort(std::begin(timeline), std::end(timeline), CompareTimelineEvents);
    }
    bool WeatherService::CompareTimelineEvents(const std::unique_ptr<WeatherData::TimelineHeader>& first,
                                               const std::unique_ptr<WeatherData::TimelineHeader>& second) {
      return first->timestamp > second->timestamp;
    }
    bool WeatherService::IsEventStillValid(const std::unique_ptr<WeatherData::TimelineHeader>& uniquePtr, const uint64_t timestamp) {
      // Not getting timestamp in isEventStillValid for more speed
      return uniquePtr->timestamp + uniquePtr->expires >= timestamp;
    }
    uint64_t WeatherService::GetCurrentUnixTimestamp() const {
      return std::chrono::duration_cast<std::chrono::seconds>(dateTimeController.CurrentDateTime().time_since_epoch()).count();
    }
    int16_t WeatherService::GetTodayMinTemp() const {
      uint64_t currentTimestamp = GetCurrentUnixTimestamp();
      uint64_t currentDayEnd = currentTimestamp - ((24 - dateTimeController.Hours()) * 60 * 60) -
                               ((60 - dateTimeController.Minutes()) * 60) - (60 - dateTimeController.Seconds());
      int16_t result = -32768;
      for (auto&& header : this->timeline) {
        if (header->eventType == WeatherData::eventtype::Temperature && IsEventStillValid(header, currentTimestamp) &&
            header->timestamp < currentDayEnd &&
            reinterpret_cast<const std::unique_ptr<WeatherData::Temperature>&>(header)->temperature != -32768) {
          int16_t temperature = reinterpret_cast<const std::unique_ptr<WeatherData::Temperature>&>(header)->temperature;
          if (result == -32768) {
            result = temperature;
          } else if (result > temperature) {
            result = temperature;
          } else {
            // The temperature in this item is higher than the lowest we've found
          }
        }
      }
      return result;
    }
    int16_t WeatherService::GetTodayMaxTemp() const {
      uint64_t currentTimestamp = GetCurrentUnixTimestamp();
      uint64_t currentDayEnd = currentTimestamp - ((24 - dateTimeController.Hours()) * 60 * 60) -
                               ((60 - dateTimeController.Minutes()) * 60) - (60 - dateTimeController.Seconds());
      int16_t result = -32768;
      for (auto&& header : this->timeline) {
        if (header->eventType == WeatherData::eventtype::Temperature && IsEventStillValid(header, currentTimestamp) &&
            header->timestamp < currentDayEnd &&
            reinterpret_cast<const std::unique_ptr<WeatherData::Temperature>&>(header)->temperature != -32768) {
          int16_t temperature = reinterpret_cast<const std::unique_ptr<WeatherData::Temperature>&>(header)->temperature;
          if (result == -32768) {
            result = temperature;
          } else if (result < temperature) {
            result = temperature;
          } else {
            // The temperature in this item is lower than the highest we've found
          }
        }
      }
      return result;
    }
    void WeatherService::CleanUpQcbor(QCBORDecodeContext* decodeContext) {
      QCBORDecode_ExitMap(decodeContext);
      QCBORDecode_Finish(decodeContext);
    }
  }
 }
--- a/src/components/ble/weather/WeatherService.h
+++ b/src/components/ble/weather/WeatherService.h
@ -0,0 +1,172 @@
 /*  Copyright (C) 2021 Avamander
    This file is part of InfiniTime.
    InfiniTime is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published
    by the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
    InfiniTime is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 #pragma once
 #include <cstdint>
 #include <string>
 #include <vector>
 #include <memory>
 #define min // workaround: nimble's min/max macros conflict with libstdc++
 #define max
 #include <host/ble_gap.h>
 #include <host/ble_uuid.h>
 #undef max
 #undef min
 #include "WeatherData.h"
 #include "libs/QCBOR/inc/qcbor/qcbor.h"
 #include "components/datetime/DateTimeController.h"
 int WeatherCallback(uint16_t connHandle, uint16_t attrHandle, struct ble_gatt_access_ctxt* ctxt, void* arg);
 namespace Pinetime {
  namespace System {
    class SystemTask;
  }
  namespace Controllers {
    class WeatherService {
    public:
      explicit WeatherService(System::SystemTask& system, DateTime& dateTimeController);
      void Init();
      int OnCommand(uint16_t connHandle, uint16_t attrHandle, struct ble_gatt_access_ctxt* ctxt);
      /*
       * Helper functions for quick access to currently valid data
       */
      std::unique_ptr<WeatherData::Location>& GetCurrentLocation();
      std::unique_ptr<WeatherData::Clouds>& GetCurrentClouds();
      std::unique_ptr<WeatherData::Obscuration>& GetCurrentObscuration();
      std::unique_ptr<WeatherData::Precipitation>& GetCurrentPrecipitation();
      std::unique_ptr<WeatherData::Wind>& GetCurrentWind();
      std::unique_ptr<WeatherData::Temperature>& GetCurrentTemperature();
      std::unique_ptr<WeatherData::Humidity>& GetCurrentHumidity();
      std::unique_ptr<WeatherData::Pressure>& GetCurrentPressure();
      std::unique_ptr<WeatherData::AirQuality>& GetCurrentQuality();
      /**
       * Searches for the current day's maximum temperature
       * @return -32768 if there's no data, degrees Celsius times 100 otherwise
       */
      int16_t GetTodayMaxTemp() const;
      /**
       * Searches for the current day's minimum temperature
       * @return -32768 if there's no data, degrees Celsius times 100 otherwise
       */
      int16_t GetTodayMinTemp() const;
      /*
       * Management functions
       */
      /**
       * Adds an event to the timeline
       * @return
       */
      bool AddEventToTimeline(std::unique_ptr<WeatherData::TimelineHeader> event);
      /**
       * Gets the current timeline length
       */
      size_t GetTimelineLength() const;
      /**
       * Checks if an event of a certain type exists in the timeline
       */
      bool HasTimelineEventOfType(WeatherData::eventtype type) const;
    private:
      // 00040000-78fc-48fe-8e23-433b3a1942d0
      static constexpr ble_uuid128_t BaseUuid() {
        return CharUuid(0x00, 0x00);
      }
      // 0004yyxx-78fc-48fe-8e23-433b3a1942d0
      static constexpr ble_uuid128_t CharUuid(uint8_t x, uint8_t y) {
        return ble_uuid128_t {.u = {.type = BLE_UUID_TYPE_128},
                              .value = {0xd0, 0x42, 0x19, 0x3a, 0x3b, 0x43, 0x23, 0x8e, 0xfe, 0x48, 0xfc, 0x78, y, x, 0x04, 0x00}};
      }
      ble_uuid128_t weatherUuid {BaseUuid()};
      /**
       * Just write timeline data here.
       *
       * See {@link WeatherData.h} for more information.
       */
      ble_uuid128_t weatherDataCharUuid {CharUuid(0x00, 0x01)};
      /**
       * This doesn't take timeline data, provides some control over it.
       *
       * NOTE: Currently not supported. Companion app implementer feedback required.
       * There's very little point in solidifying an API before we know the needs.
       */
      ble_uuid128_t weatherControlCharUuid {CharUuid(0x00, 0x02)};
      const struct ble_gatt_chr_def characteristicDefinition[3] = {
        {.uuid = &weatherDataCharUuid.u,
         .access_cb = WeatherCallback,
         .arg = this,
         .flags = BLE_GATT_CHR_F_WRITE,
         .val_handle = &eventHandle},
        {.uuid = &weatherControlCharUuid.u, .access_cb = WeatherCallback, .arg = this, .flags = BLE_GATT_CHR_F_WRITE | BLE_GATT_CHR_F_READ},
        {nullptr}};
      const struct ble_gatt_svc_def serviceDefinition[2] = {
        {.type = BLE_GATT_SVC_TYPE_PRIMARY, .uuid = &weatherUuid.u, .characteristics = characteristicDefinition}, {0}};
      uint16_t eventHandle {};
      Pinetime::System::SystemTask& system;
      Pinetime::Controllers::DateTime& dateTimeController;
      std::vector<std::unique_ptr<WeatherData::TimelineHeader>> timeline;
      std::unique_ptr<WeatherData::TimelineHeader> nullTimelineheader = std::make_unique<WeatherData::TimelineHeader>();
      std::unique_ptr<WeatherData::TimelineHeader>* nullHeader;
      /**
       * Cleans up the timeline of expired events
       */
      void TidyTimeline();
      /**
       * Compares two timeline events
       */
      static bool CompareTimelineEvents(const std::unique_ptr<WeatherData::TimelineHeader>& first,
                                        const std::unique_ptr<WeatherData::TimelineHeader>& second);
      /**
       * Returns current UNIX timestamp
       */
      uint64_t GetCurrentUnixTimestamp() const;
      /**
       * Checks if the event hasn't gone past and expired
       *
       * @param header timeline event to check
       * @param currentTimestamp what's the time right now
       * @return if the event is valid
       */
      static bool IsEventStillValid(const std::unique_ptr<WeatherData::TimelineHeader>& uniquePtr, const uint64_t timestamp);
      /**
       * This is a helper function that closes a QCBOR map and decoding context cleanly
       */
      void CleanUpQcbor(QCBORDecodeContext* decodeContext);
    };
  }
 }
--- a/src/components/brightness/BrightnessController.cpp
+++ b/src/components/brightness/BrightnessController.cpp
@ -1,4 +1,4 @@
-#include "BrightnessController.h"
+#include "components/brightness/BrightnessController.h"
 #include <hal/nrf_gpio.h>
 #include "displayapp/screens/Symbols.h"
 #include "drivers/PinMap.h"
--- a/src/components/datetime/DateTimeController.cpp
+++ b/src/components/datetime/DateTimeController.cpp
@ -1,4 +1,4 @@
-#include "DateTimeController.h"
+#include "components/datetime/DateTimeController.h"
 #include <date/date.h>
 #include <libraries/log/nrf_log.h>
 #include <systemtask/SystemTask.h>
--- a/src/components/firmwarevalidator/FirmwareValidator.cpp
+++ b/src/components/firmwarevalidator/FirmwareValidator.cpp
@ -1,4 +1,4 @@
-#include "FirmwareValidator.h"
+#include "components/firmwarevalidator/FirmwareValidator.h"
 #include <hal/nrf_rtc.h>
 #include "drivers/InternalFlash.h"
--- a/src/components/fs/FS.cpp
+++ b/src/components/fs/FS.cpp
@ -1,33 +1,32 @@
-#include "FS.h"
+#include "components/fs/FS.h"
 #include <cstring>
 #include <littlefs/lfs.h>
 #include <lvgl/lvgl.h>
 using namespace Pinetime::Controllers;
-FS::FS(Pinetime::Drivers::SpiNorFlash& driver) :
+FS::FS(Pinetime::Drivers::SpiNorFlash& driver)
-  flashDriver{ driver },
+  : flashDriver {driver},
-  lfsConfig{
+    lfsConfig {
-    .context = this,
+      .context = this,
-    .read = SectorRead,
+      .read = SectorRead,
-    .prog = SectorProg,
+      .prog = SectorProg,
-    .erase = SectorErase,
+      .erase = SectorErase,
-    .sync = SectorSync,
+      .sync = SectorSync,
-    .read_size = 16,
+      .read_size = 16,
-    .prog_size = 8,
+      .prog_size = 8,
-    .block_size = blockSize,
+      .block_size = blockSize,
-    .block_count = size / blockSize,
+      .block_count = size / blockSize,
-    .block_cycles = 1000u,
+      .block_cycles = 1000u,
-    .cache_size = 16,
+      .cache_size = 16,
-    .lookahead_size = 16,
+      .lookahead_size = 16,
    .name_max = 50,
    .attr_max = 50,
  }
 { }
      .name_max = 50,
      .attr_max = 50,
    } {
 }
 void FS::Init() {
@ -48,7 +47,6 @@ void FS::Init() {
  VerifyResource();
  LVGLFileSystemInit();
 #endif
 }
 void FS::VerifyResource() {
@ -56,7 +54,7 @@ void FS::VerifyResource() {
  resourcesValid = true;
 }
-int  FS::FileOpen(lfs_file_t* file_p, const char* fileName, const int flags) {
+int FS::FileOpen(lfs_file_t* file_p, const char* fileName, const int flags) {
  return lfs_file_open(&lfs, file_p, fileName, flags);
 }
@ -80,27 +78,31 @@ int FS::FileDelete(const char* fileName) {
  return lfs_remove(&lfs, fileName);
 }
 int FS::DirOpen(const char* path, lfs_dir_t* lfs_dir) {
  return lfs_dir_open(&lfs, lfs_dir, path);
 }
 int FS::DirClose(lfs_dir_t* lfs_dir) {
  return lfs_dir_close(&lfs, lfs_dir);
 }
 int FS::DirRead(lfs_dir_t* dir, lfs_info* info) {
  return lfs_dir_read(&lfs, dir, info);
 }
 int FS::DirRewind(lfs_dir_t* dir) {
  return lfs_dir_rewind(&lfs, dir);
 }
 int FS::DirCreate(const char* path) {
  return lfs_mkdir(&lfs, path);
 }
-
+int FS::Rename(const char* oldPath, const char* newPath){
-// Delete directory and all files inside
+  return lfs_rename(&lfs,oldPath,newPath);
-int FS::DirDelete(const char* path) {
+}
-
+int FS::Stat(const char* path, lfs_info* info) {
-  lfs_dir_t lfs_dir;
+  return lfs_stat(&lfs, path, info);
-  lfs_info entryInfo;
+}
-
+lfs_ssize_t FS::GetFSSize() {
-  int err;
+  return lfs_fs_size(&lfs);
  err = lfs_dir_open(&lfs, &lfs_dir, path);
  if (err) {
    return err;
  }
  while (lfs_dir_read(&lfs, &lfs_dir, &entryInfo)) {
    lfs_remove(&lfs, entryInfo.name);
  }
  lfs_dir_close(&lfs, &lfs_dir);
  return LFS_ERR_OK;
 }
 /*
@ -141,17 +143,17 @@ int FS::SectorRead(const struct lfs_config* c, lfs_block_t block, lfs_off_t off,
 namespace {
  lv_fs_res_t lvglOpen(lv_fs_drv_t* drv, void* file_p, const char* path, lv_fs_mode_t mode) {
    lfs_file_t* file = static_cast<lfs_file_t*>(file_p);
    FS* filesys = static_cast<FS*>(drv->user_data);
-    filesys->FileOpen(file, path, LFS_O_RDONLY);
+    int res = filesys->FileOpen(file, path, LFS_O_RDONLY);
-
+    if (res == 0) {
-    if (file->type == 0) {
+      if (file->type == 0) {
-      return LV_FS_RES_FS_ERR;
+        return LV_FS_RES_FS_ERR;
-    }
+      } else {
-    else {
+        return LV_FS_RES_OK;
-      return LV_FS_RES_OK;
+      }
    }
    return LV_FS_RES_NOT_EX;
  }
  lv_fs_res_t lvglClose(lv_fs_drv_t* drv, void* file_p) {
@ -193,5 +195,4 @@ void FS::LVGLFileSystemInit() {
  fs_drv.user_data = this;
  lv_fs_drv_register(&fs_drv);
 }
--- a/src/components/fs/FS.h
+++ b/src/components/fs/FS.h
@ -21,37 +21,49 @@ namespace Pinetime {
      int FileDelete(const char* fileName);
      int DirOpen(const char* path, lfs_dir_t* lfs_dir);
      int DirClose(lfs_dir_t* lfs_dir);
      int DirRead(lfs_dir_t* dir, lfs_info* info);
      int DirRewind(lfs_dir_t* dir);
      int DirCreate(const char* path);
-      int DirDelete(const char* path);
+ 
-
+      lfs_ssize_t GetFSSize();
      int Rename(const char* oldPath, const char* newPath);
      int Stat(const char* path, lfs_info* info);
      void VerifyResource();
-    private:
+      static size_t getSize() {
        return size;
      }
      static size_t getBlockSize() {
        return blockSize;
      }
    private:
      Pinetime::Drivers::SpiNorFlash& flashDriver;
      /*
-      * External Flash MAP (4 MBytes)
+       * External Flash MAP (4 MBytes)
-      *
+       *
-      * 0x000000 +---------------------------------------+
+       * 0x000000 +---------------------------------------+
-      *          |  Bootloader Assets                    |
+       *          |  Bootloader Assets                    |
-      *          |  256 KBytes                           |
+       *          |  256 KBytes                           |
-      *          |                                       |
+       *          |                                       |
-      * 0x040000 +---------------------------------------+
+       * 0x040000 +---------------------------------------+
-      *          |  OTA                                  |
+       *          |  OTA                                  |
-      *          |  464 KBytes                           |
+       *          |  464 KBytes                           |
-      *          |                                       |
+       *          |                                       |
-      *          |                                       |
+       *          |                                       |
-      *          |                                       |
+       *          |                                       |
-      * 0x0B4000 +---------------------------------------+
+       * 0x0B4000 +---------------------------------------+
-      *          |  File System                          |
+       *          |  File System                          |
-      *          |                                       |
+       *          |                                       |
-      *          |                                       |
+       *          |                                       |
-      *          |                                       |
+       *          |                                       |
-      *          |                                       |
+       *          |                                       |
-      * 0x400000 +---------------------------------------+
+       * 0x400000 +---------------------------------------+
-      *
+       *
-      */
+       */
      static constexpr size_t startAddress = 0x0B4000;
      static constexpr size_t size = 0x34C000;
      static constexpr size_t blockSize = 4096;
@ -65,7 +77,6 @@ namespace Pinetime {
      static int SectorErase(const struct lfs_config* c, lfs_block_t block);
      static int SectorProg(const struct lfs_config* c, lfs_block_t block, lfs_off_t off, const void* buffer, lfs_size_t size);
      static int SectorRead(const struct lfs_config* c, lfs_block_t block, lfs_off_t off, void* buffer, lfs_size_t size);
    };
  }
 }
--- a/src/components/gfx/Gfx.cpp
+++ b/src/components/gfx/Gfx.cpp
@ -1,4 +1,4 @@
-#include "Gfx.h"
+#include "components/gfx/Gfx.h"
 #include "drivers/St7789.h"
 using namespace Pinetime::Components;
--- a/src/components/heartrate/Biquad.cpp
+++ b/src/components/heartrate/Biquad.cpp
@ -4,7 +4,7 @@
  C++ port Copyright (C) 2021 Jean-François Milants
 */
-#include "Biquad.h"
+#include "components/heartrate/Biquad.h"
 using namespace Pinetime::Controllers;
--- a/src/components/heartrate/HeartRateController.cpp
+++ b/src/components/heartrate/HeartRateController.cpp
@ -1,4 +1,4 @@
-#include "HeartRateController.h"
+#include "components/heartrate/HeartRateController.h"
 #include <heartratetask/HeartRateTask.h>
 #include <systemtask/SystemTask.h>
--- a/src/components/heartrate/Ppg.cpp
+++ b/src/components/heartrate/Ppg.cpp
@ -4,9 +4,9 @@
  C++ port Copyright (C) 2021 Jean-François Milants
 */
 #include "components/heartrate/Ppg.h"
 #include <vector>
 #include <nrf_log.h>
 #include "Ppg.h"
 using namespace Pinetime::Controllers;
 /** Original implementation from wasp-os : https://github.com/daniel-thompson/wasp-os/blob/master/wasp/ppg.py */
--- a/src/components/heartrate/Ppg.h
+++ b/src/components/heartrate/Ppg.h
@ -1,8 +1,8 @@
 #pragma once
 #include <array>
-#include "Biquad.h"
+#include "components/heartrate/Biquad.h"
-#include "Ptagc.h"
+#include "components/heartrate/Ptagc.h"
 namespace Pinetime {
  namespace Controllers {
--- a/Show More
+++ b/Show More
`@ -1,4 +1,4 @@`
	`#include "BleController.h"`	`#include "components/ble/BleController.h"`

	`using namespace Pinetime::Controllers;`	`using namespace Pinetime::Controllers;`
`@ -1,4 +1,4 @@`
	`#include "DeviceInformationService.h"`	`#include "components/ble/DeviceInformationService.h"`

	`using namespace Pinetime::Controllers;`	`using namespace Pinetime::Controllers;`