Merge branch 'main' into pawn

Author: pipe01

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
 

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

@@ -113,13 +113,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;
@@ -128,6 +132,8 @@ namespace Pinetime {
         Temperature maxTemperature;
         Icons iconId;
         Location location;
+        int16_t sunrise;
+        int16_t sunset;
 
         bool operator==(const CurrentWeather& other) const;
       };
@@ -152,6 +158,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/displayapp/InfiniTimeTheme.h

@@ -8,6 +8,7 @@ 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/fonts/fonts.json

@@ -68,7 +68,7 @@
       "sources": [
          {
             "file": "FontAwesome5-Solid+Brands+Regular.woff",
-            "range": "0xf185, 0xf6c4, 0xf743, 0xf740, 0xf75f, 0xf0c2, 0xf05e, 0xf73b, 0xf0e7, 0xf2dc"
+            "range": "0xf185, 0xf186, 0xf6c3, 0xf6c4, 0xf73c, 0xf743, 0xf740, 0xf75f, 0xf0c2, 0xf05e, 0xf73b, 0xf0e7, 0xf2dc"
          }
       ],
       "bpp": 1,

src/displayapp/screens/BatteryIcon.cpp

@@ -1,8 +1,10 @@
-#include "displayapp/screens/BatteryIcon.h"
 #include <cstdint>
+#include <cmath>
+#include "displayapp/screens/BatteryIcon.h"
 #include "displayapp/screens/Symbols.h"
 #include "displayapp/icons/battery/batteryicon.c"
 #include "displayapp/InfiniTimeTheme.h"
+#include <lvgl/src/lv_misc/lv_color.h>
 
 using namespace Pinetime::Applications::Screens;
 
@@ -51,3 +53,14 @@ const char* BatteryIcon::GetPlugIcon(bool isCharging) {
   else
     return "";
 }
+
+lv_color_t BatteryIcon::ColorFromPercentage(int batteryPercent) {
+  // HSV color model has red at 0° and green at 120°.
+  // We lock saturation and brightness at 100% and traverse the cylinder
+  // between red and green, thus avoiding the darker RGB on medium battery
+  // charges and giving us a much nicer color range.
+  const float normalizedPercent = batteryPercent / 100.0f;
+  // Follow -e^{-4x} + 1 curve: begins going yellow around 25%, yellow around 15%, red around 5%
+  const uint8_t hue = (-std::exp(-4.0f * normalizedPercent) + 1.0f) * 120.0f;
+  return lv_color_hsv_to_rgb(hue, 100, 100);
+}

src/displayapp/screens/BatteryIcon.h

@@ -16,6 +16,7 @@ namespace Pinetime {
 
         static const char* GetUnknownIcon();
         static const char* GetPlugIcon(bool isCharging);
+        static lv_color_t ColorFromPercentage(int batteryPercent);
 
       private:
         lv_obj_t* batteryImg;

src/displayapp/screens/Symbols.h

@@ -45,8 +45,11 @@ namespace Pinetime {
 
         // fontawesome_weathericons.c
         // static constexpr const char* sun = "\xEF\x86\x85";
+        static constexpr const char* moon = "\xEF\x86\x86"; // 0xf186
         static constexpr const char* cloudSun = "\xEF\x9B\x84";
+        static constexpr const char* cloudMoon = "\xEF\x9B\x83"; // 0xf6c3
         static constexpr const char* cloudSunRain = "\xEF\x9D\x83";
+        static constexpr const char* cloudMoonRain = "\xEF\x9C\xBC"; // 0xf73c
         static constexpr const char* cloudShowersHeavy = "\xEF\x9D\x80";
         static constexpr const char* smog = "\xEF\x9D\x9F";
         static constexpr const char* cloud = "\xEF\x83\x82";

src/displayapp/screens/WatchFacePineTimeStyle.cpp

@@ -548,7 +548,7 @@ void WatchFacePineTimeStyle::Refresh() {
         temp = optCurrentWeather->temperature.Fahrenheit();
       }
       lv_label_set_text_fmt(temperature, "%d°", temp);
-      lv_label_set_text(weatherIcon, Symbols::GetSymbol(optCurrentWeather->iconId));
+      lv_label_set_text(weatherIcon, Symbols::GetSymbol(optCurrentWeather->iconId, weatherService.IsNight()));
     } else {
       lv_label_set_text(temperature, "--");
       lv_label_set_text(weatherIcon, Symbols::ban);