Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ble enhancements#124 #172

Merged
merged 1 commit into from
Dec 5, 2023
Merged

Ble enhancements#124 #172

merged 1 commit into from
Dec 5, 2023

Conversation

Kampi
Copy link
Collaborator

@Kampi Kampi commented Nov 30, 2023

No description provided.

@Kampi Kampi assigned Kampi and jakkra and unassigned Kampi Nov 30, 2023
@Kampi Kampi added enhancement New feature or request GUI LVGL/UI Related BLE Bluetooth related labels Nov 30, 2023
@Kampi Kampi linked an issue Nov 30, 2023 that may be closed by this pull request
BLE enhancements #124
Closed
24 tasks
jakkra
jakkra reviewed Nov 30, 2023
View reviewed changes
Copy link
Owner

@jakkra jakkra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Fix what you think makes sense.

app/src/applications/notification/ui_export/screens/notification_ui.c Outdated Show resolved Hide resolved
app/src/ble/ble_comm.c Show resolved Hide resolved
app/src/main.c Outdated Show resolved Hide resolved
app/src/managers/zsw_notification_manager.c Outdated Show resolved Hide resolved
app/src/managers/zsw_notification_manager.c Outdated Show resolved Hide resolved
app/src/managers/zsw_notification_manager.c Outdated Show resolved Hide resolved
@Kampi Kampi force-pushed the BLE_enhancements#124 branch 5 times, most recently from d8e3d38 to 492b55b Compare December 5, 2023 19:27
@Kampi
Notification rework
5625627 
commit d8e3d38
Author: Daniel Kampert <DanielKampert@kampis-elektroecke.de>
Date:   Tue Dec 5 09:22:26 2023 +0100

    - Fix wrong include in 'trivia_app.c'
    - Add lost code for 'trivia_app'
    - Add lost code for time zone settings

commit 1e348b2
Merge: 6024526 4475a74
Author: Daniel Kampert <DanielKampert@kampis-elektroecke.de>
Date:   Tue Dec 5 09:09:37 2023 +0100

    Merge branch 'main' into BLE_enhancements#124

commit 6024526
Author: Daniel Kampert <DanielKampert@kampis-elektroecke.de>
Date:   Thu Nov 30 21:47:59 2023 +0100

    - Fixes from PR

commit a6bbcd9
Merge: 67abc93 ced8bfe
Author: Daniel Kampert <DanielKampert@kampis-elektroecke.de>
Date:   Sun Nov 26 23:06:25 2023 +0100

    Merge branch 'main' of github.com:jakkra/ZSWatch into BLE_enhancements#124

commit 67abc93
Author: Daniel Kampert <DanielKampert@kampis-elektroecke.de>
Date:   Sun Nov 26 22:08:40 2023 +0100

    - Update documentation

commit afbcdab
Merge: a57561d 8fc270c
Author: Daniel Kampert <DanielKampert@kampis-elektroecke.de>
Date:   Sun Nov 26 19:12:02 2023 +0100

    Merge branch 'main' of github.com:jakkra/ZSWatch into BLE_enhancements#124

commit a57561d
Author: Daniel Kampert <DanielKampert@kampis-elektroecke.de>
Date:   Sat Nov 25 23:56:54 2023 +0100

    Notifications app:
    - Add button to clear all notifications
    - Replace text area with label to prevent a focus on the body
    - Fix a bug where the last notification out of many can not be removed when the removal starts not at the bottom
    - Add "Now" string for notifications with an age of less than 1 minute instead of showing the seconds
    - Add notification for WhatsApp

    Notification manager:
    - Add notification remove channel for ZBUS

    Signed-off-by: Daniel Kampert <DanielKampert@kampis-elektroecke.de>

commit 9fec3c9
Author: ldab <l.bispo@live.com>
Date:   Sat Nov 25 18:43:10 2023 +0100

    remove callback from ANCS

