kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: Remove v1 logging vestiges.

Browse source
This commit is contained in:
Peter Johanson 2023-01-17 20:36:34 -05:00 • committed by Pete Johanson
parent e84b4299b5
commit 062f94d014
11 changed files with 39 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/drivers/kscan/kscan_composite.c
View file

@ -43,7 +43,7 @@ static int kscan_composite_enable_callback(const struct device *dev) {
const struct device *dev = device_get_binding(cfg->label); const struct device *dev = device_get_binding(cfg->label);
if (!dev) { if (!dev) {
LOG_WRN("Failed to load child kscan device %s", log_strdup(cfg->label)); LOG_WRN("Failed to load child kscan device %s", cfg->label);
continue; continue;
} }
kscan_enable_callback(dev); kscan_enable_callback(dev);
@ -57,7 +57,7 @@ static int kscan_composite_disable_callback(const struct device *dev) {
const struct device *dev = device_get_binding(cfg->label); const struct device *dev = device_get_binding(cfg->label);
if (!dev) { if (!dev) {
LOG_WRN("Failed to load child kscan device %s", log_strdup(cfg->label)); LOG_WRN("Failed to load child kscan device %s", cfg->label);
continue; continue;
} }
kscan_disable_callback(dev); kscan_disable_callback(dev);

4
app/drivers/kscan/kscan_gpio_demux.c
View file

@ -240,8 +240,8 @@ struct kscan_gpio_item_config {
}; \ }; \
\ \
static const struct kscan_gpio_config_##n kscan_gpio_config_##n = { \ static const struct kscan_gpio_config_##n kscan_gpio_config_##n = { \
.rows = {LISTIFY(INST_MATRIX_INPUTS(n), _KSCAN_GPIO_INPUT_CFG_INIT, (,), n)}, \ .rows = {LISTIFY(INST_MATRIX_INPUTS(n), _KSCAN_GPIO_INPUT_CFG_INIT, (, ), n)}, \
.cols = {LISTIFY(INST_DEMUX_GPIOS(n), _KSCAN_GPIO_OUTPUT_CFG_INIT, (,), n)}, \ .cols = {LISTIFY(INST_DEMUX_GPIOS(n), _KSCAN_GPIO_OUTPUT_CFG_INIT, (, ), n)}, \
}; \ }; \
\ \
DEVICE_DT_INST_DEFINE(n, kscan_gpio_init_##n, NULL, &kscan_gpio_data_##n, \ DEVICE_DT_INST_DEFINE(n, kscan_gpio_init_##n, NULL, &kscan_gpio_data_##n, \

2
app/drivers/kscan/kscan_gpio_direct.c
View file

@ -327,7 +327,7 @@ static const struct kscan_driver_api kscan_direct_api = {
"ZMK_KSCAN_DEBOUNCE_RELEASE_MS or debounce-release-ms is too large"); \ "ZMK_KSCAN_DEBOUNCE_RELEASE_MS or debounce-release-ms is too large"); \
\ \
static const struct gpio_dt_spec kscan_direct_inputs_##n[] = { \ static const struct gpio_dt_spec kscan_direct_inputs_##n[] = { \
LISTIFY(INST_INPUTS_LEN(n), KSCAN_DIRECT_INPUT_CFG_INIT, (,), n)}; \ LISTIFY(INST_INPUTS_LEN(n), KSCAN_DIRECT_INPUT_CFG_INIT, (, ), n)}; \
\ \
static struct debounce_state kscan_direct_state_##n[INST_INPUTS_LEN(n)]; \ static struct debounce_state kscan_direct_state_##n[INST_INPUTS_LEN(n)]; \
\ \

4
app/drivers/kscan/kscan_gpio_matrix.c
View file

