bfb4e1bac4
This commit splits out the model related commands from mesh shell to separate shell modules. The purpose of this alteration is to make model commands more flexible by letting the application itself define the model instances. - Move Health Client commands to separate shell module. - Move Config Client commands to separate shell module. - Remove Health Client instance from shell.c. - Add Health Client instance to mesh_shell test application. - Add util library for Mesh shell. - Some refactoring of shell menu layout. - Update Mesh shell documentation. Signed-off-by: Anders Storrø <anders.storro@nordicsemi.no>
103 lines
2.3 KiB
C
103 lines
2.3 KiB
C
/*
|
|
* Copyright (c) 2022 Nordic Semiconductor ASA
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
#include <zephyr/bluetooth/mesh.h>
|
|
#include <zephyr/shell/shell.h>
|
|
#include <ctype.h>
|
|
#include <string.h>
|
|
|
|
#include "mesh/net.h"
|
|
#include "mesh/access.h"
|
|
#include "utils.h"
|
|
|
|
struct shell_model_instance {
|
|
uint16_t addr;
|
|
uint8_t elem_idx;
|
|
};
|
|
|
|
static void model_instances_get(uint16_t id, struct shell_model_instance *arr, uint8_t len)
|
|
{
|
|
const struct bt_mesh_comp *comp = bt_mesh_comp_get();
|
|
struct bt_mesh_elem *elem;
|
|
struct bt_mesh_model *mod;
|
|
|
|
for (int i = 0; i < len; i++) {
|
|
elem = bt_mesh_elem_find(comp->elem[i].addr);
|
|
mod = bt_mesh_model_find(elem, id);
|
|
if (mod) {
|
|
arr[i].addr = comp->elem[i].addr;
|
|
arr[i].elem_idx = mod->elem_idx;
|
|
}
|
|
}
|
|
}
|
|
|
|
bool bt_mesh_shell_mdl_first_get(uint16_t id, struct bt_mesh_model **mod)
|
|
{
|
|
const struct bt_mesh_comp *comp = bt_mesh_comp_get();
|
|
|
|
for (int i = 0; i < comp->elem_count; i++) {
|
|
*mod = bt_mesh_model_find(&comp->elem[i], id);
|
|
if (*mod) {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
int bt_mesh_shell_mdl_instance_set(const struct shell *sh, struct bt_mesh_model **mod,
|
|
uint16_t mod_id, uint8_t elem_idx)
|
|
{
|
|
struct bt_mesh_model *mod_temp;
|
|
const struct bt_mesh_comp *comp = bt_mesh_comp_get();
|
|
|
|
if (elem_idx >= comp->elem_count) {
|
|
shell_error(sh, "Invalid element index");
|
|
return -EINVAL;
|
|
}
|
|
|
|
mod_temp = bt_mesh_model_find(&comp->elem[elem_idx], mod_id);
|
|
|
|
if (mod_temp) {
|
|
*mod = mod_temp;
|
|
} else {
|
|
shell_error(sh, "Unable to find model instance for element index %d", elem_idx);
|
|
return -ENODEV;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int bt_mesh_shell_mdl_print_all(const struct shell *sh, uint16_t mod_id)
|
|
{
|
|
uint8_t elem_cnt = bt_mesh_elem_count();
|
|
struct shell_model_instance mod_arr[elem_cnt];
|
|
|
|
memset(mod_arr, 0, sizeof(mod_arr));
|
|
model_instances_get(mod_id, mod_arr, ARRAY_SIZE(mod_arr));
|
|
|
|
for (int i = 0; i < ARRAY_SIZE(mod_arr); i++) {
|
|
if (mod_arr[i].addr) {
|
|
shell_print(sh,
|
|
"Client model instance found at addr 0x%.4X. Element index: %d",
|
|
mod_arr[i].addr, mod_arr[i].elem_idx);
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int bt_mesh_shell_mdl_cmds_help(const struct shell *sh, size_t argc, char **argv)
|
|
{
|
|
if (argc == 1) {
|
|
shell_help(sh);
|
|
return 0;
|
|
}
|
|
|
|
shell_error(sh, "%s unknown command: %s", argv[0], argv[1]);
|
|
return -EINVAL;
|
|
}
|