From b51bbc16fb3fe56040479d3d4bd5207bb762dd64 Mon Sep 17 00:00:00 2001 From: Brendan Haines Date: Sat, 31 May 2025 14:09:24 -0600 Subject: [PATCH] autoformatting --- firmware/app/src/gatt_write_common.c | 148 +++++++++++++++++---------- 1 file changed, 92 insertions(+), 56 deletions(-) diff --git a/firmware/app/src/gatt_write_common.c b/firmware/app/src/gatt_write_common.c index 99d2e83..a2941c2 100644 --- a/firmware/app/src/gatt_write_common.c +++ b/firmware/app/src/gatt_write_common.c @@ -25,11 +25,13 @@ static void phy_update_iterate(struct bt_conn *conn) .options = BT_CONN_LE_PHY_OPT_NONE, .pref_tx_phy = BT_GAP_LE_PHY_1M, .pref_rx_phy = BT_GAP_LE_PHY_1M, - }, { + }, + { .options = BT_CONN_LE_PHY_OPT_NONE, .pref_tx_phy = BT_GAP_LE_PHY_1M, .pref_rx_phy = BT_GAP_LE_PHY_2M, - }, { + }, + { .options = BT_CONN_LE_PHY_OPT_NONE, .pref_tx_phy = BT_GAP_LE_PHY_1M, .pref_rx_phy = BT_GAP_LE_PHY_CODED, @@ -40,11 +42,13 @@ static void phy_update_iterate(struct bt_conn *conn) .options = BT_CONN_LE_PHY_OPT_NONE, .pref_tx_phy = BT_GAP_LE_PHY_2M, .pref_rx_phy = BT_GAP_LE_PHY_1M, - }, { + }, + { .options = BT_CONN_LE_PHY_OPT_NONE, .pref_tx_phy = BT_GAP_LE_PHY_2M, .pref_rx_phy = BT_GAP_LE_PHY_2M, - }, { + }, + { .options = BT_CONN_LE_PHY_OPT_NONE, .pref_tx_phy = BT_GAP_LE_PHY_2M, .pref_rx_phy = BT_GAP_LE_PHY_CODED, @@ -55,11 +59,13 @@ static void phy_update_iterate(struct bt_conn *conn) .options = BT_CONN_LE_PHY_OPT_CODED_S8, .pref_tx_phy = BT_GAP_LE_PHY_CODED, .pref_rx_phy = BT_GAP_LE_PHY_1M, - }, { + }, + { .options = BT_CONN_LE_PHY_OPT_CODED_S8, .pref_tx_phy = BT_GAP_LE_PHY_CODED, .pref_rx_phy = BT_GAP_LE_PHY_2M, - }, { + }, + { .options = BT_CONN_LE_PHY_OPT_CODED_S8, .pref_tx_phy = BT_GAP_LE_PHY_CODED, .pref_rx_phy = BT_GAP_LE_PHY_CODED, @@ -70,11 +76,13 @@ static void phy_update_iterate(struct bt_conn *conn) .options = BT_CONN_LE_PHY_OPT_CODED_S2, .pref_tx_phy = BT_GAP_LE_PHY_CODED, .pref_rx_phy = BT_GAP_LE_PHY_1M, - }, { + }, + { .options = BT_CONN_LE_PHY_OPT_CODED_S2, .pref_tx_phy = BT_GAP_LE_PHY_CODED, .pref_rx_phy = BT_GAP_LE_PHY_2M, - }, { + }, + { .options = BT_CONN_LE_PHY_OPT_CODED_S2, .pref_tx_phy = BT_GAP_LE_PHY_CODED, .pref_rx_phy = BT_GAP_LE_PHY_CODED, @@ -89,14 +97,16 @@ static void phy_update_iterate(struct bt_conn *conn) }; int err; - if (phy_update_countdown--) { + if (phy_update_countdown--) + { return; } phy_update_countdown = PHY_UPDATE_COUNTDOWN; phy_param_idx++; - if (phy_param_idx >= ARRAY_SIZE(phy_param)) { + if (phy_param_idx >= ARRAY_SIZE(phy_param)) + { /* No more PHY updates, stay at the last index */ phy_param_idx = ARRAY_SIZE(phy_param); return; @@ -105,30 +115,35 @@ static void phy_update_iterate(struct bt_conn *conn) struct bt_conn_info conn_info; err = bt_conn_get_info(conn, &conn_info); - if (err) { + if (err) + { printk("Failed to get connection info (%d).\n", err); return; } struct bt_conn_le_phy_param conn_phy_param; - if (conn_info.role == BT_CONN_ROLE_CENTRAL) { + if (conn_info.role == BT_CONN_ROLE_CENTRAL) + { conn_phy_param.options = phy_param[phy_param_idx].options; conn_phy_param.pref_tx_phy = phy_param[phy_param_idx].pref_tx_phy; conn_phy_param.pref_rx_phy = phy_param[phy_param_idx].pref_rx_phy; - } else { + } + else + { conn_phy_param.options = phy_param[phy_param_idx].options; conn_phy_param.pref_tx_phy = phy_param[phy_param_idx].pref_rx_phy; conn_phy_param.pref_rx_phy = phy_param[phy_param_idx].pref_tx_phy; } printk("%s: PHY Update requested %u %u (%u)\n", __func__, - conn_phy_param.pref_tx_phy, - conn_phy_param.pref_rx_phy, - conn_phy_param.options); + conn_phy_param.pref_tx_phy, + conn_phy_param.pref_rx_phy, + conn_phy_param.options); err = bt_conn_le_phy_update(conn, &conn_phy_param); - if (err) { + if (err) + { printk("Failed to update PHY (%d).\n", err); return; } @@ -155,7 +170,8 @@ static void write_cmd_cb(struct bt_conn *conn, void *user_data) delta = k_cycle_get_32() - cycle_stamp; delta = k_cyc_to_ns_floor64(delta); - if (delta == 0) { + if (delta == 0) + { /* Skip division by zero */ return; } @@ -163,9 +179,10 @@ static void write_cmd_cb(struct bt_conn *conn, void *user_data) /* if last data rx-ed was greater than 1 second in the past, * reset the metrics. */ - if (delta > (METRICS_INTERVAL * NSEC_PER_SEC)) { + if (delta > (METRICS_INTERVAL * NSEC_PER_SEC)) + { printk("%s: count= %u, len= %u, rate= %u bps.\n", __func__, - write_count, write_len, write_rate); + write_count, write_len, write_rate); last_write_rate = write_rate; @@ -174,11 +191,13 @@ static void write_cmd_cb(struct bt_conn *conn, void *user_data) write_rate = 0U; cycle_stamp = k_cycle_get_32(); - if (IS_ENABLED(CONFIG_BT_USER_PHY_UPDATE)) { + if (IS_ENABLED(CONFIG_BT_USER_PHY_UPDATE)) + { phy_update_iterate(conn); } - - } else { + } + else + { uint16_t len; write_count++; @@ -188,16 +207,16 @@ static void write_cmd_cb(struct bt_conn *conn, void *user_data) write_len += len; write_rate = ((uint64_t)write_len << 3) * (METRICS_INTERVAL * NSEC_PER_SEC) / - delta; + delta; } } static void mtu_exchange_cb(struct bt_conn *conn, uint8_t err, - struct bt_gatt_exchange_params *params) + struct bt_gatt_exchange_params *params) { printk("%s: MTU exchange %s (%u)\n", __func__, - err == 0U ? "successful" : "failed", - bt_gatt_get_mtu(conn)); + err == 0U ? "successful" : "failed", + bt_gatt_get_mtu(conn)); } static int mtu_exchange(struct bt_conn *conn) @@ -210,7 +229,8 @@ static int mtu_exchange(struct bt_conn *conn) printk("%s: Exchange MTU...\n", __func__); err = bt_gatt_exchange_mtu(conn, &mtu_exchange_params); - if (err) { + if (err) + { printk("%s: MTU exchange failed (err %d)", __func__, err); } @@ -225,14 +245,16 @@ static void connected(struct bt_conn *conn, uint8_t conn_err) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); - if (conn_err) { + if (conn_err) + { printk("%s: Failed to connect to %s (%u)\n", __func__, addr, - conn_err); + conn_err); return; } err = bt_conn_get_info(conn, &conn_info); - if (err) { + if (err) + { printk("Failed to get connection info (%d).\n", err); return; } @@ -244,15 +266,18 @@ static void connected(struct bt_conn *conn, uint8_t conn_err) (void)mtu_exchange(conn); #if defined(CONFIG_BT_SMP) - if (conn_info.role == BT_CONN_ROLE_CENTRAL) { + if (conn_info.role == BT_CONN_ROLE_CENTRAL) + { err = bt_conn_set_security(conn, BT_SECURITY_L2); - if (err) { + if (err) + { printk("Failed to set security (%d).\n", err); } } #endif - if (IS_ENABLED(CONFIG_BT_USER_PHY_UPDATE)) { + if (IS_ENABLED(CONFIG_BT_USER_PHY_UPDATE)) + { phy_update_countdown = PHY_UPDATE_COUNTDOWN; phy_param_idx = 0U; } @@ -267,19 +292,21 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); err = bt_conn_get_info(conn, &conn_info); - if (err) { + if (err) + { printk("Failed to get connection info (%d).\n", err); return; } printk("%s: %s role %u, reason %u %s\n", __func__, addr, conn_info.role, - reason, bt_hci_err_to_str(reason)); + reason, bt_hci_err_to_str(reason)); conn_connected = NULL; bt_conn_unref(conn); - if (conn_info.role == BT_CONN_ROLE_CENTRAL) { + if (conn_info.role == BT_CONN_ROLE_CENTRAL) + { start_scan_func(); } } @@ -287,22 +314,22 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) static bool le_param_req(struct bt_conn *conn, struct bt_le_conn_param *param) { printk("%s: int (0x%04x, 0x%04x) lat %u to %u\n", __func__, - param->interval_min, param->interval_max, param->latency, - param->timeout); + param->interval_min, param->interval_max, param->latency, + param->timeout); return true; } static void le_param_updated(struct bt_conn *conn, uint16_t interval, - uint16_t latency, uint16_t timeout) + uint16_t latency, uint16_t timeout) { printk("%s: int 0x%04x lat %u to %u\n", __func__, interval, - latency, timeout); + latency, timeout); } #if defined(CONFIG_BT_SMP) static void security_changed(struct bt_conn *conn, bt_security_t level, - enum bt_security_err err) + enum bt_security_err err) { printk("%s: to level %u, err %s(%u)\n", __func__, level, bt_security_err_to_str(err), err); } @@ -310,28 +337,28 @@ static void security_changed(struct bt_conn *conn, bt_security_t level, #if defined(CONFIG_BT_USER_PHY_UPDATE) static void le_phy_updated(struct bt_conn *conn, - struct bt_conn_le_phy_info *param) + struct bt_conn_le_phy_info *param) { char addr[BT_ADDR_LE_STR_LEN]; bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); printk("LE PHY Updated: %s Tx 0x%x, Rx 0x%x\n", addr, param->tx_phy, - param->rx_phy); + param->rx_phy); } #endif /* CONFIG_BT_USER_PHY_UPDATE */ #if defined(CONFIG_BT_USER_DATA_LEN_UPDATE) static void le_data_len_updated(struct bt_conn *conn, - struct bt_conn_le_data_len_info *info) + struct bt_conn_le_data_len_info *info) { char addr[BT_ADDR_LE_STR_LEN]; bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); printk("Data length updated: %s max tx %u (%u us) max rx %u (%u us)\n", - addr, info->tx_max_len, info->tx_max_time, info->rx_max_len, - info->rx_max_time); + addr, info->tx_max_len, info->tx_max_time, info->rx_max_len, + info->rx_max_time); } #endif /* CONFIG_BT_USER_DATA_LEN_UPDATE */ @@ -356,13 +383,16 @@ BT_CONN_CB_DEFINE(conn_callbacks) = { int write_cmd(struct bt_conn *conn) { - static uint8_t data[BT_ATT_MAX_ATTRIBUTE_LEN] = {0, }; + static uint8_t data[BT_ATT_MAX_ATTRIBUTE_LEN] = { + 0, + }; static uint16_t data_len; uint16_t data_len_max; int err; data_len_max = bt_gatt_get_mtu(conn) - 3; - if (data_len_max > BT_ATT_MAX_ATTRIBUTE_LEN) { + if (data_len_max > BT_ATT_MAX_ATTRIBUTE_LEN) + { data_len_max = BT_ATT_MAX_ATTRIBUTE_LEN; } @@ -371,15 +401,20 @@ int write_cmd(struct bt_conn *conn) /* TODO: Include test case in BabbleSim tests */ static bool decrement; - if (decrement) { + if (decrement) + { data_len--; - if (data_len <= 1) { + if (data_len <= 1) + { data_len = 1; decrement = false; } - } else { + } + else + { data_len++; - if (data_len >= data_len_max) { + if (data_len >= data_len_max) + { data_len = data_len_max; decrement = true; } @@ -395,9 +430,10 @@ int write_cmd(struct bt_conn *conn) * to transmit the data across. */ err = bt_gatt_write_without_response_cb(conn, 0x0001, data, data_len, - false, write_cmd_cb, - (void *)((uint32_t)data_len)); - if (err) { + false, write_cmd_cb, + (void *)((uint32_t)data_len)); + if (err) + { printk("%s: Write cmd failed (%d).\n", __func__, err); }