Merge branch 'main' into casio-weather

Author: Ghoelian

.gitattributes

@@ -1,8 +1,9 @@
 # Set the default behavior, in case people don't have core.autocrlf set.
-* text=auto
+# Prevent build errors on non lf systems (like Windows), we need files with lf as newlines.
+* text=auto eol=lf
 
 # Explicitly declare text files you want to always be normalized and converted
-# to native line endings on checkout.
+# to lf line endings on checkout.
 *.c text
 *.cpp text
 *.h text

.github/workflows/main.yml

@@ -22,6 +22,8 @@ jobs:
       text_size: ${{ steps.output-sizes.outputs.text_size }}
       data_size: ${{ steps.output-sizes.outputs.data_size }}
       bss_size: ${{ steps.output-sizes.outputs.bss_size }}
+      firmware_artifact: ${{ steps.upload-firmware.outputs.artifact-id }}
+      resources_artifact: ${{ steps.upload-resources.outputs.artifact-id }}
     env:
       # InfiniTime sources are downloaded to the current directory.
       # Override SOURCES_DIR in build.sh
@@ -63,11 +65,13 @@ jobs:
           path: ./build/output/pinetime-mcuboot-app-image-*.bin
       - name: Upload standalone ELF artifacts
         uses: actions/upload-artifact@v4
+        id: upload-firmware
         with:
           name: InfiniTime image ${{ env.REF_NAME }}
           path: ./build/output/src/pinetime-app-*.out
       - name: Upload resources artifacts
         uses: actions/upload-artifact@v4
+        id: upload-resources
         with:
           name: InfiniTime resources ${{ env.REF_NAME }}
           path: ./build/output/infinitime-resources-*.zip
@@ -205,6 +209,8 @@ jobs:
         | text    | ${{ needs.build-firmware.outputs.text_size }}B | ${{ steps.output-sizes-diff.outputs.text_diff }}B |
         | data    | ${{ needs.build-firmware.outputs.data_size }}B | ${{ steps.output-sizes-diff.outputs.data_diff }}B |
         | bss     | ${{ needs.build-firmware.outputs.bss_size }}B  | ${{ steps.output-sizes-diff.outputs.bss_diff }}B  |
+
+        [Run in InfiniEmu](https://infiniemu.pipe01.net/?firmware=artifact://${{ github.repository }}/${{ needs.build-firmware.outputs.firmware_artifact }}&resources=artifact://${{ github.repository }}/${{ needs.build-firmware.outputs.resources_artifact }})
         EOF
 
     - name: Upload comment

src/displayapp/screens/Notifications.cpp

@@ -246,8 +246,8 @@ namespace {
 
 Notifications::NotificationItem::NotificationItem(Pinetime::Controllers::AlertNotificationService& alertNotificationService,
                                                   Pinetime::Controllers::MotorController& motorController)
-  : NotificationItem("Notification",
-                     "No notification to display",
+  : NotificationItem("Notifications",
+                     "No notifications to display",
                      0,
                      Controllers::NotificationManager::Categories::Unknown,
                      0,

src/displayapp/screens/WatchFaceInfineat.cpp

@@ -434,12 +434,15 @@ void WatchFaceInfineat::Refresh() {
 
   batteryPercentRemaining = batteryController.PercentRemaining();
   isCharging = batteryController.IsCharging();
-  if (batteryController.IsCharging()) { // Charging battery animation
-    chargingBatteryPercent += 1;
+  // Charging battery animation
+  if (batteryController.IsCharging() && (xTaskGetTickCount() - chargingAnimationTick > pdMS_TO_TICKS(150))) {
+    // Dividing 100 by the height gives the battery percentage required to shift the animation by 1 pixel
+    chargingBatteryPercent += 100 / lv_obj_get_height(logoPine);
     if (chargingBatteryPercent > 100) {
       chargingBatteryPercent = batteryPercentRemaining.Get();
     }
     SetBatteryLevel(chargingBatteryPercent);
+    chargingAnimationTick = xTaskGetTickCount();
   } else if (isCharging.IsUpdated() || batteryPercentRemaining.IsUpdated()) {
     chargingBatteryPercent = batteryPercentRemaining.Get();
     SetBatteryLevel(chargingBatteryPercent);

src/displayapp/screens/WatchFaceInfineat.h

@@ -47,6 +47,7 @@ namespace Pinetime {
       private:
         uint32_t savedTick = 0;
         uint8_t chargingBatteryPercent = 101; // not a mistake ;)
+        TickType_t chargingAnimationTick = 0;
 
         Utility::DirtyValue<uint8_t> batteryPercentRemaining {};
         Utility::DirtyValue<bool> isCharging {};