From 2a762f62ad4f8e37baca906c9d5b6660d3549457 Mon Sep 17 00:00:00 2001 From: Eve C Date: Wed, 10 Jul 2024 11:48:09 +0200 Subject: [PATCH] On branch my-custom-infinitime modified: package-lock.json : ??? modified: package.json : ??? modified: src/displayapp/screens/AlarmIcon.cpp : put bell / not bell in this file to keep infineat as in the PR I submit modified: src/displayapp/screens/WatchFaceMeow.cpp : don't refer to alarmIcon.cpp to change the icon, instead do it in this file directly to have different icons modified: src/libs/QCBOR : reverted to match original repo's version (git submodule status : compare commit id in this repo and a freshly cloned repo) modified: src/libs/arduinoFFT : reverted modified: src/libs/littlefs : reverted --- package-lock.json | 30 ++++++++++++------------ package.json | 2 +- src/displayapp/screens/AlarmIcon.cpp | 4 ++-- src/displayapp/screens/WatchFaceMeow.cpp | 8 +++++-- src/libs/QCBOR | 2 +- src/libs/arduinoFFT | 2 +- src/libs/littlefs | 2 +- 7 files changed, 27 insertions(+), 23 deletions(-) diff --git a/package-lock.json b/package-lock.json index b8320c49..74bb2b90 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,13 +5,13 @@ "packages": { "": { "dependencies": { - "lv_font_conv": "^1.5.2" + "lv_font_conv": "^1.5.3" } }, "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==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/lv_font_conv/-/lv_font_conv-1.5.3.tgz", + "integrity": "sha512-0xJQThBOw2iptFccSXrKDIUTQAwr/2zhKjCI1lATIRgZo8uvYRTmenKafW9yTw6G0y5AyW00tqGpUtYuTuBIbQ==", "bundleDependencies": [ "argparse", "bit-buffer", @@ -24,10 +24,10 @@ "dependencies": { "argparse": "^2.0.0", "bit-buffer": "^0.2.5", - "debug": "^4.1.1", + "debug": "^4.3.3", "make-error": "^1.3.5", "mkdirp": "^1.0.4", - "opentype.js": "^1.1.0", + "opentype.js": "^1.3.4", "pngjs": "^6.0.0" }, "bin": { @@ -45,7 +45,7 @@ "license": "MIT" }, "node_modules/lv_font_conv/node_modules/debug": { - "version": "4.3.1", + "version": "4.3.4", "inBundle": true, "license": "MIT", "dependencies": { @@ -82,7 +82,7 @@ "license": "MIT" }, "node_modules/lv_font_conv/node_modules/opentype.js": { - "version": "1.3.3", + "version": "1.3.4", "inBundle": true, "license": "MIT", "dependencies": { @@ -117,16 +117,16 @@ }, "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==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/lv_font_conv/-/lv_font_conv-1.5.3.tgz", + "integrity": "sha512-0xJQThBOw2iptFccSXrKDIUTQAwr/2zhKjCI1lATIRgZo8uvYRTmenKafW9yTw6G0y5AyW00tqGpUtYuTuBIbQ==", "requires": { "argparse": "^2.0.0", "bit-buffer": "^0.2.5", - "debug": "^4.1.1", + "debug": "^4.3.3", "make-error": "^1.3.5", "mkdirp": "^1.0.4", - "opentype.js": "^1.1.0", + "opentype.js": "^1.3.4", "pngjs": "^6.0.0" }, "dependencies": { @@ -139,7 +139,7 @@ "bundled": true }, "debug": { - "version": "4.3.1", + "version": "4.3.4", "bundled": true, "requires": { "ms": "2.1.2" @@ -158,7 +158,7 @@ "bundled": true }, "opentype.js": { - "version": "1.3.3", + "version": "1.3.4", "bundled": true, "requires": { "string.prototype.codepointat": "^0.2.1", diff --git a/package.json b/package.json index d339766c..6577fac5 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { "dependencies": { - "lv_font_conv": "^1.5.2" + "lv_font_conv": "^1.5.3" } } diff --git a/src/displayapp/screens/AlarmIcon.cpp b/src/displayapp/screens/AlarmIcon.cpp index 77018dea..b41c4967 100644 --- a/src/displayapp/screens/AlarmIcon.cpp +++ b/src/displayapp/screens/AlarmIcon.cpp @@ -4,8 +4,8 @@ using namespace Pinetime::Applications::Screens; const char* AlarmIcon::GetIcon(bool isSet) { if (isSet) { - return Symbols::bird; + return Symbols::bell; } - return Symbols::zzz; + return Symbols::notbell; } diff --git a/src/displayapp/screens/WatchFaceMeow.cpp b/src/displayapp/screens/WatchFaceMeow.cpp index 25891c22..5097988b 100644 --- a/src/displayapp/screens/WatchFaceMeow.cpp +++ b/src/displayapp/screens/WatchFaceMeow.cpp @@ -16,7 +16,7 @@ #include #include "displayapp/screens/Symbols.h" #include "displayapp/screens/BleIcon.h" -#include "displayapp/screens/AlarmIcon.h" +//#include "displayapp/screens/AlarmIcon.h" #include "components/settings/Settings.h" #include "components/battery/BatteryController.h" #include "components/ble/BleController.h" @@ -542,7 +542,11 @@ void WatchFaceMeow::Refresh() { if (settingsController.GetInfineatShowAlarmStatus()) { alarmState = alarmController.State()==Pinetime::Controllers::AlarmController::AlarmState::Set; // sets the icon as bird or bed - lv_label_set_text_static(alarmIcon, AlarmIcon::GetIcon(alarmState)); + const char* alarmSymbol = Symbols::zzz; + if(alarmState) { + alarmSymbol = Symbols::bird; + } + lv_label_set_text_static(alarmIcon, alarmSymbol); //displays the time of the alarm or nothing if the alarm is not set if (alarmState) { uint8_t alarmHours = alarmController.Hours(); diff --git a/src/libs/QCBOR b/src/libs/QCBOR index 5d83b9b4..56b17bf9 160000 --- a/src/libs/QCBOR +++ b/src/libs/QCBOR @@ -1 +1 @@ -Subproject commit 5d83b9b47547b322bb50174fcc6afb74d8b4ae09 +Subproject commit 56b17bf9f74096774944bcac0829adcd887d391e diff --git a/src/libs/arduinoFFT b/src/libs/arduinoFFT index 0da88512..419d7b04 160000 --- a/src/libs/arduinoFFT +++ b/src/libs/arduinoFFT @@ -1 +1 @@ -Subproject commit 0da88512f90b0c8c6c5d50127045ee4f745e343b +Subproject commit 419d7b044e56b87de8efbcf76f09c04759628fb4 diff --git a/src/libs/littlefs b/src/libs/littlefs index d01280e6..ead50807 160000 --- a/src/libs/littlefs +++ b/src/libs/littlefs @@ -1 +1 @@ -Subproject commit d01280e64934a09ba16cac60cf9d3a37e228bb66 +Subproject commit ead50807f1ca3fdf2da00b77a0ce02651ded2d13