Merge branch 'develop' of

https://github.com/JF002/InfiniTime into StepsApp

Author: joaquimorg

.clang-format

@@ -21,8 +21,8 @@ AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
 AlwaysBreakTemplateDeclarations: MultiLine
-BinPackArguments: true
-BinPackParameters: true
+BinPackArguments: false
+BinPackParameters: false
 BraceWrapping:
   AfterCaseLabel: false
   AfterClass: false
@@ -52,14 +52,14 @@ BreakStringLiterals: true
 ColumnLimit: 140
 CommentPragmas: '^ IWYU pragma:'
 CompactNamespaces: false
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
 ConstructorInitializerIndentWidth: 2
 ContinuationIndentWidth: 2
 Cpp11BracedListStyle: true
 DeriveLineEnding: false
 DerivePointerAlignment: false
 DisableFormat: false
-ExperimentalAutoDetectBinPacking: false
+ExperimentalAutoDetectBinPacking: true
 FixNamespaceComments: false
 ForEachMacros:
   - foreach
@@ -90,10 +90,6 @@ MacroBlockBegin: ''
 MacroBlockEnd: ''
 MaxEmptyLinesToKeep: 1
 NamespaceIndentation: All
-ObjCBinPackProtocolList: Auto
-ObjCBlockIndentWidth: 2
-ObjCSpaceAfterProperty: false
-ObjCSpaceBeforeProtocolList: true
 PenaltyBreakAssignment: 2
 PenaltyBreakBeforeFirstCallParameter: 19
 PenaltyBreakComment: 300

.gitignore

@@ -1,4 +1,7 @@
 .idea/
+# Python virtual environment for DFU images
+.venv/
+
 # CMake
 cmake-build-*
 cmake-*

README.md

@@ -24,8 +24,7 @@ The goal of this project is to design an open-source firmware for the Pinetime s
 
 ## Overview
 
-![Pinetime screens](images/0.14.0/collage1.png "PinetimeScreens")
-![Pinetime screens](images/0.14.0/collage2.png "PinetimeScreens")
+![Pinetime screens](images/1.0.0/collage.png "PinetimeScreens")
 
 As of now, here is the list of achievements of this project:
 
@@ -37,32 +36,46 @@ As of now, here is the list of achievements of this project:
  - Heart rate measurements
  - Step counting
  - Wake-up on wrist rotation
- - Multiple 'apps' : 
-    * Clock (displays the date, time, battery level, ble connection status, heart rate)
-    * System info (displays various info : BLE MAC, build date/time, uptime, version,...)
-    * Brightess (allows the user to configure the brightness of the display)
+ - Quick actions 
+    * Disable vibration on notification
+    * Brightness settings
+    * Flashlight
+    * Settings
+ - 2 watch faces:
+    * Digital
+    * Analog
+ - Multiple 'apps' :
     * Music (control the playback of the music on your phone)
     * Heart rate (controls the heart rate sensor and display current heartbeat)
     * Navigation (displays navigation instructions coming from the companion app)
     * Notification (displays the last notification received)
     * Paddle (single player pong-like game)
     * Two (2048 clone game)
     * Stopwatch (with all the necessary functions such as play, pause, lap, stop)
+    * Motion sensor and step counter (displays the number of steps and the state of the motion sensor in real-time)
+ - User settings:
+    * Display timeout
+    * Wake-up condition
+    * Time format (12/24h)
+    * Default watch face
+    * Battery status
+    * Firmware validation
+    * System information
  - Supported by 3 companion apps (development is in progress):
     * [Gadgetbridge](https://codeberg.org/Freeyourgadget/Gadgetbridge/) (on Android)
     * [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]** OTA (Over-the-air) update via BLE
- - **[Experimental]** Bootloader based on [MCUBoot](https://juullabs-oss.github.io/mcuboot/)
+ - OTA (Over-the-air) update via BLE
+ - [Bootloader](https://github.com/JF002/pinetime-mcuboot-bootloader) based on [MCUBoot](https://juullabs-oss.github.io/mcuboot/)
 
 ## Documentation
 
 ### Getting started
  - [Flash, upgrade (OTA), time synchronization,...](doc/gettingStarted/gettingStarted.md)
 
 ### Develop
- - [Generate the fonts and symbols](src/displayapp/fonts/Readme.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)
 
 ### Build, flash and debug

images/1.0.0/collage.png

@@ -17,7 +17,7 @@ uint32_t BootloaderVersion::Patch() {
   return 0;
 }
 
-const char *BootloaderVersion::VersionString() {
+const char* BootloaderVersion::VersionString() {
   return "0.0.0";
 }
 

src/BootloaderVersion.cpp

@@ -2,11 +2,11 @@
 
 namespace Pinetime {
   class BootloaderVersion {
-    public:
-      static uint32_t Major();
-      static uint32_t Minor();
-      static uint32_t Patch();
-      static const char* VersionString();
-      static bool IsValid();
+  public:
+    static uint32_t Major();
+    static uint32_t Minor();
+    static uint32_t Patch();
+    static const char* VersionString();
+    static bool IsValid();
   };
 }