@ -433,10 +433,10 @@ static const struct kscan_driver_api kscan_matrix_api = {
"ZMK_KSCAN_DEBOUNCE_RELEASE_MS or debounce-release-ms is too large"); \ "ZMK_KSCAN_DEBOUNCE_RELEASE_MS or debounce-release-ms is too large"); \
\ \
static const struct gpio_dt_spec kscan_matrix_rows_##n[] = { \ static const struct gpio_dt_spec kscan_matrix_rows_##n[] = { \
LISTIFY(INST_ROWS_LEN(n), KSCAN_GPIO_ROW_CFG_INIT, (,), n)}; \ LISTIFY(INST_ROWS_LEN(n), KSCAN_GPIO_ROW_CFG_INIT, (, ), n)}; \
\ \
static const struct gpio_dt_spec kscan_matrix_cols_##n[] = { \ static const struct gpio_dt_spec kscan_matrix_cols_##n[] = { \
LISTIFY(INST_COLS_LEN(n), KSCAN_GPIO_COL_CFG_INIT, (,), n)}; \ LISTIFY(INST_COLS_LEN(n), KSCAN_GPIO_COL_CFG_INIT, (, ), n)}; \
\ \
static struct debounce_state kscan_matrix_state_##n[INST_MATRIX_LEN(n)]; \ static struct debounce_state kscan_matrix_state_##n[INST_MATRIX_LEN(n)]; \
\ \

2
app/src/behavior_queue.c
View file