commit 42a1c4d
Author: Daniel Kampert <DanielKampert@kampis-elektroecke.de>
Date:   Sat Nov 25 17:23:24 2023 +0100

    Notifications app:
    - Add long press to remove a notification
    - Add scrolling with animation when notification is removed
    - Convert the age into a better time format
    - Fix crash when closing notification app with at least one active notification
    - Set initial time when building a notification instead setting it to 0
    - Change font size for notification body from 14 to 12

    Signed-off-by: Daniel Kampert <DanielKampert@kampis-elektroecke.de>

commit eea1e0c
Author: Daniel Kampert <DanielKampert@kampis-elektroecke.de>
Date:   Sat Nov 25 10:48:46 2023 +0100

    BLE:
    - Remove connected and disconnected event

    Notification manager:
    - Add ZBUS listener to keep track about new notifications
    - Add missing value check for "num_notifications" to prevent boundary issues with the notification buffer

    Notifications:
    - Rework UI
    - Add timestamp field
    - Add log levels
    - Add notification source "COMMON_MESSENGER", "WHATSAPP" and "COMMON_MAIL"

    IAQ app:
    - Add log levels

    Signed-off-by: Daniel Kampert <DanielKampert@kampis-elektroecke.de>

commit f1927bb
Merge: a2258ce 7ab0a8c
Author: Daniel Kampert <DanielKampert@kampis-elektroecke.de>
Date:   Thu Nov 23 09:09:24 2023 +0100

    Notifications:
    - Rework UI

commit a2258ce
Merge: 46525c8 5022651
Author: Daniel Kampert <DanielKampert@kampis-elektroecke.de>
Date:   Wed Nov 22 22:19:47 2023 +0100

    Merge branch 'main' of github.com:jakkra/ZSWatch into BLE_enhancements#124

commit 46525c8
Author: Daniel Kampert <DanielKampert@kampis-elektroecke.de>
Date:   Wed Nov 22 11:41:35 2023 +0100

    Notification:
    - Add new design for Notifications

commit 9f99065
Merge: d339979 3f0a692
Author: Daniel Kampert <DanielKampert@kampis-elektroecke.de>
Date:   Tue Nov 21 22:21:07 2023 +0100

    Merge branch 'main' of github.com:jakkra/ZSWatch into BLE_enhancements#124

commit d339979
Author: Daniel Kampert <DanielKampert@kampis-elektroecke.de>
Date:   Tue Nov 21 17:51:29 2023 +0100

    Misc:
    - Format code
    - Changes from PR

    Notifications:
    - Improve scrolling
    - Add option to add notifications when notification app is active

    BLE:

    Signed-off-by: Daniel Kampert <DanielKampert@kampis-elektroecke.de>

commit 75458fc
Merge: 795f7b7 42b1d0d
Author: Daniel Kampert <DanielKampert@kampis-elektroecke.de>
Date:   Tue Nov 21 17:48:38 2023 +0100

    Merge branch 'main' of github.com:jakkra/ZSWatch into BLE_enhancements#124

commit 795f7b7
Merge: 284076c 7f1d52e
Author: Daniel Kampert <DanielKampert@kampis-elektroecke.de>
Date:   Tue Nov 21 16:42:44 2023 +0100

    Merge branch 'jkra_ble_rx_thread' of github.com:jakkra/ZSWatch into BLE_enhancements#124

commit 7f1d52e
Author: Jakob Krantz <mail@jakobkrantz.se>
Date:   Tue Nov 21 15:35:31 2023 +0100

    Use system workqueue for BLE RX.

    Saves us bunch of RAM not having a seperate on.
    Helps with thread safety.

commit 284076c
Author: Daniel Kampert <DanielKampert@kampis-elektroecke.de>
Date:   Tue Nov 21 15:38:44 2023 +0100

    BLE:
    - Move Gadgetbridge related code into separate source file

