Merge branch 'ghoelian' into casio-weather

Author: Ghoelian

.github/workflows/main.yml

@@ -3,12 +3,12 @@ name: CI
 # Run this workflow whenever the build may be affected
 on:
   push:
-    branches: [ main ]
+    branches: [ main, ghoelian ]
     paths-ignore:
       - 'doc/**'
       - '**.md'
   pull_request:
-    branches: [ main ]
+    branches: [ main, ghoelian ]
     paths-ignore:
       - 'doc/**'
       - '**.md'

build.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+mkdir -p build
+cd build
+
+echo "Configuring build..."
+cmake -DARM_NONE_EABI_TOOLCHAIN_PATH="/workspaces/infinitime/gcc-arm" -DNRF5_SDK_PATH="/workspaces/infinitime/nRF5_SDK" -DCMAKE_BUILD_TYPE="Release" -DBUILD_DFU=1 -DBUILD_RESOURCES=1 -DTARGET_DEVICE="PINETIME" ..
+echo "Finished configuring build"
+
+echo "Building..."
+make -j4 pinetime-mcuboot-app
+echo "Finished building"

package-lock.json

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

package.json

@@ -418,6 +418,8 @@ list(APPEND SOURCE_FILES
         displayapp/screens/settings/SettingChimes.cpp
         displayapp/screens/settings/SettingShakeThreshold.cpp
         displayapp/screens/settings/SettingBluetooth.cpp
+        displayapp/screens/settings/SettingNotifVibration.cpp
+        displayapp/screens/settings/SettingChimeVibration.cpp
 
         ## Watch faces
         displayapp/screens/WatchFaceAnalog.cpp

src/CMakeLists.txt

@@ -34,6 +34,7 @@ namespace Pinetime {
         Orange,
         Pink
       };
+      enum class VibrationStrength : uint8_t { Weak = 15, Normal = 35, Strong = 75 };
       enum class PTSGaugeStyle : uint8_t { Full, Half, Numeric };
       enum class PTSWeather : uint8_t { On, Off };
 
@@ -326,6 +327,28 @@ namespace Pinetime {
         return bleRadioEnabled;
       };
 
+      void SetNotifVibration(VibrationStrength strength) {
+        if (strength != settings.notifVibration) {
+          settingsChanged = true;
+        }
+        settings.notifVibration = strength;
+      };
+
+      VibrationStrength GetNotifVibration() const {
+        return settings.notifVibration;
+      }
+
+      void SetChimeVibration(VibrationStrength strength) {
+        if (strength != settings.chimeVibration) {
+          settingsChanged = true;
+        }
+        settings.chimeVibration = strength;
+      };
+
+      VibrationStrength GetChimeVibration() const {
+        return settings.chimeVibration;
+      }
+
     private:
       Pinetime::Controllers::FS& fs;
 
@@ -355,6 +378,9 @@ namespace Pinetime {
         uint16_t shakeWakeThreshold = 150;
 
         Controllers::BrightnessController::Levels brightLevel = Controllers::BrightnessController::Levels::Medium;
+
+        VibrationStrength notifVibration = VibrationStrength::Normal;
+        VibrationStrength chimeVibration = VibrationStrength::Normal;
       };
 
       SettingsData settings;

src/components/settings/Settings.h

@@ -49,6 +49,8 @@
 #include "displayapp/screens/settings/SettingChimes.h"
 #include "displayapp/screens/settings/SettingShakeThreshold.h"
 #include "displayapp/screens/settings/SettingBluetooth.h"
+#include "displayapp/screens/settings/SettingNotifVibration.h"
+#include "displayapp/screens/settings/SettingChimeVibration.h"
 
 #include "libs/lv_conf.h"
 #include "UserApps.h"
@@ -372,7 +374,7 @@ void DisplayApp::Refresh() {
         } else {
           LoadNewScreen(Apps::Timer, DisplayApp::FullRefreshDirections::Up);
         }
-        motorController.RunForDuration(35);
+        motorController.RunForDuration(static_cast<uint8_t>(settingsController.GetNotifVibration()));
         break;
       case Messages::AlarmTriggered:
         if (currentApp == Apps::Alarm) {
@@ -384,7 +386,7 @@ void DisplayApp::Refresh() {
         break;
       case Messages::ShowPairingKey:
         LoadNewScreen(Apps::PassKey, DisplayApp::FullRefreshDirections::Up);
-        motorController.RunForDuration(35);
+        motorController.RunForDuration(static_cast<uint8_t>(settingsController.GetNotifVibration()));
         break;
       case Messages::TouchEvent: {
         if (state != States::Running) {
@@ -473,7 +475,7 @@ void DisplayApp::Refresh() {
         break;
       case Messages::Chime:
         LoadNewScreen(Apps::Clock, DisplayApp::FullRefreshDirections::None);
-        motorController.RunForDuration(35);
+        motorController.RunForDuration(static_cast<uint8_t>(settingsController.GetChimeVibration()));
         break;
       case Messages::OnChargingEvent:
         motorController.RunForDuration(15);
@@ -562,6 +564,7 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
                                                                notificationManager,
                                                                systemTask->nimble().alertService(),
                                                                motorController,
+                                                               settingsController,
                                                                *systemTask,
                                                                Screens::Notifications::Modes::Normal);
       break;
@@ -570,6 +573,7 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
                                                                notificationManager,
                                                                systemTask->nimble().alertService(),
                                                                motorController,
+                                                               settingsController,
                                                                *systemTask,
                                                                Screens::Notifications::Modes::Preview);
       break;
@@ -621,6 +625,12 @@ void DisplayApp::LoadScreen(Apps app, DisplayApp::FullRefreshDirections directio
     case Apps::SettingBluetooth:
       currentScreen = std::make_unique<Screens::SettingBluetooth>(this, settingsController);
       break;
+    case Apps::SettingNotifVibration:
+      currentScreen = std::make_unique<Screens::SettingNotifVibration>(settingsController, motorController);
+      break;
+    case Apps::SettingChimeVibration:
+      currentScreen = std::make_unique<Screens::SettingChimeVibration>(settingsController, motorController);
+      break;
     case Apps::BatteryInfo:
       currentScreen = std::make_unique<Screens::BatteryInfo>(batteryController);
       break;

src/displayapp/DisplayApp.cpp

@@ -42,6 +42,8 @@ namespace Pinetime {
       SettingChimes,
       SettingShakeThreshold,
       SettingBluetooth,
+      SettingNotifVibration,
+      SettingChimeVibration,
       Error
     };
 
@@ -50,6 +52,7 @@ namespace Pinetime {
       Analog,
       PineTimeStyle,
       Terminal,
+      Json,
       Infineat,
       CasioStyleG7710
     };

src/displayapp/apps/Apps.h.in

@@ -1,5 +1,5 @@
 set(FONTS jetbrains_mono_42 jetbrains_mono_76 jetbrains_mono_bold_20
-   jetbrains_mono_extrabold_compressed lv_font_sys_48
+   jetbrains_mono_extrabold_compressed jetbrains_mono_16 lv_font_sys_48
    open_sans_light fontawesome_weathericons)
 find_program(LV_FONT_CONV "lv_font_conv" NO_CACHE REQUIRED
    HINTS "${CMAKE_SOURCE_DIR}/node_modules/.bin")

src/displayapp/fonts/CMakeLists.txt

@@ -14,6 +14,16 @@
       "size": 20,
       "patches": ["jetbrains_mono_bold_20.c_zero.patch", "jetbrains_mono_bold_20.c_M.patch"]
    },
+   "jetbrains_mono_16": {
+      "sources": [
+         {
+            "file": "JetBrainsMono-Regular.ttf",
+            "range": "0x20-0x7e, 0x410-0x44f, 0xB0"
+         }
+      ],
+      "bpp": 1,
+      "size": 16
+   },
    "jetbrains_mono_42": {
       "sources": [
          {

src/displayapp/fonts/fonts.json

@@ -14,6 +14,7 @@ Notifications::Notifications(DisplayApp* app,
                              Pinetime::Controllers::NotificationManager& notificationManager,
                              Pinetime::Controllers::AlertNotificationService& alertNotificationService,
                              Pinetime::Controllers::MotorController& motorController,
+                             Pinetime::Controllers::Settings& settingsController,
                              System::SystemTask& systemTask,
                              Modes mode)
   : app {app},
@@ -44,7 +45,7 @@ Notifications::Notifications(DisplayApp* app,
     if (notification.category == Controllers::NotificationManager::Categories::IncomingCall) {
       motorController.StartRinging();
     } else {
-      motorController.RunForDuration(35);
+      motorController.RunForDuration(static_cast<uint8_t>(settingsController.GetNotifVibration()));
     }
 
     timeoutLine = lv_line_create(lv_scr_act(), nullptr);

src/displayapp/screens/Notifications.cpp

@@ -25,6 +25,7 @@ namespace Pinetime {
                                Pinetime::Controllers::NotificationManager& notificationManager,
                                Pinetime::Controllers::AlertNotificationService& alertNotificationService,
                                Pinetime::Controllers::MotorController& motorController,
+                               Pinetime::Controllers::Settings& settingsController,
                                System::SystemTask& systemTask,
                                Modes mode);
         ~Notifications() override;