@ -28,7 +28,7 @@ static void behavior_queue_process_next(struct k_work *work) {
struct q_item item = {.wait = 0}; struct q_item item = {.wait = 0};
while (k_msgq_get(&zmk_behavior_queue_msgq, &item, K_NO_WAIT) == 0) { while (k_msgq_get(&zmk_behavior_queue_msgq, &item, K_NO_WAIT) == 0) {
LOG_DBG("Invoking %s: 0x%02x 0x%02x", log_strdup(item.binding.behavior_dev), LOG_DBG("Invoking %s: 0x%02x 0x%02x", item.binding.behavior_dev,
item.binding.param1, item.binding.param2); item.binding.param1, item.binding.param2);
struct zmk_behavior_binding_event event = {.position = item.position, struct zmk_behavior_binding_event event = {.position = item.position,

30
app/src/ble.c
View file

@ -111,7 +111,7 @@ void set_profile_address(uint8_t index, const bt_addr_le_t *addr) {
memcpy(&profiles[index].peer, addr, sizeof(bt_addr_le_t)); memcpy(&profiles[index].peer, addr, sizeof(bt_addr_le_t));
sprintf(setting_name, "ble/profiles/%d", index); sprintf(setting_name, "ble/profiles/%d", index);
LOG_DBG("Setting profile addr for %s to %s", log_strdup(setting_name), log_strdup(addr_str)); LOG_DBG("Setting profile addr for %s to %s", setting_name, addr_str);
settings_save_one(setting_name, &profiles[index], sizeof(struct zmk_ble_profile)); settings_save_one(setting_name, &profiles[index], sizeof(struct zmk_ble_profile));
k_work_submit(&raise_profile_changed_event_work); k_work_submit(&raise_profile_changed_event_work);
} }
@ -177,7 +177,7 @@ int update_advertising() {
// addr_str[BT_ADDR_LE_STR_LEN]; bt_addr_le_to_str(zmk_ble_active_profile_addr(), addr_str, // addr_str[BT_ADDR_LE_STR_LEN]; bt_addr_le_to_str(zmk_ble_active_profile_addr(), addr_str,
// sizeof(addr_str)); // sizeof(addr_str));
// LOG_DBG("Directed advertising to %s", log_strdup(addr_str)); // LOG_DBG("Directed advertising to %s", addr_str);
// desired_adv = ZMK_ADV_DIR; // desired_adv = ZMK_ADV_DIR;
} }
LOG_DBG("advertising from %d to %d", advertising_status, desired_adv); LOG_DBG("advertising from %d to %d", advertising_status, desired_adv);
@ -293,13 +293,13 @@ static int ble_profiles_handle_set(const char *name, size_t len, settings_read_c
void *cb_arg) { void *cb_arg) {
const char *next; const char *next;
LOG_DBG("Setting BLE value %s", log_strdup(name)); LOG_DBG("Setting BLE value %s", name);
if (settings_name_steq(name, "profiles", &next) && next) { if (settings_name_steq(name, "profiles", &next) && next) {
char *endptr; char *endptr;
uint8_t idx = strtoul(next, &endptr, 10); uint8_t idx = strtoul(next, &endptr, 10);
if (*endptr != '\0') { if (*endptr != '\0') {
LOG_WRN("Invalid profile index: %s", log_strdup(next)); LOG_WRN("Invalid profile index: %s", next);
return -EINVAL; return -EINVAL;
} }
@ -324,7 +324,7 @@ static int ble_profiles_handle_set(const char *name, size_t len, settings_read_c
char addr_str[BT_ADDR_LE_STR_LEN]; char addr_str[BT_ADDR_LE_STR_LEN];
bt_addr_le_to_str(&profiles[idx].peer, addr_str, sizeof(addr_str)); bt_addr_le_to_str(&profiles[idx].peer, addr_str, sizeof(addr_str));
LOG_DBG("Loaded %s address for profile %d", log_strdup(addr_str), idx); LOG_DBG("Loaded %s address for profile %d", addr_str, idx);
} else if (settings_name_steq(name, "active_profile", &next) && !next) { } else if (settings_name_steq(name, "active_profile", &next) && !next) {
if (len != sizeof(active_profile)) { if (len != sizeof(active_profile)) {
return -EINVAL; return -EINVAL;
@ -376,12 +376,12 @@ static void connected(struct bt_conn *conn, uint8_t err) {
advertising_status = ZMK_ADV_NONE; advertising_status = ZMK_ADV_NONE;
if (err) { if (err) {
LOG_WRN("Failed to connect to %s (%u)", log_strdup(addr), err); LOG_WRN("Failed to connect to %s (%u)", addr, err);
update_advertising(); update_advertising();
return; return;
} }
LOG_DBG("Connected %s", log_strdup(addr)); LOG_DBG("Connected %s", addr);
if (bt_conn_set_security(conn, BT_SECURITY_L2)) { if (bt_conn_set_security(conn, BT_SECURITY_L2)) {
LOG_ERR("Failed to set security"); LOG_ERR("Failed to set security");
@ -401,7 +401,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) {
bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
LOG_DBG("Disconnected from %s (reason 0x%02x)", log_strdup(addr), reason); LOG_DBG("Disconnected from %s (reason 0x%02x)", addr, reason);
bt_conn_get_info(conn, &info); bt_conn_get_info(conn, &info);
@ -426,9 +426,9 @@ static void security_changed(struct bt_conn *conn, bt_security_t level, enum bt_
bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
if (!err) { if (!err) {
LOG_DBG("Security changed: %s level %u", log_strdup(addr), level); LOG_DBG("Security changed: %s level %u", addr, level);
} else { } else {
LOG_ERR("Security failed: %s level %u err %d", log_strdup(addr), level, err); LOG_ERR("Security failed: %s level %u err %d", addr, level, err);
} }
} }
@ -438,7 +438,7 @@ static void le_param_updated(struct bt_conn *conn, uint16_t interval, uint16_t l
bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
LOG_DBG("%s: interval %d latency %d timeout %d", log_strdup(addr), interval, latency, timeout); LOG_DBG("%s: interval %d latency %d timeout %d", addr, interval, latency, timeout);
} }
static struct bt_conn_cb conn_callbacks = { static struct bt_conn_cb conn_callbacks = {
@ -454,7 +454,7 @@ static void auth_passkey_display(struct bt_conn *conn, unsigned int passkey) {
bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
LOG_DBG("Passkey for %s: %06u", log_strdup(addr), passkey); LOG_DBG("Passkey for %s: %06u", addr, passkey);
} }
*/ */
@ -465,7 +465,7 @@ static void auth_passkey_entry(struct bt_conn *conn) {
bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
LOG_DBG("Passkey entry requested for %s", log_strdup(addr)); LOG_DBG("Passkey entry requested for %s", addr);
passkey_digit = 0; passkey_digit = 0;
auth_passkey_entry_conn = bt_conn_ref(conn); auth_passkey_entry_conn = bt_conn_ref(conn);
} }
@ -486,7 +486,7 @@ static void auth_cancel(struct bt_conn *conn) {
passkey_digit = 0; passkey_digit = 0;
#endif #endif
LOG_DBG("Pairing cancelled: %s", log_strdup(addr)); LOG_DBG("Pairing cancelled: %s", addr);
} }
static enum bt_security_err auth_pairing_accept(struct bt_conn *conn, static enum bt_security_err auth_pairing_accept(struct bt_conn *conn,
@ -517,7 +517,7 @@ static void auth_pairing_complete(struct bt_conn *conn, bool bonded) {
} }
if (!zmk_ble_active_profile_is_open()) { if (!zmk_ble_active_profile_is_open()) {
LOG_ERR("Pairing completed but current profile is not open: %s", log_strdup(addr)); LOG_ERR("Pairing completed but current profile is not open: %s", addr);
bt_unpair(BT_ID_DEFAULT, dst); bt_unpair(BT_ID_DEFAULT, dst);
return; return;
} }

2
app/src/endpoints.c
View file

@ -148,7 +148,7 @@ int zmk_endpoints_send_report(uint16_t usage_page) {
static int endpoints_handle_set(const char *name, size_t len, settings_read_cb read_cb, static int endpoints_handle_set(const char *name, size_t len, settings_read_cb read_cb,
void *cb_arg) { void *cb_arg) {
LOG_DBG("Setting endpoint value %s", log_strdup(name)); LOG_DBG("Setting endpoint value %s", name);
if (settings_name_steq(name, "preferred", NULL)) { if (settings_name_steq(name, "preferred", NULL)) {
if (len != sizeof(enum zmk_endpoint)) { if (len != sizeof(enum zmk_endpoint)) {

5
app/src/keymap.c
View file

@ -179,8 +179,7 @@ int zmk_keymap_apply_position_state(uint8_t source, int layer, uint32_t position
.timestamp = timestamp, .timestamp = timestamp,
}; };
LOG_DBG("layer: %d position: %d, binding name: %s", layer, position, LOG_DBG("layer: %d position: %d, binding name: %s", layer, position, binding.behavior_dev);
log_strdup(binding.behavior_dev));
behavior = device_get_binding(binding.behavior_dev); behavior = device_get_binding(binding.behavior_dev);
@ -260,7 +259,7 @@ int zmk_keymap_sensor_triggered(uint8_t sensor_number, const struct device *sens
int ret; int ret;
LOG_DBG("layer: %d sensor_number: %d, binding name: %s", layer, sensor_number, LOG_DBG("layer: %d sensor_number: %d, binding name: %s", layer, sensor_number,
log_strdup(binding->behavior_dev)); binding->behavior_dev);
behavior = device_get_binding(binding->behavior_dev); behavior = device_get_binding(binding->behavior_dev);

14
app/src/split/bluetooth/central.c
View file

@ -377,8 +377,8 @@ static bool split_central_eir_found(struct bt_data *data, void *user_data) {
bt_uuid_to_str(&uuid.uuid, uuid_str, sizeof(uuid_str)); bt_uuid_to_str(&uuid.uuid, uuid_str, sizeof(uuid_str));
bt_uuid_to_str(BT_UUID_DECLARE_128(ZMK_SPLIT_BT_SERVICE_UUID), service_uuid_str, bt_uuid_to_str(BT_UUID_DECLARE_128(ZMK_SPLIT_BT_SERVICE_UUID), service_uuid_str,
sizeof(service_uuid_str)); sizeof(service_uuid_str));
LOG_DBG("UUID %s does not match split UUID: %s", log_strdup(uuid_str), LOG_DBG("UUID %s does not match split UUID: %s", uuid_str,
log_strdup(service_uuid_str)); service_uuid_str);
continue; continue;
} }
@ -433,7 +433,7 @@ static void split_central_device_found(const bt_addr_le_t *addr, int8_t rssi, ui
char dev[BT_ADDR_LE_STR_LEN]; char dev[BT_ADDR_LE_STR_LEN];
bt_addr_le_to_str(addr, dev, sizeof(dev)); bt_addr_le_to_str(addr, dev, sizeof(dev));
LOG_DBG("[DEVICE]: %s, AD evt type %u, AD data len %u, RSSI %i", log_strdup(dev), type, ad->len, LOG_DBG("[DEVICE]: %s, AD evt type %u, AD data len %u, RSSI %i", dev, type, ad->len,
rssi); rssi);
/* We're only interested in connectable events */ /* We're only interested in connectable events */
@ -469,7 +469,7 @@ static void split_central_connected(struct bt_conn *conn, uint8_t conn_err) {
} }
if (conn_err) { if (conn_err) {
LOG_ERR("Failed to connect to %s (%u)", log_strdup(addr), conn_err); LOG_ERR("Failed to connect to %s (%u)", addr, conn_err);
release_peripheral_slot_for_conn(conn); release_peripheral_slot_for_conn(conn);
@ -477,7 +477,7 @@ static void split_central_connected(struct bt_conn *conn, uint8_t conn_err) {
return; return;
} }
LOG_DBG("Connected: %s", log_strdup(addr)); LOG_DBG("Connected: %s", addr);
confirm_peripheral_slot_conn(conn); confirm_peripheral_slot_conn(conn);
split_central_process_connection(conn); split_central_process_connection(conn);
@ -489,7 +489,7 @@ static void split_central_disconnected(struct bt_conn *conn, uint8_t reason) {
bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
LOG_DBG("Disconnected: %s (reason %d)", log_strdup(addr), reason); LOG_DBG("Disconnected: %s (reason %d)", addr, reason);
err = release_peripheral_slot_for_conn(conn); err = release_peripheral_slot_for_conn(conn);
@ -579,7 +579,7 @@ int zmk_split_bt_invoke_behavior(uint8_t source, struct zmk_behavior_binding *bi
if (strlcpy(payload.behavior_dev, binding->behavior_dev, payload_dev_size) >= if (strlcpy(payload.behavior_dev, binding->behavior_dev, payload_dev_size) >=
payload_dev_size) { payload_dev_size) {
LOG_ERR("Truncated behavior label %s to %s before invoking peripheral behavior", LOG_ERR("Truncated behavior label %s to %s before invoking peripheral behavior",
log_strdup(binding->behavior_dev), log_strdup(payload.behavior_dev)); binding->behavior_dev, payload.behavior_dev);
} }
struct zmk_split_run_behavior_payload_wrapper wrapper = {.source = source, .payload = payload}; struct zmk_split_run_behavior_payload_wrapper wrapper = {.source = source, .payload = payload};

8
app/src/split/bluetooth/peripheral.c
View file

@ -59,7 +59,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason) {
bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
LOG_DBG("Disconnected from %s (reason 0x%02x)", log_strdup(addr), reason); LOG_DBG("Disconnected from %s (reason 0x%02x)", addr, reason);
is_connected = false; is_connected = false;
@ -73,9 +73,9 @@ static void security_changed(struct bt_conn *conn, bt_security_t level, enum bt_
bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
if (!err) { if (!err) {
LOG_DBG("Security changed: %s level %u", log_strdup(addr), level); LOG_DBG("Security changed: %s level %u", addr, level);
} else { } else {
LOG_ERR("Security failed: %s level %u err %d", log_strdup(addr), level, err); LOG_ERR("Security failed: %s level %u err %d", addr, level, err);
} }
} }
@ -85,7 +85,7 @@ static void le_param_updated(struct bt_conn *conn, uint16_t interval, uint16_t l
bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr)); bt_addr_le_to_str(bt_conn_get_dst(conn), addr, sizeof(addr));
LOG_DBG("%s: interval %d latency %d timeout %d", log_strdup(addr), interval, latency, timeout); LOG_DBG("%s: interval %d latency %d timeout %d", addr, interval, latency, timeout);
} }
static struct bt_conn_cb conn_callbacks = { static struct bt_conn_cb conn_callbacks = {

4
app/src/split/bluetooth/service.c
View file

@ -60,7 +60,7 @@ static ssize_t split_svc_run_behavior(struct bt_conn *conn, const struct bt_gatt
.param2 = payload->data.param2, .param2 = payload->data.param2,
.behavior_dev = payload->behavior_dev, .behavior_dev = payload->behavior_dev,
}; };
LOG_DBG("%s with params %d %d: pressed? %d", log_strdup(binding.behavior_dev), LOG_DBG("%s with params %d %d: pressed? %d", binding.behavior_dev,
binding.param1, binding.param2, payload->data.state); binding.param1, binding.param2, payload->data.state);
struct zmk_behavior_binding_event event = {.position = payload->data.position, struct zmk_behavior_binding_event event = {.position = payload->data.position,
.timestamp = k_uptime_get()}; .timestamp = k_uptime_get()};
@ -72,7 +72,7 @@ static ssize_t split_svc_run_behavior(struct bt_conn *conn, const struct bt_gatt
} }
if (err) { if (err) {
LOG_ERR("Failed to invoke behavior %s: %d", log_strdup(binding.behavior_dev), err); LOG_ERR("Failed to invoke behavior %s: %d", binding.behavior_dev, err);
} }
} }