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

Fixed primary address scan

Browse Source 
- scan only normal addresses (0-250)
- show collisions in scan result
This commit is contained in:
Stefan Wahren 2012-05-20 03:35:04 +02:00
parent eb96afcd7c
commit 1fb68d1e05
1 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
bin/mbus-serial-scan.c
View File

@ -28,6 +28,7 @@ main(int argc, char **argv)
mbus_handle *handle;
char *device;
int address, baudrate = 9600;
int ret;
if (argc == 2)
{
@ -76,7 +77,7 @@ main(int argc, char **argv)
if (debug)
printf("Scanning primary addresses:\n");
for (address = 0; address < 254; address++)
for (address = 0; address <= 250; address++)
{
mbus_frame reply;
@ -93,16 +94,41 @@ main(int argc, char **argv)
printf("Scan failed. Could not send ping frame: %s\n", mbus_error_str());
return 1;
}
ret = mbus_recv_frame(handle, &reply);
if (mbus_recv_frame(handle, &reply) == -1)
if (ret == -1)
{
continue;
}
}
if (debug)
printf("\n");
if (ret == -2)
{
/* check for more data (collision) */
while (mbus_recv_frame(handle, &reply) != -1);
printf("Collision at address %d\n", address);
continue;
}
if (mbus_frame_type(&reply) == MBUS_FRAME_TYPE_ACK)
{
if (debug)
printf("\n");
/* check for more data (collision) */
while (mbus_recv_frame(handle, &reply) != -1)
{
ret = -2;
}
if (ret == -2)
{
printf("Collision at address %d\n", address);
continue;
}
printf("Found a M-Bus device at address %d\n", address);
}