Merge branch 'main' into main

Author: metaphys

CMakeLists.txt

@@ -1,8 +1,9 @@
 cmake_minimum_required(VERSION 3.10)
 
 set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose Debug or Release")
+set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
 
-project(pinetime VERSION 1.15.0 LANGUAGES C CXX ASM)
+project(pinetime VERSION 1.16.0 LANGUAGES C CXX ASM)
 
 set(CMAKE_C_STANDARD 99)
 set(CMAKE_CXX_STANDARD 20)

doc/SimpleWeatherService.md

@@ -17,23 +17,25 @@ The host uses this characteristic to update the current weather information and
 
 This characteristics accepts a byte array with the following 2-Bytes header:
 
- - [0] Message Type : 
+ - [0] Message Type :
    - `0` : Current weather
    - `1` : Forecast
- - [1] Message Version : Version `0` is currently supported. Other versions might be added in future releases
+ - [1] Message Version :
+   - `0` : Currently supported
+   - `1` : Adds support for sunrise and sunset
 
-### Current Weather 
+### Current Weather
 
 The byte array must contain the following data:
 
  - [0] : Message type = `0`
- - [1] : Message version = `0`
+ - [1] : Message version = `1`
  - [2][3][4][5][6][7][8][9] : Timestamp (64 bits UNIX timestamp, number of seconds elapsed since 1 JAN 1970)  in local time (the same timezone as the one used to set the time)
  - [10, 11] : Current temperature (°C * 100)
  - [12, 13] : Minimum temperature (°C * 100)
  - [14, 15] : Maximum temperature (°C * 100)
  - [16]..[47] : location (string, unused characters should be set to `0`)
- - [48] : icon ID 
+ - [48] : icon ID
    - 0 = Sun, clear sky
    - 1 = Few clouds
    - 2 = Clouds
@@ -43,6 +45,13 @@ The byte array must contain the following data:
    - 6 = Thunderstorm
    - 7 = Snow
    - 8 = Mist, smog
+  - [49, 50] : Sunrise (number of minutes elapsed since midnight)
+    - `0` sun already up when day starts
+    - `-1` unknown
+    - `-2` no sunrise (e.g. polar night)
+  - [51, 52] : Sunset (number of minutes elapsed since midnight)
+    - `-1` unknown
+    - `-2` no sunset (e.g. polar day)
 
 ### Forecast
 

doc/buildWithDocker.md

@@ -87,3 +87,9 @@ Here's an example for `pinetime-app`:
 ```sh
 docker run --rm -it -v ${PWD}:/sources --user $(id -u):$(id -g) infinitime-build /opt/build.sh pinetime-app
 ```
+
+If you want to change the apps and/or watchfaces built in the project, you can pass `ENABLE_USERAPPS` and `ENABLE_WATCHFACES` as environment variables like so:
+
+```sh
+docker run --rm -it -v ${PWD}:/sources -e ENABLE_USERAPPS="Apps::Alarm,Apps::Timer,Apps::Steps,Apps::HeartRate,Apps::Music,Apps::Navigation" infinitime-build
+```

doc/code/Intro.md

@@ -7,7 +7,7 @@ This page is meant to guide you through the source code, so you can find the rel
 Infinitime is based on FreeRTOS, a real-time operating system.
 FreeRTOS provides several quality of life abstractions (for example easy software timers)
 and most importantly supports multiple tasks.
