* [PATCH 1/6] tools/mesh-gatt: Add onoff set unack message to onoff client model
@ 2021-12-03 16:02 daniele.biagetti
2021-12-07 2:34 ` Tedd Ho-Jeong An
0 siblings, 1 reply; 2+ messages in thread
From: daniele.biagetti @ 2021-12-03 16:02 UTC (permalink / raw)
To: linux-bluetooth
---
tools/mesh-gatt/onoff-model.c | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/tools/mesh-gatt/onoff-model.c b/tools/mesh-gatt/onoff-model.c
index 9dfedd85a..13ff4bbe3 100644
--- a/tools/mesh-gatt/onoff-model.c
+++ b/tools/mesh-gatt/onoff-model.c
@@ -226,6 +226,8 @@ static void cmd_set(int argc, char *argv[])
uint16_t n;
uint8_t msg[32];
struct mesh_node *node;
+ int np;
+ uint32_t opcode;
if (IS_UNASSIGNED(target)) {
bt_shell_printf("Destination not set\n");
@@ -237,13 +239,22 @@ static void cmd_set(int argc, char *argv[])
if (!node)
return;
- if ((read_input_parameters(argc, argv) != 1) &&
- parms[0] != 0 && parms[0] != 1) {
- bt_shell_printf("Bad arguments: Expecting \"0\" or
\"1\"\n");
- return bt_shell_noninteractive_quit(EXIT_FAILURE);
+ np = read_input_parameters(argc, argv);
+ if ((np != 1) && (np != 2) &&
+ parms[0] != 0 && parms[0] != 1 &&
+ parms[1] != 0 && parms[1] != 1) {
+ bt_shell_printf("Bad arguments: Expecting \"0\" or \"1\" "
+ "and an optional \"0\" or \"1\" as unack\n");
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
+ }
+
+ if( (np==2) && parms[1] ){
+ opcode = OP_GENERIC_ONOFF_SET_UNACK;
+ }else{
+ opcode = OP_GENERIC_ONOFF_SET;
}
- n = mesh_opcode_set(OP_GENERIC_ONOFF_SET, msg);
+ n = mesh_opcode_set(opcode, msg);
msg[n++] = parms[0];
msg[n++] = trans_id++;
@@ -263,7 +274,7 @@ static const struct bt_shell_menu onoff_menu = {
"Set node to configure"},
{"get", NULL,
cmd_get_status,
"Get ON/OFF status"},
- {"onoff", "<0/1>", cmd_set,
+ {"onoff", "<0/1> [unack]", cmd_set,
"Send \"SET ON/OFF\"
command"},
{} },
};
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/6] tools/mesh-gatt: Add onoff set unack message to onoff client model
2021-12-03 16:02 [PATCH 1/6] tools/mesh-gatt: Add onoff set unack message to onoff client model daniele.biagetti
@ 2021-12-07 2:34 ` Tedd Ho-Jeong An
0 siblings, 0 replies; 2+ messages in thread
From: Tedd Ho-Jeong An @ 2021-12-07 2:34 UTC (permalink / raw)
To: daniele.biagetti, linux-bluetooth
Hi Daniel,
Please add the commit message for each patches.
And the CI bot was not able to apply the patch. Please resubmit after
rebasing to the tip.
Regards,
Tedd
On Fri, 2021-12-03 at 17:02 +0100, daniele.biagetti@cblelectronics.com wrote:
> ---
> tools/mesh-gatt/onoff-model.c | 23 +++++++++++++++++------
> 1 file changed, 17 insertions(+), 6 deletions(-)
>
> diff --git a/tools/mesh-gatt/onoff-model.c b/tools/mesh-gatt/onoff-model.c
> index 9dfedd85a..13ff4bbe3 100644
> --- a/tools/mesh-gatt/onoff-model.c
> +++ b/tools/mesh-gatt/onoff-model.c
> @@ -226,6 +226,8 @@ static void cmd_set(int argc, char *argv[])
> uint16_t n;
> uint8_t msg[32];
> struct mesh_node *node;
> + int np;
> + uint32_t opcode;
>
> if (IS_UNASSIGNED(target)) {
> bt_shell_printf("Destination not set\n");
> @@ -237,13 +239,22 @@ static void cmd_set(int argc, char *argv[])
> if (!node)
> return;
>
> - if ((read_input_parameters(argc, argv) != 1) &&
> - parms[0] != 0 && parms[0] != 1) {
> - bt_shell_printf("Bad arguments: Expecting \"0\" or
> \"1\"\n");
> - return bt_shell_noninteractive_quit(EXIT_FAILURE);
> + np = read_input_parameters(argc, argv);
> + if ((np != 1) && (np != 2) &&
> + parms[0] != 0 && parms[0] != 1 &&
> + parms[1] != 0 && parms[1] != 1) {
> + bt_shell_printf("Bad arguments: Expecting \"0\" or \"1\" "
> + "and an optional \"0\" or \"1\" as unack\n");
> + return bt_shell_noninteractive_quit(EXIT_FAILURE);
> + }
> +
> + if( (np==2) && parms[1] ){
> + opcode = OP_GENERIC_ONOFF_SET_UNACK;
> + }else{
> + opcode = OP_GENERIC_ONOFF_SET;
> }
>
> - n = mesh_opcode_set(OP_GENERIC_ONOFF_SET, msg);
> + n = mesh_opcode_set(opcode, msg);
> msg[n++] = parms[0];
> msg[n++] = trans_id++;
>
> @@ -263,7 +274,7 @@ static const struct bt_shell_menu onoff_menu = {
> "Set node to configure"},
> {"get", NULL,
> cmd_get_status,
> "Get ON/OFF status"},
> - {"onoff", "<0/1>", cmd_set,
> + {"onoff", "<0/1> [unack]", cmd_set,
> "Send \"SET ON/OFF\"
> command"},
> {} },
> };
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-12-07 2:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-03 16:02 [PATCH 1/6] tools/mesh-gatt: Add onoff set unack message to onoff client model daniele.biagetti
2021-12-07 2:34 ` Tedd Ho-Jeong An
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).