commit 4933d8a
Merge: 3114dee 03d6dcd
Author: Daniel Kampert <DanielKampert@kampis-elektroecke.de>
Date:   Tue Nov 21 15:11:58 2023 +0100

    Merge branch 'main' of github.com:jakkra/ZSWatch into BLE_enhancements#124

commit 3114dee
Merge: 671044e bc6365e
Author: Daniel Kampert <DanielKampert@kampis-elektroecke.de>
Date:   Tue Nov 21 09:06:44 2023 +0100

    Merge branch 'main' of github.com:jakkra/ZSWatch into BLE_enhancements#124

commit 671044e
Author: Daniel Kampert <DanielKampert@kampis-elektroecke.de>
Date:   Mon Nov 20 19:47:12 2023 +0100

    BLE:
    - Add BLE connected and disconnected ZBUS event
    - Replace "printk" in "ble_comm" with log output
    - Remove new line from log output
    - Add ZBUS instead of BLE data callback

    Misc:
    - Replace include guard for managers with "pragma once"
    - Add docu header to manager functions
    - Format code

    Signed-off-by: Daniel Kampert <DanielKampert@kampis-elektroecke.de>

commit 26b3046
Author: Daniel Kampert <DanielKampert@kampis-elektroecke.de>
Date:   Mon Nov 20 19:16:45 2023 +0100

    BLE:
    - Update device information in Device Information Service

    Misc:
    - Add wildcard for debug directory to gitignore to ignore patterns like "debug_rev_1" etc.

commit 59a76a5
Merge: 90017af 6b5b2d0
Author: Daniel Kampert <DanielKampert@kampis-elektroecke.de>
Date:   Mon Nov 20 18:54:06 2023 +0100

    Merge branch 'main' of github.com:jakkra/ZSWatch into BLE_enhancements#124

commit 90017af
Author: Daniel Kampert <DanielKampert@kampis-elektroecke.de>
Date:   Mon Nov 20 17:15:49 2023 +0100

    - Simplify code for delayable work

commit cf556e2
Author: Daniel Kampert <DanielKampert@kampis-elektroecke.de>
Date:   Mon Nov 20 17:07:43 2023 +0100

    - Fix style in battery app

commit 80163b1
Author: Daniel Kampert <DanielKampert@kampis-elektroecke.de>
Date:   Mon Nov 20 15:52:29 2023 +0100

    - Run "west format"
    - Fix compile errors because of multible log tags in Bluetooth code
    - Undo auto insertion in settings file by VS Code
    - Change log level for notification data to debug

commit 2df14f3
Author: Daniel Kampert <DanielKampert@kampis-elektroecke.de>
Date:   Mon Nov 20 10:43:00 2023 +0100

    BLE:
    - Add log level for Bluetooth code
    - Replace include guards with "pragma once"

    Template app:
    - Add log level for template app

    Settings app:
    - Add log level for settings app

    Signed-off-by: Daniel Kampert <DanielKampert@kampis-elektroecke.de>

commit 612ab22
Author: Daniel Kampert <DanielKampert@kampis-elektroecke.de>
Date:   Mon Nov 20 10:27:38 2023 +0100

    BLE:
    - Add "Subject" field to notification object
    - Remove length check for notification fields, because empty fields have a length of 0 which causes issues with the string termination

    main:
    - Rename log level for main in Kconfig
    - Add log level for main application
    - Use short payload of a notification instead of the long version

    Signed-off-by: Daniel Kampert <DanielKampert@kampis-elektroecke.de>
@Kampi Kampi force-pushed the BLE_enhancements#124 branch from 492b55b to 5625627 Compare December 5, 2023 19:46
@jakkra jakkra merged commit ba7a1e2 into jakkra:main Dec 5, 2023
@Kampi Kampi deleted the BLE_enhancements#124 branch December 5, 2023 19:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jakkra jakkra jakkra left review comments

Assignees

@jakkra jakkra

Labels
BLE Bluetooth related enhancement New feature or request GUI LVGL/UI Related
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

BLE enhancements
2 participants
@Kampi @jakkra