Skip to content

Send battery level updates via BLE using message queue #3127

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Send battery level updates via BLE using message queue #3127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 34 additions & 7 deletions omi/firmware/devkit/src/transport.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,31 @@ void broadcast_battery_level(struct k_work *work_item);

K_WORK_DELAYABLE_DEFINE(battery_work, broadcast_battery_level);

K_MSGQ_DEFINE(battery_notify_q, sizeof(uint8_t), 8, 4);

#define BATTERY_NOTIFY_STACK 1024
#define BATTERY_NOTIFY_PRIO K_PRIO_PREEMPT(8)

static void battery_notify_thread(void *a, void *b, void *c)
{
uint8_t battery_percentage;

for (;;) {
if (k_msgq_get(&battery_notify_q, &battery_percentage, K_FOREVER) == 0) {
struct bt_conn *conn = get_current_connection();

if (!conn) {
continue;
}
// Use the Zephyr BAS function to set (and notify) the battery level
int err = bt_bas_set_battery_level(battery_percentage);
if (err) {
LOG_ERR("Error updating battery level: %d", err);
}
}
}
}

void broadcast_battery_level(struct k_work *work_item)
{
uint16_t battery_millivolt;
Expand All @@ -380,19 +405,21 @@ void broadcast_battery_level(struct k_work *work_item)
battery_get_percentage(&battery_percentage, battery_millivolt) == 0) {

LOG_PRINTK("Battery at %d mV (capacity %d%%)\n", battery_millivolt, battery_percentage);

// Use the Zephyr BAS function to set (and notify) the battery level
int err = bt_bas_set_battery_level(battery_percentage);
if (err) {
LOG_ERR("Error updating battery level: %d", err);
}

k_msgq_put(&battery_notify_q, &battery_percentage, K_NO_WAIT);
} else {
LOG_ERR("Failed to read battery level");
}

k_work_reschedule(&battery_work, K_MSEC(BATTERY_REFRESH_INTERVAL));
}

K_THREAD_DEFINE(battery_notify_tid,
BATTERY_NOTIFY_STACK,
battery_notify_thread,
NULL, NULL, NULL,
BATTERY_NOTIFY_PRIO, 0, 0);

//
// Connection Callbacks
//
Expand All @@ -418,7 +445,7 @@ static void _transport_connected(struct bt_conn *conn, uint8_t err)
current_mtu = info.le.data_len->tx_max_len;
LOG_INF("Transport connected");
LOG_DBG("Interval: %d, latency: %d, timeout: %d", info.le.interval, info.le.latency, info.le.timeout);
LOG_DBG("TX PHY %s, RX PHY %s", phy2str(info.le.phy->tx_phy), phy2str(info.le.phy->rx_phy));
// LOG_DBG("TX PHY %s, RX PHY %s", phy2str(info.le.phy->tx_phy), phy2str(info.le.phy->rx_phy));
LOG_DBG("LE data len updated: TX (len: %d time: %d) RX (len: %d time: %d)",
info.le.data_len->tx_max_len,
info.le.data_len->tx_max_time,
Expand Down
37 changes: 32 additions & 5 deletions omi/firmware/omi/src/lib/dk2/transport.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,31 @@ void broadcast_battery_level(struct k_work *work_item);

K_WORK_DELAYABLE_DEFINE(battery_work, broadcast_battery_level);

K_MSGQ_DEFINE(battery_notify_q, sizeof(uint8_t), 8, 4);

#define BATTERY_NOTIFY_STACK 1024
#define BATTERY_NOTIFY_PRIO K_PRIO_PREEMPT(8)

static void battery_notify_thread(void *a, void *b, void *c)
{
uint8_t battery_percentage;

for (;;) {
if (k_msgq_get(&battery_notify_q, &battery_percentage, K_FOREVER) == 0) {
struct bt_conn *conn = get_current_connection();

if (!conn) {
continue;
}
// Use the Zephyr BAS function to set (and notify) the battery level
int err = bt_bas_set_battery_level(battery_percentage);
if (err) {
LOG_ERR("Error updating battery level: %d", err);
}
}
}
}

void broadcast_battery_level(struct k_work *work_item)
{
uint16_t battery_millivolt;
Expand All @@ -405,17 +430,19 @@ void broadcast_battery_level(struct k_work *work_item)

LOG_PRINTK("Battery at %d mV (capacity %d%%)\n", battery_millivolt, battery_percentage);

// Use the Zephyr BAS function to set (and notify) the battery level
int err = bt_bas_set_battery_level(battery_percentage);
if (err) {
LOG_ERR("Error updating battery level: %d", err);
}
k_msgq_put(&battery_notify_q, &battery_percentage, K_NO_WAIT);
} else {
LOG_ERR("Failed to read battery level");
}

k_work_reschedule(&battery_work, K_MSEC(BATTERY_REFRESH_INTERVAL));
}

K_THREAD_DEFINE(battery_notify_tid,
BATTERY_NOTIFY_STACK,
battery_notify_thread,
NULL, NULL, NULL,
BATTERY_NOTIFY_PRIO, 0, 0);
#endif

//
Expand Down