Merge 66278426e7 into a2356f2f4a

.gitconfig

@@ -3,16 +3,3 @@
     autocrlf = input
 [apply]
     whitespace = fix
-
-[diff]
-    tool = meld
-[difftool]
-    prompt = false
-[difftool "meld"]
-    cmd = meld "$LOCAL" "$REMOTE"
-[merge]
-    tool = meld
-[mergetool "meld"]
-    # Choose one of these two lines (not both!) explained below.
-    cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
-    cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"

.gitignore

@@ -11,7 +11,7 @@ cmake_install.cmake
 Makefile
 build
 tools
-
+node_modules
 
 # Resulting binary files
 *.a

.gitmodules

@@ -4,6 +4,9 @@
 [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
 [submodule "src/libs/arduinoFFT"]
 	path = src/libs/arduinoFFT
 	url = https://github.com/kosme/arduinoFFT.git

README.md

@@ -1,41 +1,9 @@
-# [InfiniTime](https://github.com/Eve1374/InfiniTime)
+# [InfiniTime](https://github.com/InfiniTimeOrg/InfiniTime)
 
 ![InfiniTime logo](doc/logo/infinitime-logo-small.jpg "InfiniTime Logo")
 
 Fast open-source firmware for the [PineTime smartwatch](https://pine64.org/devices/pinetime/) with many features, written in modern C++.
 
-## Quick notes on this InfiniTime version
-
-- I copied the source code from this git repo : [InfiniTime](https://github.com/InfiniTimeOrg/InfiniTime)
-- I added a watch face "WatchFaceMeow" whose main features are to be pink and have info about the alarm status
-- I stored the compile commands in scripts compile.sh to run from InfiniTime/ folder, and make_pine_mcu.sh to build the image must be run from InfiniTime/build/ (compile.sh copies make_pine_mcu.sh to build/ 
-- The file to flash to the pinetime is InfiniTime/build/pinetime-mcuboot-app-dfu-1.14.0.zip : I didn't change the version compared to the one I downloaded from [InfiniTime](https://github.com/InfiniTimeOrg/InfiniTime) so make sure not to keep keep a copy of it
-
-Here are pictures with and without alarm set :
-
-
-Original repo : [InfiniTime](https://github.com/InfiniTimeOrg/InfiniTime)
-
-- [Getting started with InfiniTime](doc/gettingStarted/gettingStarted-1.0.md)
-- [Updating the software](doc/gettingStarted/updating-software.md)
-- [About the firmware and bootloader](doc/gettingStarted/about-software.md)
-- [Available apps](doc/gettingStarted/Applications.md)
-- [Available watch faces](/doc/gettingStarted/Watchfaces.md)
-- [PineTimeStyle Watch face](https://pine64.org/documentation/PineTime/Watchfaces/PineTimeStyle)
-  - [Weather integration](https://pine64.org/documentation/PineTime/Software/InfiniTime_weather/)
-
-## Welcome to my InfiniTime fork ?!
-
-Branches :
-
-- main : shows this doc
-- alarm-status-on-infineat : shows the alarm status on infineat, can be enabled or disabled from the settigns menu that is updated accordingly :
-
-![Infineat settings](doc/ui/infineat_settings.png "Infineat settings")
-
-- my-custom-infinitime : branch were I put things that I want for myself, like a watchface with paw instead of shoe icon for steps counter :
-
-
 ## New to InfiniTime?
 
 - [Getting started with InfiniTime](doc/gettingStarted/gettingStarted-1.0.md)
@@ -120,4 +88,3 @@ Here are some people I would like to highlight:
 - [Atc1441](https://github.com/atc1441/): He works on an Arduino based firmware for the Pinetime and many other smartwatches based on similar hardware. He was of great help when I was implementing support for the BMA421 motion sensor and I²C driver.
 - [Koen](https://github.com/bosmoment): He’s working on a firmware based on RiotOS. He integrated similar libs as me: NimBLE, LittleVGL,… His help was invaluable too!
 - [Lup Yuen Lee](https://github.com/lupyuen): He is everywhere: he works on a Rust firmware, builds a MCUBoot based bootloader for the Pinetime, designs a Flutter based companion app for smartphones and writes a lot of articles about the Pinetime!
->>>>>>>>> Temporary merge branch 2

compile.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-rm -r build
-
-cmake  -DARM_NONE_EABI_TOOLCHAIN_PATH=/home/eve/Work/gcc-arm-none-eabi-10.3-2021.10 -DNRF5_SDK_PATH=/home/eve/Work/nRF5_SDK_17.1.0_ddde560 -DTARGET_DEVICE=PINETIME -DBUILD_DFU=1 -DBUILD_RESOURCES=1 -B build -DCMAKE_BUILD_TYPE=Release
-
-cp make_pine_mcu.sh build/
-

make_pine.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-#cp ./displayapp/apps/Apps.h ../src/displayapp/apps/Apps.h
-
-make -j4 pinetime-app
-

make_pine_mcu.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-#cp ./displayapp/apps/Apps.h ../src/displayapp/apps/Apps.h
-
-make clean -j4 pinetime-mcuboot-app
-

package-lock.json

@@ -0,0 +1,183 @@
+{
+  "name": "InfiniTime",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "dependencies": {
+        "lv_font_conv": "^1.5.2"
+      }
+    },
+    "node_modules/lv_font_conv": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/lv_font_conv/-/lv_font_conv-1.5.2.tgz",
+      "integrity": "sha512-0UapRSTkVP/pnB8Z4r2HDHx5p2dJx/xUG1+14u/WXo59mwuC7BahR+Bnx/66jKoDrG1wFQwn9ZzoyMxRHOD9bg==",
+      "bundleDependencies": [
+        "argparse",
+        "bit-buffer",
+        "debug",
+        "make-error",
+        "mkdirp",
+        "opentype.js",
+        "pngjs"
+      ],
+      "dependencies": {
+        "argparse": "^2.0.0",
+        "bit-buffer": "^0.2.5",
+        "debug": "^4.1.1",
+        "make-error": "^1.3.5",
+        "mkdirp": "^1.0.4",
+        "opentype.js": "^1.1.0",
+        "pngjs": "^6.0.0"
+      },
+      "bin": {
+        "lv_font_conv": "lv_font_conv.js"
+      }
+    },
+    "node_modules/lv_font_conv/node_modules/argparse": {
+      "version": "2.0.1",
+      "inBundle": true,
+      "license": "Python-2.0"
+    },
+    "node_modules/lv_font_conv/node_modules/bit-buffer": {
+      "version": "0.2.5",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/lv_font_conv/node_modules/debug": {
+      "version": "4.3.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/lv_font_conv/node_modules/make-error": {
+      "version": "1.3.6",
+      "inBundle": true,
+      "license": "ISC"
+    },
+    "node_modules/lv_font_conv/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "inBundle": true,
+      "license": "MIT",
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/lv_font_conv/node_modules/ms": {
+      "version": "2.1.2",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/lv_font_conv/node_modules/opentype.js": {
+      "version": "1.3.3",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "string.prototype.codepointat": "^0.2.1",
+        "tiny-inflate": "^1.0.3"
+      },
+      "bin": {
+        "ot": "bin/ot"
+      },
+      "engines": {
+        "node": ">= 8.0.0"
+      }
+    },
+    "node_modules/lv_font_conv/node_modules/pngjs": {
+      "version": "6.0.0",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.13.0"
+      }
+    },
+    "node_modules/lv_font_conv/node_modules/string.prototype.codepointat": {
+      "version": "0.2.1",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/lv_font_conv/node_modules/tiny-inflate": {
+      "version": "1.0.3",
+      "inBundle": true,
+      "license": "MIT"
+    }
+  },
+  "dependencies": {
+    "lv_font_conv": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/lv_font_conv/-/lv_font_conv-1.5.2.tgz",
+      "integrity": "sha512-0UapRSTkVP/pnB8Z4r2HDHx5p2dJx/xUG1+14u/WXo59mwuC7BahR+Bnx/66jKoDrG1wFQwn9ZzoyMxRHOD9bg==",
+      "requires": {
+        "argparse": "^2.0.0",
+        "bit-buffer": "^0.2.5",
+        "debug": "^4.1.1",
+        "make-error": "^1.3.5",
+        "mkdirp": "^1.0.4",
+        "opentype.js": "^1.1.0",
+        "pngjs": "^6.0.0"
+      },
+      "dependencies": {
+        "argparse": {
+          "version": "2.0.1",
+          "bundled": true
+        },
+        "bit-buffer": {
+          "version": "0.2.5",
+          "bundled": true
+        },
+        "debug": {
+          "version": "4.3.1",
+          "bundled": true,
+          "requires": {
+            "ms": "2.1.2"
+          }
+        },
+        "make-error": {
+          "version": "1.3.6",
+          "bundled": true
+        },
+        "mkdirp": {
+          "version": "1.0.4",
+          "bundled": true
+        },
+        "ms": {
+          "version": "2.1.2",
+          "bundled": true
+        },
+        "opentype.js": {
+          "version": "1.3.3",
+          "bundled": true,
+          "requires": {
+            "string.prototype.codepointat": "^0.2.1",
+            "tiny-inflate": "^1.0.3"
+          }
+        },
+        "pngjs": {
+          "version": "6.0.0",
+          "bundled": true
+        },
+        "string.prototype.codepointat": {
+          "version": "0.2.1",
+          "bundled": true
+        },
+        "tiny-inflate": {
+          "version": "1.0.3",
+          "bundled": true
+        }
+      }
+    }
+  }
+}

package.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "lv_font_conv": "^1.5.2"
+  }
+}

src/CMakeLists.txt

@@ -371,7 +371,7 @@ list(APPEND SOURCE_FILES
         displayapp/screens/StopWatch.cpp
         displayapp/screens/BatteryIcon.cpp
         displayapp/screens/BleIcon.cpp
-	displayapp/screens/AlarmIcon.cpp
+        displayapp/screens/AlarmIcon.cpp
         displayapp/screens/NotificationIcon.cpp
         displayapp/screens/SystemInfo.cpp
         displayapp/screens/Label.cpp

src/Version.h.in

@@ -19,4 +19,4 @@ namespace Pinetime {
       static constexpr const char* commitHash = "@PROJECT_GIT_COMMIT_HASH@";
       static constexpr const char* versionString = "@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@";
   };
-}
+}

src/components/settings/Settings.h

@@ -135,7 +135,6 @@ namespace Pinetime {
         return settings.watchFaceInfineat.showAlarmStatus;
       };
 
-
       void SetInfineatColorIndex(int index) {
         if (index != settings.watchFaceInfineat.colorIndex) {
           settings.watchFaceInfineat.colorIndex = index;

src/displayapp/InfiniTimeTheme.h

@@ -8,7 +8,6 @@ namespace Colors {
   static constexpr lv_color_t green = LV_COLOR_MAKE(0x0, 0xb0, 0x0);
   static constexpr lv_color_t blue = LV_COLOR_MAKE(0x0, 0x50, 0xff);
   static constexpr lv_color_t lightGray = LV_COLOR_MAKE(0xb0, 0xb0, 0xb0);
-  static constexpr lv_color_t gray = LV_COLOR_MAKE(0x50, 0x50, 0x50);
 
   static constexpr lv_color_t bg = LV_COLOR_MAKE(0x5d, 0x69, 0x7e);
   static constexpr lv_color_t bgAlt = LV_COLOR_MAKE(0x38, 0x38, 0x38);

src/displayapp/apps/Apps.h.in

@@ -23,7 +23,6 @@ namespace Pinetime {
       Twos,
       HeartRate,
       Navigation,
-      Calendar,
       StopWatch,
       Metronome,
       Motion,
@@ -52,7 +51,6 @@ namespace Pinetime {
       PineTimeStyle,
       Terminal,
       Infineat,
-      Meow,
       CasioStyleG7710,
     };
 

src/displayapp/screens/README.md

@@ -1,10 +0,0 @@
-# Add a new watchface :
-## Modify the following files with the names of your source files :
-
-- /src/displayapp/apps/Apps.h.in
-- /src/components/settings/Settings.h
-- /src/displayapp/UserApps.h
-- /src/displayapp/apps/CMakeLists.txt
-- CMakelists.txt
-
-

src/displayapp/screens/WatchFaceCasioStyleG7710.cpp

@@ -4,12 +4,10 @@
 #include <cstdio>
 #include "displayapp/screens/BatteryIcon.h"
 #include "displayapp/screens/BleIcon.h"
-#include "displayapp/screens/AlarmIcon.h"
 #include "displayapp/screens/NotificationIcon.h"
 #include "displayapp/screens/Symbols.h"
 #include "components/battery/BatteryController.h"
 #include "components/ble/BleController.h"
-#include "components/alarm/AlarmController.h"
 #include "components/ble/NotificationManager.h"
 #include "components/heartrate/HeartRateController.h"
 #include "components/motion/MotionController.h"
@@ -19,7 +17,6 @@ using namespace Pinetime::Applications::Screens;
 WatchFaceCasioStyleG7710::WatchFaceCasioStyleG7710(Controllers::DateTime& dateTimeController,
                                                    const Controllers::Battery& batteryController,
                                                    const Controllers::Ble& bleController,
-                                                   Controllers::AlarmController& alarmController,
                                                    Controllers::NotificationManager& notificatioManager,
                                                    Controllers::Settings& settingsController,
                                                    Controllers::HeartRateController& heartRateController,
@@ -30,7 +27,6 @@ WatchFaceCasioStyleG7710::WatchFaceCasioStyleG7710(Controllers::DateTime& dateTi
     dateTimeController {dateTimeController},
     batteryController {batteryController},
     bleController {bleController},
-    alarmController {alarmController},
     notificatioManager {notificatioManager},
     settingsController {settingsController},
     heartRateController {heartRateController},
@@ -172,23 +168,6 @@ WatchFaceCasioStyleG7710::WatchFaceCasioStyleG7710(Controllers::DateTime& dateTi
   lv_label_set_text_static(stepIcon, Symbols::shoe);
   lv_obj_align(stepIcon, stepValue, LV_ALIGN_OUT_LEFT_MID, -5, 0);
 
-  alarmIcon = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(alarmIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, color_text);
-  lv_label_set_text_static(alarmIcon, Symbols::notbell);
-  lv_obj_align(alarmIcon, lv_scr_act(), LV_ALIGN_IN_BOTTOM_LEFT, 5, -2);
-
-  labelAlarm = lv_label_create(lv_scr_act(), nullptr);
-  lv_obj_set_style_local_text_color(labelAlarm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, color_text);
-//  lv_obj_set_style_local_text_font(labelAlarm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, font_teko);
-  lv_obj_align(labelAlarm, alarmIcon, LV_ALIGN_OUT_RIGHT_MID, 3, 0);
-  lv_label_set_text_static(labelAlarm, "00:00");
-
-  labelTimeAmPmAlarm = lv_label_create(lv_scr_act(), nullptr);
-//  lv_obj_set_style_local_text_font(labelTimeAmPmAlarm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, font_teko);
-  lv_label_set_text_static(labelTimeAmPmAlarm, "");
-  lv_obj_set_style_local_text_color(labelTimeAmPmAlarm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, color_text);
-  lv_obj_align(labelTimeAmPmAlarm, labelAlarm, LV_ALIGN_OUT_RIGHT_MID, 3, 0);
-
   taskRefresh = lv_task_create(RefreshTaskCallback, LV_DISP_DEF_REFR_PERIOD, LV_TASK_PRIO_MID, this);
   Refresh();
 }
@@ -331,6 +310,8 @@ void WatchFaceCasioStyleG7710::Refresh() {
     lv_obj_realign(stepValue);
     lv_obj_realign(stepIcon);
   }
+}
+
 bool WatchFaceCasioStyleG7710::IsAvailable(Pinetime::Controllers::FS& filesystem) {
   lfs_file file = {};
 

src/displayapp/screens/WatchFaceInfineat.cpp

@@ -253,7 +253,7 @@ WatchFaceInfineat::WatchFaceInfineat(Controllers::DateTime& dateTimeController,
   lv_label_set_text_static(alarmIcon, Symbols::notbell);
   lv_obj_align(alarmIcon, labelAlarm, LV_ALIGN_OUT_LEFT_MID, -3, 0);
 
-  // don't show the icons just set if we don't show alarm status
+  // don't show the icons jsut set if we don't show alarm status
   if (!settingsController.GetInfineatShowAlarmStatus()) {
     lv_obj_set_hidden(labelAlarm, true);
     lv_obj_set_hidden(alarmIcon, true);
@@ -509,11 +509,11 @@ void WatchFaceInfineat::Refresh() {
   }
 
   if (settingsController.GetInfineatShowAlarmStatus()) {
-    isAlarmSet = alarmController.IsEnabled()==true;
+    alarmState = alarmController.State()==Pinetime::Controllers::AlarmController::AlarmState::Set;
     // sets the icon as bell or barred bell
-    lv_label_set_text_static(alarmIcon, AlarmIcon::GetIcon(isAlarmSet.Get()));
+    lv_label_set_text_static(alarmIcon, AlarmIcon::GetIcon(alarmState));
     //displays the time of the alarm or nothing if the alarm is not set
-    if (isAlarmSet.Get()) {
+    if (alarmState) {
       uint8_t alarmHours = alarmController.Hours();
       uint8_t alarmMinutes = alarmController.Minutes();
       //handles the am pm format.

src/displayapp/screens/WatchFaceInfineat.h

@@ -53,7 +53,7 @@ namespace Pinetime {
         Utility::DirtyValue<bool> isCharging {};
         Utility::DirtyValue<bool> bleState {};
         Utility::DirtyValue<bool> bleRadioEnabled {};
-        Utility::DirtyValue<bool> isAlarmSet{};
+        bool alarmState {};
         Utility::DirtyValue<std::chrono::time_point<std::chrono::system_clock, std::chrono::minutes>> currentDateTime {};
         Utility::DirtyValue<uint32_t> stepCount {};
         Utility::DirtyValue<bool> notificationState {};
@@ -102,6 +102,8 @@ namespace Pinetime {
         void SetBatteryLevel(uint8_t batteryPercent);
         void ToggleBatteryIndicatorColor(bool showSideCover);
 
+        void ToggleShowAlarmStatus(bool showAlarmStatus);
+
         lv_task_t* taskRefresh;
         lv_font_t* font_teko = nullptr;
         lv_font_t* font_bebas = nullptr;

src/displayapp/screens/addWatchface.md

@@ -1,11 +0,0 @@
-# Add a new watchface :
-## Modify the following files with the names of your source files :
-
-- /src/displayapp/apps/Apps.h.in
-- /src/components/settings/Settings.h
-- /src/displayapp/screens/settings/SettingWatchFace.h
-- /src/displayapp/UserApps.h
-- /src/displayapp/apps/CMakeLists.txt
-- CMakelists.txt
-
-

src/displayapp/screens/settings/SettingWatchFace.h

@@ -12,8 +12,6 @@
 #include "displayapp/screens/WatchFaceInfineat.h"
 #include "displayapp/screens/WatchFaceCasioStyleG7710.h"
 
-
-
 namespace Pinetime {
 
   namespace Applications {

src/libs/QCBOR

@@ -0,0 +1 @@
+Subproject commit 56b17bf9f74096774944bcac0829adcd887d391e

src/libs/lv_conf.h

@@ -589,7 +589,7 @@ typedef void* lv_obj_user_data_t;
 /*Calendar (dependencies: -)*/
 #define LV_USE_CALENDAR 1
 #if LV_USE_CALENDAR
-#define LV_CALENDAR_WEEK_STARTS_MONDAY    1
+#define LV_CALENDAR_WEEK_STARTS_MONDAY    0
 #endif
 
 /*Canvas (dependencies: lv_img)*/

src/resources/images.json

@@ -1,18 +1,11 @@
 {
-    "pine_small" : {
+   "pine_small" : {
       "sources": "images/pine_logo.png",
       "color_format": "CF_TRUE_COLOR_ALPHA",
       "output_format": "bin",
       "binary_format": "ARGB8565_RBSWAP",
       "target_path": "/images/"
    },
-   "cat_small" : {
-      "sources": "images/cat_clean.png",
-      "color_format": "CF_TRUE_COLOR_ALPHA",
-      "output_format": "bin",
-      "binary_format": "ARGB8565_RBSWAP",
-      "target_path": "/images/"
-   },
    "navigation0" : {
       "sources": "images/navigation0.png",
       "color_format": "CF_INDEXED_1_BIT",

todo.log

@@ -1,3 +0,0 @@
-replace alarm info by timer info when timer is ongoing
-add a shortcut for a 1min timer on the right
-