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

Merge pull request #12 from lategoodbye/master

Browse Source 
Improved serial communication
This commit is contained in:
Robert Johansson 2012-06-11 20:40:00 -07:00
commit d8819cb21f
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/mbus-serial-scan-secondary.c
View File

@ -137,7 +137,6 @@ main(int argc, char **argv)
} }
(void) mbus_recv_frame(handle, &reply); (void) mbus_recv_frame(handle, &reply);
sleep(1);
frame->control = MBUS_CONTROL_MASK_SND_NKE | MBUS_CONTROL_MASK_DIR_M2S; frame->control = MBUS_CONTROL_MASK_SND_NKE | MBUS_CONTROL_MASK_DIR_M2S;
frame->address = 0xFF; frame->address = 0xFF;
@ -150,7 +149,6 @@ main(int argc, char **argv)
} }
(void) mbus_recv_frame(handle, &reply); (void) mbus_recv_frame(handle, &reply);
sleep(1);
mbus_scan_2nd_address_range(handle, 0, addr_mask); mbus_scan_2nd_address_range(handle, 0, addr_mask);

5
mbus/mbus-protocol.c
View File

@ -788,6 +788,9 @@ mbus_data_product_name(mbus_data_variable_header *header)
{ {
switch (header->version) switch (header->version)
{ {
case 0x00:
strcpy(buff, ((header->medium == 0x06) ? "Engelmann WaterStar" : "Engelmann SensoStar 2"));
break;
case 0x01: case 0x01:
strcpy(buff,"Engelmann SensoStar 2C"); strcpy(buff,"Engelmann SensoStar 2C");
break; break;
@ -809,7 +812,7 @@ mbus_data_product_name(mbus_data_variable_header *header)
{ {
switch (header->version) switch (header->version)
{ {
case 0x02: case 0x28:
strcpy(buff,"ABB F95 Typ US770"); strcpy(buff,"ABB F95 Typ US770");
break; break;
} }

5
mbus/mbus-serial.c
View File

@ -213,6 +213,11 @@ mbus_serial_send_frame(mbus_serial_handle *handle, mbus_frame *frame)
return -1; return -1;
} }
//
// wait until complete frame has been transmitted
//
tcdrain(handle->fd);
return 0; return 0;
} }