wn/libmbus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fix problem with multiple selected devices (secondary address) resend "

Browse Source 
This reverts commit 1fa5e202fb5af6c343d0597693185aa406dda7a9.
This commit is contained in:
Stefan Wahren 2012-07-04 21:15:55 +02:00
parent 1fa5e202fb
commit 736181b35e
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bin/mbus-serial-request-data-multi-reply.c
View File

@ -101,7 +101,7 @@ main(int argc, char **argv)
frame->address = MBUS_ADDRESS_NETWORK_LAYER;
if (debug)
printf("%s: debug: sending init frame #1\n", __PRETTY_FUNCTION__);
printf("%s: debug: sending init frame\n", __PRETTY_FUNCTION__);
if (mbus_send_frame(handle, frame) == -1)
{
@ -110,27 +110,8 @@ main(int argc, char **argv)
return 1;
}
while (mbus_recv_frame(handle, &reply) != -1);
mbus_recv_frame(handle, &reply);
//
// resend SND_NKE, maybe the first get lost
//
frame->control = MBUS_CONTROL_MASK_SND_NKE | MBUS_CONTROL_MASK_DIR_M2S;
frame->address = MBUS_ADDRESS_NETWORK_LAYER;
if (debug)
printf("%s: debug: sending init frame #2\n", __PRETTY_FUNCTION__);
if (mbus_send_frame(handle, frame) == -1)
{
fprintf(stderr, "Failed to send mbus frame.\n");
mbus_frame_free(frame);
return 1;
}
while (mbus_recv_frame(handle, &reply) != -1);
if (strlen(addr_str) == 16)
{
// secondary addressing