Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 3611944

Browse files
authoredFeb 12, 2025··
Merge branch 'main' into vibration-settings-2
2 parents 1ba9525 + 993118a commit 3611944

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed
 

‎.gitattributes

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# Set the default behavior, in case people don't have core.autocrlf set.
2-
* text=auto
2+
# Prevent build errors on non lf systems (like Windows), we need files with lf as newlines.
3+
* text=auto eol=lf
34

45
# Explicitly declare text files you want to always be normalized and converted
5-
# to native line endings on checkout.
6+
# to lf line endings on checkout.
67
*.c text
78
*.cpp text
89
*.h text

‎.github/workflows/main.yml

+6
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ jobs:
2222
text_size: ${{ steps.output-sizes.outputs.text_size }}
2323
data_size: ${{ steps.output-sizes.outputs.data_size }}
2424
bss_size: ${{ steps.output-sizes.outputs.bss_size }}
25+
firmware_artifact: ${{ steps.upload-firmware.outputs.artifact-id }}
26+
resources_artifact: ${{ steps.upload-resources.outputs.artifact-id }}
2527
env:
2628
# InfiniTime sources are downloaded to the current directory.
2729
# Override SOURCES_DIR in build.sh
@@ -63,11 +65,13 @@ jobs:
6365
path: ./build/output/pinetime-mcuboot-app-image-*.bin
6466
- name: Upload standalone ELF artifacts
6567
uses: actions/upload-artifact@v4
68+
id: upload-firmware
6669
with:
6770
name: InfiniTime image ${{ env.REF_NAME }}
6871
path: ./build/output/src/pinetime-app-*.out
6972
- name: Upload resources artifacts
7073
uses: actions/upload-artifact@v4
74+
id: upload-resources
7175
with:
7276
name: InfiniTime resources ${{ env.REF_NAME }}
7377
path: ./build/output/infinitime-resources-*.zip
@@ -205,6 +209,8 @@ jobs:
205209
| text | ${{ needs.build-firmware.outputs.text_size }}B | ${{ steps.output-sizes-diff.outputs.text_diff }}B |
206210
| data | ${{ needs.build-firmware.outputs.data_size }}B | ${{ steps.output-sizes-diff.outputs.data_diff }}B |
207211
| bss | ${{ needs.build-firmware.outputs.bss_size }}B | ${{ steps.output-sizes-diff.outputs.bss_diff }}B |
212+
213+
[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 }})
208214
EOF
209215
210216
- name: Upload comment

‎src/displayapp/screens/Notifications.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,8 @@ namespace {
247247

248248
Notifications::NotificationItem::NotificationItem(Pinetime::Controllers::AlertNotificationService& alertNotificationService,
249249
Pinetime::Controllers::MotorController& motorController)
250-
: NotificationItem("Notification",
251-
"No notification to display",
250+
: NotificationItem("Notifications",
251+
"No notifications to display",
252252
0,
253253
Controllers::NotificationManager::Categories::Unknown,
254254
0,

0 commit comments

Comments
 (0)
Please sign in to comment.