-If you want to read up on real-time operating systems, you can look [here](https://www.freertos.org/implementation/a00002.html) and [here](https://www.freertos.org/features.html).
+If you want to read up on real-time operating systems, you can look [here](https://www.freertos.org/Documentation/01-FreeRTOS-quick-start/01-Beginners-guide/01-RTOS-fundamentals) and [here](https://www.freertos.org/features.html).
 The main "process" creates at least one task and then starts the FreeRTOS task scheduler.
 This main "process" is the standard main() function inside [main.cpp](/src/main.cpp).
 The task scheduler is responsible for giving every task enough cpu time.

docker/build.sh

@@ -77,14 +77,19 @@ GetNrfSdk() {
 }
 
 CmakeGenerate() {
+  CMAKE_ARGS=()
+  [ -n "$ENABLE_USERAPPS" ]  && CMAKE_ARGS+=("-DENABLE_USERAPPS=$ENABLE_USERAPPS")
+  [ -n "$ENABLE_WATCHFACES" ] && CMAKE_ARGS+=("-DENABLE_WATCHFACES=$ENABLE_WATCHFACES")
+
   cmake -G "Unix Makefiles" \
     -S "$SOURCES_DIR" \
     -B "$BUILD_DIR" \
     -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
     -DARM_NONE_EABI_TOOLCHAIN_PATH="$TOOLS_DIR/$GCC_ARM_PATH" \
     -DNRF5_SDK_PATH="$TOOLS_DIR/$NRF_SDK_VER" \
     -DBUILD_DFU=1 \
-    -DBUILD_RESOURCES=1
+    -DBUILD_RESOURCES=1 \
+    ${CMAKE_ARGS[@]}
 }
 
 CmakeBuild() {

src/CMakeLists.txt

@@ -431,7 +431,6 @@ list(APPEND SOURCE_FILES
         displayapp/screens/WatchFaceCasioStyleG7710.cpp
         displayapp/screens/WatchFaceCasioStyleAE21W.cpp
         displayapp/screens/WatchFacePrideFlag.cpp
-        displayapp/screens/WatchFaceCasioStyleAE21W.cpp
 
         ##
 

src/components/ble/SimpleWeatherService.cpp

@@ -41,12 +41,48 @@ namespace {
     SimpleWeatherService::Location cityName;
     std::memcpy(cityName.data(), &dataBuffer[16], 32);
     cityName[32] = '\0';
+    int16_t sunrise = -1;
+    int16_t sunset = -1;
+    if (dataBuffer[1] > 0) {
+      int16_t bufferSunrise = ToInt16(&dataBuffer[49]);
+      int16_t bufferSunset = ToInt16(&dataBuffer[51]);
+
+      // Sunrise/sunset format
+
+      // Assume sun is down at minute 0 / midnight
+
+      // 0<=x<1440 sunrise happens this many minutes into the day
+      // (0 day starts with sun up)
+      // -1 unknown
+      // -2 sun not rising today
+
+      // 0<x<1440 sunset happens this many minutes into the day
+      // -1 unknown
+      // -2 sun not setting today
+
+      // Check if the weather data is well formed
+      // Disable boolean simplification suggestion, as simplifying it makes it unreadable
+      if (!( // NOLINT(readability-simplify-boolean-expr)
+             // Fail if either unknown
+            (bufferSunrise == -1 || bufferSunset == -1)
+            // Cannot be out of range
+            || (bufferSunrise < -2 || bufferSunrise > 1439 || bufferSunset < -2 || bufferSunset > 1439)
+            // Cannot have sunset without sunrise
+            || (bufferSunrise == -2 && bufferSunset != -2)
+            // Cannot have sunset before sunrise
+            || (bufferSunrise >= bufferSunset && bufferSunrise >= 0 && bufferSunset >= 0))) {
+        sunrise = bufferSunrise;
+        sunset = bufferSunset;
+      }
+    }
     return SimpleWeatherService::CurrentWeather(ToUInt64(&dataBuffer[2]),
                                                 SimpleWeatherService::Temperature(ToInt16(&dataBuffer[10])),
                                                 SimpleWeatherService::Temperature(ToInt16(&dataBuffer[12])),
                                                 SimpleWeatherService::Temperature(ToInt16(&dataBuffer[14])),
                                                 SimpleWeatherService::Icons {dataBuffer[16 + 32]},
-                                                std::move(cityName));
+                                                std::move(cityName),
+                                                sunrise,
+                                                sunset);
   }
 
   SimpleWeatherService::Forecast CreateForecast(const uint8_t* dataBuffer) {
@@ -94,7 +130,7 @@ int SimpleWeatherService::OnCommand(struct ble_gatt_access_ctxt* ctxt) {
 
   switch (GetMessageType(dataBuffer)) {
     case MessageType::CurrentWeather:
-      if (GetVersion(dataBuffer) == 0) {
+      if (GetVersion(dataBuffer) <= 1) {
         currentWeather = CreateCurrentWeather(dataBuffer);
         NRF_LOG_INFO("Current weather :\n\tTimestamp : %d\n\tTemperature:%d\n\tMin:%d\n\tMax:%d\n\tIcon:%d\n\tLocation:%s",
                      currentWeather->timestamp,
@@ -103,6 +139,9 @@ int SimpleWeatherService::OnCommand(struct ble_gatt_access_ctxt* ctxt) {
                      currentWeather->maxTemperature.PreciseCelsius(),
                      currentWeather->iconId,
                      currentWeather->location.data());
+        if (GetVersion(dataBuffer) == 1) {
+          NRF_LOG_INFO("Sunrise: %d\n\tSunset: %d", currentWeather->sunrise, currentWeather->sunset);
+        }
       }
       break;
     case MessageType::Forecast:
@@ -153,10 +192,36 @@ std::optional<SimpleWeatherService::Forecast> SimpleWeatherService::GetForecast(
   return {};
 }
 
+bool SimpleWeatherService::IsNight() const {
+  if (currentWeather && currentWeather->sunrise != -1 && currentWeather->sunset != -1) {
+    auto currentTime = dateTimeController.CurrentDateTime().time_since_epoch();
+
+    // Get timestamp for last midnight
+    auto midnight = std::chrono::floor<std::chrono::days>(currentTime);
+
+    // Calculate minutes since midnight
+    auto currentMinutes = std::chrono::duration_cast<std::chrono::minutes>(currentTime - midnight).count();
+
+    // Sun not rising today => night all hours
+    if (currentWeather->sunrise == -2) {
+      return true;
+    }
+    // Sun not setting today => check before sunrise
+    if (currentWeather->sunset == -2) {
+      return currentMinutes < currentWeather->sunrise;
+    }
+
+    // Before sunrise or after sunset
+    return currentMinutes < currentWeather->sunrise || currentMinutes >= currentWeather->sunset;
+  }
+
+  return false;
+}
+
 bool SimpleWeatherService::CurrentWeather::operator==(const SimpleWeatherService::CurrentWeather& other) const {
   return this->iconId == other.iconId && this->temperature == other.temperature && this->timestamp == other.timestamp &&
          this->maxTemperature == other.maxTemperature && this->minTemperature == other.maxTemperature &&
-         std::strcmp(this->location.data(), other.location.data()) == 0;
+         std::strcmp(this->location.data(), other.location.data()) == 0 && this->sunrise == other.sunrise && this->sunset == other.sunset;
 }
 
 bool SimpleWeatherService::Forecast::Day::operator==(const SimpleWeatherService::Forecast::Day& other) const {

src/components/ble/SimpleWeatherService.h

@@ -34,6 +34,8 @@
 #include "components/datetime/DateTimeController.h"
 #include <lvgl/lvgl.h>
 #include "displayapp/InfiniTimeTheme.h"
+#include "utility/Math.h"
+
 
 int WeatherCallback(uint16_t connHandle, uint16_t attrHandle, struct ble_gatt_access_ctxt* ctxt, void* arg);
 
@@ -77,11 +79,23 @@ namespace Pinetime {
         }
 
         [[nodiscard]] int16_t Celsius() const {
-          return (PreciseCelsius() + 50) / 100;
+          return Utility::RoundedDiv(PreciseCelsius(), static_cast<int16_t>(100));
         }
 
         [[nodiscard]] int16_t Fahrenheit() const {
-          return (PreciseFahrenheit() + 50) / 100;
+          return Utility::RoundedDiv(PreciseFahrenheit(), static_cast<int16_t>(100));
+        }
+
+        [[nodiscard]] lv_color_t Color() const {
+          int16_t celsius = Celsius();
+          if (celsius <= 0) { // freezing
+            return Colors::blue;
+          } else if (celsius <= 4) { // ice
+            return LV_COLOR_CYAN;
+          } else if (celsius >= 27) { // hot
+            return Colors::deepOrange;
+          }
+          return Colors::orange; // normal
         }
 
         [[nodiscard]] lv_color_t Color() const {
@@ -112,13 +126,17 @@ namespace Pinetime {
                        Temperature minTemperature,
                        Temperature maxTemperature,
                        Icons iconId,
-                       Location&& location)
+                       Location&& location,
+                       int16_t sunrise,
+                       int16_t sunset)
           : timestamp {timestamp},
             temperature {temperature},
             minTemperature {minTemperature},
             maxTemperature {maxTemperature},
             iconId {iconId},
-            location {std::move(location)} {
+            location {std::move(location)},
+            sunrise {sunrise},
+            sunset {sunset} {
         }
 
         uint64_t timestamp;
@@ -127,6 +145,8 @@ namespace Pinetime {
         Temperature maxTemperature;
         Icons iconId;
         Location location;
+        int16_t sunrise;
+        int16_t sunset;
 
         bool operator==(const CurrentWeather& other) const;
       };
@@ -151,6 +171,8 @@ namespace Pinetime {
       std::optional<CurrentWeather> Current() const;
       std::optional<Forecast> GetForecast() const;
 
+      [[nodiscard]] bool IsNight() const;
+
     private:
       // 00050000-78fc-48fe-8e23-433b3a1942d0
       static constexpr ble_uuid128_t BaseUuid() {

src/components/motor/MotorController.cpp

@@ -34,6 +34,10 @@ void MotorController::StopRinging() {
   nrf_gpio_pin_set(PinMap::Motor);
 }
 
+bool MotorController::IsRinging() {
+  return (xTimerIsTimerActive(longVib) == pdTRUE);
+}
+
 void MotorController::StopMotor(TimerHandle_t /*xTimer*/) {
   nrf_gpio_pin_set(PinMap::Motor);
 }

src/components/motor/MotorController.h

@@ -15,6 +15,7 @@ namespace Pinetime {
       void RunForDuration(uint8_t motorDuration);
       void StartRinging();
       void StopRinging();
+      bool IsRinging();
 
     private:
       static void Ring(TimerHandle_t xTimer);