This patch adds two commands (set and get) to menu config and handles the
incomming status message.
---
mesh/config-client.c | 42 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/mesh/config-client.c b/mesh/config-client.c
index 95297bfee..4e5e06258 100644
--- a/mesh/config-client.c
+++ b/mesh/config-client.c
@@ -179,6 +179,13 @@ static bool client_msg_recvd(uint16_t src, uint8_t *data,
mesh_status_str(data[0]));
break;
+ case OP_CONFIG_BEACON_STATUS:
+ if (len != 1)
+ return true;
+ bt_shell_printf("Node %4.4x Config Beacon Status 0x%02x\n",
+ src, data[0]);
+ break;
+
case OP_CONFIG_RELAY_STATUS:
if (len != 2)
return true;
@@ -689,6 +696,37 @@ static void cmd_bind(int argc, char *argv[])
return bt_shell_noninteractive_quit(EXIT_SUCCESS);
}
+static void cmd_beacon_set(int argc, char *argv[])
+{
+ uint16_t n;
+ uint8_t msg[2 + 1];
+ int parm_cnt;
+
+ if (!verify_config_target(target))
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
+
+ n = mesh_opcode_set(OP_CONFIG_BEACON_SET, msg);
+
+ parm_cnt = read_input_parameters(argc, argv);
+ if (parm_cnt != 1) {
+ bt_shell_printf("bad arguments\n");
+ return bt_shell_noninteractive_quit(EXIT_FAILURE);
+ }
+
+ msg[n++] = parms[0];
+
+ if (!config_send(msg, n)) {
+ bt_shell_printf("Failed to send \"SET BEACON\"\n");
+ return;
+ }
+
+ return bt_shell_noninteractive_quit(EXIT_SUCCESS);}
+
+static void cmd_beacon_get(int argc, char *argv[])
+{
+ cmd_default(OP_CONFIG_BEACON_GET);
+}
+
static void cmd_ident_set(int argc, char *argv[])
{
uint16_t n;
@@ -1178,6 +1216,10 @@ static const struct bt_shell_menu cfg_menu = {
"Set node identity state"},
{"ident-get", "<net_idx>", cmd_ident_get,
"Get node identity state"},
+ {"beacon-set", "<state>", cmd_beacon_set,
+ "Set node identity state"},
+ {"beacon-get", NULL, cmd_beacon_get,
+ "Get node beacon state"},
{"relay-set", "<relay> <rexmt count> <rexmt steps>",
cmd_relay_set,
"Set relay"},
--
2.11.0
Hi Robert,
On Thu, Apr 5, 2018 at 10:42 AM, Robert Lubas <[email protected]> wr=
ote:
> Hi Inga, Luiz,
>
>
> On 04/03/2018 06:27 PM, Stotland, Inga wrote:
>>
>> Hi Robert, Luiz,
>>
>> -----Original Message-----
>> From: [email protected]
>> [mailto:[email protected]] On Behalf Of Robert Lubas
>> Sent: Tuesday, April 3, 2018 5:09 AM
>> To: Luiz Augusto von Dentz <[email protected]>
>> Cc: [email protected]
>> Subject: Re: [PATCH BlueZ 1/2] Mesh: Add Config Beacon to Configuration
>> Model
>>
>> Hi Luiz,
>>
>> On 04/03/2018 10:18 AM, Luiz Augusto von Dentz wrote:
>>>
>>> Hi Robert,
>>>
>>> On Mon, Apr 2, 2018 at 10:29 PM, Robert Luba=C5=9B <robert.lubas@silvai=
r.com>
>>> wrote:
>>>>
>>>> This patch adds two commands (set and get) to menu config and handles
>>>> the incomming status message.
>>>> ---
>>>> mesh/config-client.c | 42 +++++++++++++++++++++++++++++++++++++++++=
+
>>>> 1 file changed, 42 insertions(+)
>>>>
>>>> diff --git a/mesh/config-client.c b/mesh/config-client.c index
>>>> 95297bfee..4e5e06258 100644
>>>> --- a/mesh/config-client.c
>>>> +++ b/mesh/config-client.c
>>>> @@ -179,6 +179,13 @@ static bool client_msg_recvd(uint16_t src, uint8_=
t
>>>> *data,
>>>> mesh_status_str(data[0]));
>>>> break;
>>>>
>>>> + case OP_CONFIG_BEACON_STATUS:
>>>> + if (len !=3D 1)
>>>> + return true;
>>>> + bt_shell_printf("Node %4.4x Config Beacon Status
>>>> 0x%02x\n",
>>>> + src, data[0]);
>>>> + break;
>>>> +
>>>> case OP_CONFIG_RELAY_STATUS:
>>>> if (len !=3D 2)
>>>> return true; @@ -689,6 +696,37 @@ static
>>>> void cmd_bind(int argc, char *argv[])
>>>> return bt_shell_noninteractive_quit(EXIT_SUCCESS);
>>>> }
>>>>
>>>> +static void cmd_beacon_set(int argc, char *argv[]) {
>>>> + uint16_t n;
>>>> + uint8_t msg[2 + 1];
>>>> + int parm_cnt;
>>>> +
>>>> + if (!verify_config_target(target))
>>>> + return bt_shell_noninteractive_quit(EXIT_FAILURE);
>>>> +
>>>> + n =3D mesh_opcode_set(OP_CONFIG_BEACON_SET, msg);
>>>> +
>>>> + parm_cnt =3D read_input_parameters(argc, argv);
>>>> + if (parm_cnt !=3D 1) {
>>>> + bt_shell_printf("bad arguments\n");
>>>> + return bt_shell_noninteractive_quit(EXIT_FAILURE);
>>>> + }
>>>> +
>>>> + msg[n++] =3D parms[0];
>>>> +
>>>> + if (!config_send(msg, n)) {
>>>> + bt_shell_printf("Failed to send \"SET BEACON\"\n");
>>>> + return;
>>>> + }
>>>> +
>>>> + return bt_shell_noninteractive_quit(EXIT_SUCCESS);}
>>>
>>>
>>> You should have a like break before }
>>>
>>>> +
>>>> +static void cmd_beacon_get(int argc, char *argv[]) {
>>>> + cmd_default(OP_CONFIG_BEACON_GET);
>>>> +}
>>>> +
>>>> static void cmd_ident_set(int argc, char *argv[])
>>>> {
>>>> uint16_t n;
>>>> @@ -1178,6 +1216,10 @@ static const struct bt_shell_menu cfg_menu =3D =
{
>>>> "Set node identity
>>>> state"},
>>>> {"ident-get", "<net_idx>", cmd_ident_ge=
t,
>>>> "Get node identity
>>>> state"},
>>>> + {"beacon-set", "<state>", cmd_beacon_set=
,
>>>> + "Set node identity
>>>> state"},
>>>> + {"beacon-get", NULL, cmd_beacon_get=
,
>>>> + "Get node beacon
>>>> + state"},
>>>> {"relay-set", "<relay> <rexmt count> <rexmt steps>=
",
>>>> cmd_relay_set,
>>>> "Set relay"},
>>>> --
>>>> 2.11.0
>>>
>>>
>>> Other than this looks good, lets see if Inga has anything to comment.
>>>
>> The broken line goes to V2.
>>
>> Thanks
>> --
>>
>> The patches look fine.
>> Thanks,
>> Inga
>>
>>
>
> I include small fix (broken line) after Luiz review. There is a separate
> dangling e-mail with patch.
Applied, thanks.
--=20
Luiz Augusto von Dentz
Hi Inga, Luiz,
On 04/03/2018 06:27 PM, Stotland, Inga wrote:
> Hi Robert, Luiz,
>
> -----Original Message-----
> From: [email protected] [mailto:[email protected]] On Behalf Of Robert Lubas
> Sent: Tuesday, April 3, 2018 5:09 AM
> To: Luiz Augusto von Dentz <[email protected]>
> Cc: [email protected]
> Subject: Re: [PATCH BlueZ 1/2] Mesh: Add Config Beacon to Configuration Model
>
> Hi Luiz,
>
> On 04/03/2018 10:18 AM, Luiz Augusto von Dentz wrote:
>> Hi Robert,
>>
>> On Mon, Apr 2, 2018 at 10:29 PM, Robert Lubaś <[email protected]> wrote:
>>> This patch adds two commands (set and get) to menu config and handles
>>> the incomming status message.
>>> ---
>>> mesh/config-client.c | 42 ++++++++++++++++++++++++++++++++++++++++++
>>> 1 file changed, 42 insertions(+)
>>>
>>> diff --git a/mesh/config-client.c b/mesh/config-client.c index
>>> 95297bfee..4e5e06258 100644
>>> --- a/mesh/config-client.c
>>> +++ b/mesh/config-client.c
>>> @@ -179,6 +179,13 @@ static bool client_msg_recvd(uint16_t src, uint8_t *data,
>>> mesh_status_str(data[0]));
>>> break;
>>>
>>> + case OP_CONFIG_BEACON_STATUS:
>>> + if (len != 1)
>>> + return true;
>>> + bt_shell_printf("Node %4.4x Config Beacon Status 0x%02x\n",
>>> + src, data[0]);
>>> + break;
>>> +
>>> case OP_CONFIG_RELAY_STATUS:
>>> if (len != 2)
>>> return true; @@ -689,6 +696,37 @@ static
>>> void cmd_bind(int argc, char *argv[])
>>> return bt_shell_noninteractive_quit(EXIT_SUCCESS);
>>> }
>>>
>>> +static void cmd_beacon_set(int argc, char *argv[]) {
>>> + uint16_t n;
>>> + uint8_t msg[2 + 1];
>>> + int parm_cnt;
>>> +
>>> + if (!verify_config_target(target))
>>> + return bt_shell_noninteractive_quit(EXIT_FAILURE);
>>> +
>>> + n = mesh_opcode_set(OP_CONFIG_BEACON_SET, msg);
>>> +
>>> + parm_cnt = read_input_parameters(argc, argv);
>>> + if (parm_cnt != 1) {
>>> + bt_shell_printf("bad arguments\n");
>>> + return bt_shell_noninteractive_quit(EXIT_FAILURE);
>>> + }
>>> +
>>> + msg[n++] = parms[0];
>>> +
>>> + if (!config_send(msg, n)) {
>>> + bt_shell_printf("Failed to send \"SET BEACON\"\n");
>>> + return;
>>> + }
>>> +
>>> + return bt_shell_noninteractive_quit(EXIT_SUCCESS);}
>>
>> You should have a like break before }
>>
>>> +
>>> +static void cmd_beacon_get(int argc, char *argv[]) {
>>> + cmd_default(OP_CONFIG_BEACON_GET);
>>> +}
>>> +
>>> static void cmd_ident_set(int argc, char *argv[])
>>> {
>>> uint16_t n;
>>> @@ -1178,6 +1216,10 @@ static const struct bt_shell_menu cfg_menu = {
>>> "Set node identity state"},
>>> {"ident-get", "<net_idx>", cmd_ident_get,
>>> "Get node identity
>>> state"},
>>> + {"beacon-set", "<state>", cmd_beacon_set,
>>> + "Set node identity state"},
>>> + {"beacon-get", NULL, cmd_beacon_get,
>>> + "Get node beacon
>>> + state"},
>>> {"relay-set", "<relay> <rexmt count> <rexmt steps>",
>>> cmd_relay_set,
>>> "Set relay"},
>>> --
>>> 2.11.0
>>
>> Other than this looks good, lets see if Inga has anything to comment.
>>
> The broken line goes to V2.
>
> Thanks
> --
>
> The patches look fine.
> Thanks,
> Inga
>
>
I include small fix (broken line) after Luiz review. There is a separate
dangling e-mail with patch.
Robert
SGkgUm9iZXJ0LCBMdWl6LA0KDQotLS0tLU9yaWdpbmFsIE1lc3NhZ2UtLS0tLQ0KRnJvbTogbGlu
dXgtYmx1ZXRvb3RoLW93bmVyQHZnZXIua2VybmVsLm9yZyBbbWFpbHRvOmxpbnV4LWJsdWV0b290
aC1vd25lckB2Z2VyLmtlcm5lbC5vcmddIE9uIEJlaGFsZiBPZiBSb2JlcnQgTHViYXMNClNlbnQ6
IFR1ZXNkYXksIEFwcmlsIDMsIDIwMTggNTowOSBBTQ0KVG86IEx1aXogQXVndXN0byB2b24gRGVu
dHogPGx1aXouZGVudHpAZ21haWwuY29tPg0KQ2M6IGxpbnV4LWJsdWV0b290aEB2Z2VyLmtlcm5l
bC5vcmcNClN1YmplY3Q6IFJlOiBbUEFUQ0ggQmx1ZVogMS8yXSBNZXNoOiBBZGQgQ29uZmlnIEJl
YWNvbiB0byBDb25maWd1cmF0aW9uIE1vZGVsDQoNCkhpIEx1aXosDQoNCk9uIDA0LzAzLzIwMTgg
MTA6MTggQU0sIEx1aXogQXVndXN0byB2b24gRGVudHogd3JvdGU6DQo+IEhpIFJvYmVydCwNCj4g
DQo+IE9uIE1vbiwgQXByIDIsIDIwMTggYXQgMTA6MjkgUE0sIFJvYmVydCBMdWJhxZsgPHJvYmVy
dC5sdWJhc0BzaWx2YWlyLmNvbT4gd3JvdGU6DQo+PiBUaGlzIHBhdGNoIGFkZHMgdHdvIGNvbW1h
bmRzIChzZXQgYW5kIGdldCkgdG8gbWVudSBjb25maWcgYW5kIGhhbmRsZXMgDQo+PiB0aGUgaW5j
b21taW5nIHN0YXR1cyBtZXNzYWdlLg0KPj4gLS0tDQo+PiAgIG1lc2gvY29uZmlnLWNsaWVudC5j
IHwgNDIgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrDQo+PiAgIDEg
ZmlsZSBjaGFuZ2VkLCA0MiBpbnNlcnRpb25zKCspDQo+Pg0KPj4gZGlmZiAtLWdpdCBhL21lc2gv
Y29uZmlnLWNsaWVudC5jIGIvbWVzaC9jb25maWctY2xpZW50LmMgaW5kZXggDQo+PiA5NTI5N2Jm
ZWUuLjRlNWUwNjI1OCAxMDA2NDQNCj4+IC0tLSBhL21lc2gvY29uZmlnLWNsaWVudC5jDQo+PiAr
KysgYi9tZXNoL2NvbmZpZy1jbGllbnQuYw0KPj4gQEAgLTE3OSw2ICsxNzksMTMgQEAgc3RhdGlj
IGJvb2wgY2xpZW50X21zZ19yZWN2ZCh1aW50MTZfdCBzcmMsIHVpbnQ4X3QgKmRhdGEsDQo+PiAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtZXNoX3N0YXR1c19zdHIoZGF0YVswXSkp
Ow0KPj4gICAgICAgICAgICAgICAgICBicmVhazsNCj4+DQo+PiArICAgICAgIGNhc2UgT1BfQ09O
RklHX0JFQUNPTl9TVEFUVVM6DQo+PiArICAgICAgICAgICAgICAgaWYgKGxlbiAhPSAxKQ0KPj4g
KyAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7DQo+PiArICAgICAgICAgICAgICAg
YnRfc2hlbGxfcHJpbnRmKCJOb2RlICU0LjR4IENvbmZpZyBCZWFjb24gU3RhdHVzIDB4JTAyeFxu
IiwNCj4+ICsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3JjLCBkYXRhWzBdKTsNCj4+
ICsgICAgICAgICAgICAgICBicmVhazsNCj4+ICsNCj4+ICAgICAgICAgIGNhc2UgT1BfQ09ORklH
X1JFTEFZX1NUQVRVUzoNCj4+ICAgICAgICAgICAgICAgICAgaWYgKGxlbiAhPSAyKQ0KPj4gICAg
ICAgICAgICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOyBAQCAtNjg5LDYgKzY5NiwzNyBAQCBz
dGF0aWMgDQo+PiB2b2lkIGNtZF9iaW5kKGludCBhcmdjLCBjaGFyICphcmd2W10pDQo+PiAgICAg
ICAgICByZXR1cm4gYnRfc2hlbGxfbm9uaW50ZXJhY3RpdmVfcXVpdChFWElUX1NVQ0NFU1MpOw0K
Pj4gICB9DQo+Pg0KPj4gK3N0YXRpYyB2b2lkIGNtZF9iZWFjb25fc2V0KGludCBhcmdjLCBjaGFy
ICphcmd2W10pIHsNCj4+ICsgICAgICAgdWludDE2X3QgbjsNCj4+ICsgICAgICAgdWludDhfdCBt
c2dbMiArIDFdOw0KPj4gKyAgICAgICBpbnQgcGFybV9jbnQ7DQo+PiArDQo+PiArICAgICAgIGlm
ICghdmVyaWZ5X2NvbmZpZ190YXJnZXQodGFyZ2V0KSkNCj4+ICsgICAgICAgICAgICAgICByZXR1
cm4gYnRfc2hlbGxfbm9uaW50ZXJhY3RpdmVfcXVpdChFWElUX0ZBSUxVUkUpOw0KPj4gKw0KPj4g
KyAgICAgICBuID0gbWVzaF9vcGNvZGVfc2V0KE9QX0NPTkZJR19CRUFDT05fU0VULCBtc2cpOw0K
Pj4gKw0KPj4gKyAgICAgICBwYXJtX2NudCA9IHJlYWRfaW5wdXRfcGFyYW1ldGVycyhhcmdjLCBh
cmd2KTsNCj4+ICsgICAgICAgaWYgKHBhcm1fY250ICE9IDEpIHsNCj4+ICsgICAgICAgICAgICAg
ICBidF9zaGVsbF9wcmludGYoImJhZCBhcmd1bWVudHNcbiIpOw0KPj4gKyAgICAgICAgICAgICAg
IHJldHVybiBidF9zaGVsbF9ub25pbnRlcmFjdGl2ZV9xdWl0KEVYSVRfRkFJTFVSRSk7DQo+PiAr
ICAgICAgIH0NCj4+ICsNCj4+ICsgICAgICAgbXNnW24rK10gPSBwYXJtc1swXTsNCj4+ICsNCj4+
ICsgICAgICAgaWYgKCFjb25maWdfc2VuZChtc2csIG4pKSB7DQo+PiArICAgICAgICAgICAgICAg
YnRfc2hlbGxfcHJpbnRmKCJGYWlsZWQgdG8gc2VuZCBcIlNFVCBCRUFDT05cIlxuIik7DQo+PiAr
ICAgICAgICAgICAgICAgcmV0dXJuOw0KPj4gKyAgICAgICB9DQo+PiArDQo+PiArICAgICAgIHJl
dHVybiBidF9zaGVsbF9ub25pbnRlcmFjdGl2ZV9xdWl0KEVYSVRfU1VDQ0VTUyk7fQ0KPiANCj4g
WW91IHNob3VsZCBoYXZlIGEgbGlrZSBicmVhayBiZWZvcmUgfQ0KPiANCj4+ICsNCj4+ICtzdGF0
aWMgdm9pZCBjbWRfYmVhY29uX2dldChpbnQgYXJnYywgY2hhciAqYXJndltdKSB7DQo+PiArICAg
ICAgIGNtZF9kZWZhdWx0KE9QX0NPTkZJR19CRUFDT05fR0VUKTsNCj4+ICt9DQo+PiArDQo+PiAg
IHN0YXRpYyB2b2lkIGNtZF9pZGVudF9zZXQoaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkNCj4+ICAg
ew0KPj4gICAgICAgICAgdWludDE2X3QgbjsNCj4+IEBAIC0xMTc4LDYgKzEyMTYsMTAgQEAgc3Rh
dGljIGNvbnN0IHN0cnVjdCBidF9zaGVsbF9tZW51IGNmZ19tZW51ID0gew0KPj4gICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJTZXQgbm9kZSBpZGVudGl0
eSBzdGF0ZSJ9LA0KPj4gICAgICAgICAgeyJpZGVudC1nZXQiLCAgICAgICAgICAgIjxuZXRfaWR4
PiIsICAgICAgICAgICAgY21kX2lkZW50X2dldCwNCj4+ICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAiR2V0IG5vZGUgaWRlbnRpdHkgDQo+PiBzdGF0ZSJ9
LA0KPj4gKyAgICAgICB7ImJlYWNvbi1zZXQiLCAgICAgICAgICAgIjxzdGF0ZT4iLCAgICAgICAg
ICAgICBjbWRfYmVhY29uX3NldCwNCj4+ICsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICJTZXQgbm9kZSBpZGVudGl0eSBzdGF0ZSJ9LA0KPj4gKyAgICAgICB7
ImJlYWNvbi1nZXQiLCAgICAgICAgICAgTlVMTCwgICAgICAgICAgICAgICAgICBjbWRfYmVhY29u
X2dldCwNCj4+ICsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICJHZXQgbm9kZSBiZWFjb24gDQo+PiArIHN0YXRlIn0sDQo+PiAgICAgICAgICB7InJlbGF5LXNl
dCIsICAgICAgICAgICAiPHJlbGF5PiA8cmV4bXQgY291bnQ+IDxyZXhtdCBzdGVwcz4iLA0KPj4g
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNtZF9yZWxh
eV9zZXQsDQo+PiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgIlNldCByZWxheSJ9LA0KPj4gLS0NCj4+IDIuMTEuMA0KPiANCj4gT3RoZXIgdGhhbiB0aGlz
IGxvb2tzIGdvb2QsIGxldHMgc2VlIGlmIEluZ2EgaGFzIGFueXRoaW5nIHRvIGNvbW1lbnQuDQo+
IA0KVGhlIGJyb2tlbiBsaW5lIGdvZXMgdG8gVjIuDQoNClRoYW5rcw0KLS0NCg0KVGhlIHBhdGNo
ZXMgbG9vayBmaW5lLg0KVGhhbmtzLA0KSW5nYQ0KDQo=
Hi Luiz,
On 04/03/2018 10:18 AM, Luiz Augusto von Dentz wrote:
> Hi Robert,
>
> On Mon, Apr 2, 2018 at 10:29 PM, Robert Lubaś <[email protected]> wrote:
>> This patch adds two commands (set and get) to menu config and handles the
>> incomming status message.
>> ---
>> mesh/config-client.c | 42 ++++++++++++++++++++++++++++++++++++++++++
>> 1 file changed, 42 insertions(+)
>>
>> diff --git a/mesh/config-client.c b/mesh/config-client.c
>> index 95297bfee..4e5e06258 100644
>> --- a/mesh/config-client.c
>> +++ b/mesh/config-client.c
>> @@ -179,6 +179,13 @@ static bool client_msg_recvd(uint16_t src, uint8_t *data,
>> mesh_status_str(data[0]));
>> break;
>>
>> + case OP_CONFIG_BEACON_STATUS:
>> + if (len != 1)
>> + return true;
>> + bt_shell_printf("Node %4.4x Config Beacon Status 0x%02x\n",
>> + src, data[0]);
>> + break;
>> +
>> case OP_CONFIG_RELAY_STATUS:
>> if (len != 2)
>> return true;
>> @@ -689,6 +696,37 @@ static void cmd_bind(int argc, char *argv[])
>> return bt_shell_noninteractive_quit(EXIT_SUCCESS);
>> }
>>
>> +static void cmd_beacon_set(int argc, char *argv[])
>> +{
>> + uint16_t n;
>> + uint8_t msg[2 + 1];
>> + int parm_cnt;
>> +
>> + if (!verify_config_target(target))
>> + return bt_shell_noninteractive_quit(EXIT_FAILURE);
>> +
>> + n = mesh_opcode_set(OP_CONFIG_BEACON_SET, msg);
>> +
>> + parm_cnt = read_input_parameters(argc, argv);
>> + if (parm_cnt != 1) {
>> + bt_shell_printf("bad arguments\n");
>> + return bt_shell_noninteractive_quit(EXIT_FAILURE);
>> + }
>> +
>> + msg[n++] = parms[0];
>> +
>> + if (!config_send(msg, n)) {
>> + bt_shell_printf("Failed to send \"SET BEACON\"\n");
>> + return;
>> + }
>> +
>> + return bt_shell_noninteractive_quit(EXIT_SUCCESS);}
>
> You should have a like break before }
>
>> +
>> +static void cmd_beacon_get(int argc, char *argv[])
>> +{
>> + cmd_default(OP_CONFIG_BEACON_GET);
>> +}
>> +
>> static void cmd_ident_set(int argc, char *argv[])
>> {
>> uint16_t n;
>> @@ -1178,6 +1216,10 @@ static const struct bt_shell_menu cfg_menu = {
>> "Set node identity state"},
>> {"ident-get", "<net_idx>", cmd_ident_get,
>> "Get node identity state"},
>> + {"beacon-set", "<state>", cmd_beacon_set,
>> + "Set node identity state"},
>> + {"beacon-get", NULL, cmd_beacon_get,
>> + "Get node beacon state"},
>> {"relay-set", "<relay> <rexmt count> <rexmt steps>",
>> cmd_relay_set,
>> "Set relay"},
>> --
>> 2.11.0
>
> Other than this looks good, lets see if Inga has anything to comment.
>
The broken line goes to V2.
Thanks
Hi Robert,
On Mon, Apr 2, 2018 at 10:29 PM, Robert Luba=C5=9B <[email protected]=
m> wrote:
> This patch adds two commands (set and get) to menu config and handles the
> incomming status message.
> ---
> mesh/config-client.c | 42 ++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 42 insertions(+)
>
> diff --git a/mesh/config-client.c b/mesh/config-client.c
> index 95297bfee..4e5e06258 100644
> --- a/mesh/config-client.c
> +++ b/mesh/config-client.c
> @@ -179,6 +179,13 @@ static bool client_msg_recvd(uint16_t src, uint8_t *=
data,
> mesh_status_str(data[0]));
> break;
>
> + case OP_CONFIG_BEACON_STATUS:
> + if (len !=3D 1)
> + return true;
> + bt_shell_printf("Node %4.4x Config Beacon Status 0x%02x\n=
",
> + src, data[0]);
> + break;
> +
> case OP_CONFIG_RELAY_STATUS:
> if (len !=3D 2)
> return true;
> @@ -689,6 +696,37 @@ static void cmd_bind(int argc, char *argv[])
> return bt_shell_noninteractive_quit(EXIT_SUCCESS);
> }
>
> +static void cmd_beacon_set(int argc, char *argv[])
> +{
> + uint16_t n;
> + uint8_t msg[2 + 1];
> + int parm_cnt;
> +
> + if (!verify_config_target(target))
> + return bt_shell_noninteractive_quit(EXIT_FAILURE);
> +
> + n =3D mesh_opcode_set(OP_CONFIG_BEACON_SET, msg);
> +
> + parm_cnt =3D read_input_parameters(argc, argv);
> + if (parm_cnt !=3D 1) {
> + bt_shell_printf("bad arguments\n");
> + return bt_shell_noninteractive_quit(EXIT_FAILURE);
> + }
> +
> + msg[n++] =3D parms[0];
> +
> + if (!config_send(msg, n)) {
> + bt_shell_printf("Failed to send \"SET BEACON\"\n");
> + return;
> + }
> +
> + return bt_shell_noninteractive_quit(EXIT_SUCCESS);}
You should have a like break before }
> +
> +static void cmd_beacon_get(int argc, char *argv[])
> +{
> + cmd_default(OP_CONFIG_BEACON_GET);
> +}
> +
> static void cmd_ident_set(int argc, char *argv[])
> {
> uint16_t n;
> @@ -1178,6 +1216,10 @@ static const struct bt_shell_menu cfg_menu =3D {
> "Set node identity state"=
},
> {"ident-get", "<net_idx>", cmd_ident_get,
> "Get node identity state"=
},
> + {"beacon-set", "<state>", cmd_beacon_set,
> + "Set node identity state"=
},
> + {"beacon-get", NULL, cmd_beacon_get,
> + "Get node beacon state"},
> {"relay-set", "<relay> <rexmt count> <rexmt steps>",
> cmd_relay_set,
> "Set relay"},
> --
> 2.11.0
Other than this looks good, lets see if Inga has anything to comment.
--=20
Luiz Augusto von Dentz
According to the 4.3.2.10 Config GATT Proxy Set, message should have only 1
byte.
---
mesh/config-client.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/mesh/config-client.c b/mesh/config-client.c
index 4e5e06258..801bbf710 100644
--- a/mesh/config-client.c
+++ b/mesh/config-client.c
@@ -787,7 +787,7 @@ static void cmd_ident_get(int argc, char *argv[])
static void cmd_proxy_set(int argc, char *argv[])
{
uint16_t n;
- uint8_t msg[2 + 1 + 4];
+ uint8_t msg[2 + 1];
int parm_cnt;
if (!verify_config_target(target))
@@ -802,7 +802,6 @@ static void cmd_proxy_set(int argc, char *argv[])
}
msg[n++] = parms[0];
- msg[n++] = parms[1];
if (!config_send(msg, n)) {
bt_shell_printf("Failed to send \"SET PROXY\"\n");
--
2.11.0