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

Beautify: replace tabs with spaces and remove trailing spaces

Browse Source
This commit is contained in:
Dirk Zenker 2014-02-24 15:20:32 +01:00
parent f47caf151e
commit 5f0b5d5dd1
12 changed files with 237 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -216,6 +216,3 @@ main(int argc, char **argv)
return 0; return 0;
} }

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

@ -97,7 +97,7 @@ main(int argc, char **argv)
if (mbus_frame_type(&reply) == MBUS_FRAME_TYPE_ACK) if (mbus_frame_type(&reply) == MBUS_FRAME_TYPE_ACK)
{ {
if (mbus_send_request_frame(handle, MBUS_ADDRESS_NETWORK_LAYER) == -1) if (mbus_send_request_frame(handle, MBUS_ADDRESS_NETWORK_LAYER) == -1)
{ {
fprintf(stderr,"Failed to send request to selected secondary device: %s\n", mbus_error_str()); fprintf(stderr,"Failed to send request to selected secondary device: %s\n", mbus_error_str());
return 1; return 1;
} }

4
bin/mbus-tcp-raw-send.c
View File

@ -30,7 +30,7 @@ main(int argc, char **argv)
int address, result; int address, result;
FILE *fp = NULL; FILE *fp = NULL;
size_t buff_len, len; size_t buff_len, len;
unsigned char raw_buff[4096], buff[4096]; unsigned char raw_buff[4096], buff[4096];
memset((void *)&reply, 0, sizeof(mbus_frame)); memset((void *)&reply, 0, sizeof(mbus_frame));
memset((void *)&reply_data, 0, sizeof(mbus_frame_data)); memset((void *)&reply_data, 0, sizeof(mbus_frame_data));
@ -192,5 +192,3 @@ main(int argc, char **argv)
return 0; return 0;
} }

2
bin/mbus-tcp-select-secondary.c
View File

@ -88,7 +88,7 @@ main(int argc, char **argv)
if (mbus_frame_type(&reply) == MBUS_FRAME_TYPE_ACK) if (mbus_frame_type(&reply) == MBUS_FRAME_TYPE_ACK)
{ {
if (mbus_send_request_frame(handle, MBUS_ADDRESS_NETWORK_LAYER) == -1) if (mbus_send_request_frame(handle, MBUS_ADDRESS_NETWORK_LAYER) == -1)
{ {
fprintf(stderr,"Failed to send request to selected secondary device: %s\n", mbus_error_str()); fprintf(stderr,"Failed to send request to selected secondary device: %s\n", mbus_error_str());
return 1; return 1;
} }

72
mbus/mbus-protocol-aux.c
View File

@ -935,7 +935,7 @@ int mbus_variable_value_decode(mbus_data_record *record, double *value_out_real,
break; break;
case 0x07: /* 8 byte integer (64 bit) */ case 0x07: /* 8 byte integer (64 bit) */
result = mbus_data_long_long_decode(record->data, 8, &value_out_long_long); result = mbus_data_long_long_decode(record->data, 8, &value_out_long_long);
*value_out_real = value_out_long_long; *value_out_real = value_out_long_long;
break; break;
@ -1407,11 +1407,11 @@ mbus_data_variable_xml_normalized(mbus_data_variable *data)
len += snprintf(&buff[len], buff_size - len, " <StorageNumber>%ld</StorageNumber>\n", norm_record->storage_number); len += snprintf(&buff[len], buff_size - len, " <StorageNumber>%ld</StorageNumber>\n", norm_record->storage_number);
if (norm_record->tariff >= 0) if (norm_record->tariff >= 0)
{ {
len += snprintf(&buff[len], buff_size - len, " <Tariff>%ld</Tariff>\n", norm_record->tariff); len += snprintf(&buff[len], buff_size - len, " <Tariff>%ld</Tariff>\n", norm_record->tariff);
len += snprintf(&buff[len], buff_size - len, " <Device>%d</Device>\n", norm_record->device); len += snprintf(&buff[len], buff_size - len, " <Device>%d</Device>\n", norm_record->device);
} }
mbus_str_xml_encode(str_encoded, norm_record->unit, sizeof(str_encoded)); mbus_str_xml_encode(str_encoded, norm_record->unit, sizeof(str_encoded));
@ -1664,11 +1664,11 @@ mbus_recv_frame(mbus_handle * handle, mbus_frame *frame)
case MBUS_CONTROL_MASK_DIR_M2S: case MBUS_CONTROL_MASK_DIR_M2S:
if (handle->purge_first_frame == MBUS_FRAME_PURGE_M2S) if (handle->purge_first_frame == MBUS_FRAME_PURGE_M2S)
result = handle->recv(handle, frame); // purge echo and retry result = handle->recv(handle, frame); // purge echo and retry
break; break;
case MBUS_CONTROL_MASK_DIR_S2M: case MBUS_CONTROL_MASK_DIR_S2M:
if (handle->purge_first_frame == MBUS_FRAME_PURGE_S2M) if (handle->purge_first_frame == MBUS_FRAME_PURGE_S2M)
result = handle->recv(handle, frame); // purge echo and retry result = handle->recv(handle, frame); // purge echo and retry
break; break;
} }
if (frame != NULL) if (frame != NULL)
@ -1831,7 +1831,7 @@ mbus_send_application_reset_frame(mbus_handle * handle, int address, int subcode
if (subcode > 0xFF) if (subcode > 0xFF)
{ {
MBUS_ERROR("%s: invalid subcode %d\n", __PRETTY_FUNCTION__, subcode); MBUS_ERROR("%s: invalid subcode %d\n", __PRETTY_FUNCTION__, subcode);
return -1; return -1;
} }
@ -2239,16 +2239,16 @@ mbus_probe_secondary_address(mbus_handle *handle, const char *mask, char *matchi
ret = mbus_select_secondary_address(handle, mask); ret = mbus_select_secondary_address(handle, mask);
if (ret == MBUS_PROBE_SINGLE) if (ret == MBUS_PROBE_SINGLE)
{ {
/* send a data request command to find out the full address */ /* send a data request command to find out the full address */
if (mbus_send_request_frame(handle, MBUS_ADDRESS_NETWORK_LAYER) == -1) if (mbus_send_request_frame(handle, MBUS_ADDRESS_NETWORK_LAYER) == -1)
{ {
MBUS_ERROR("%s: Failed to send request to selected secondary device [mask %s]: %s.\n", MBUS_ERROR("%s: Failed to send request to selected secondary device [mask %s]: %s.\n",
__PRETTY_FUNCTION__, __PRETTY_FUNCTION__,
mask, mask,
mbus_error_str()); mbus_error_str());
return MBUS_PROBE_ERROR; return MBUS_PROBE_ERROR;
} }
memset((void *)&reply, 0, sizeof(mbus_frame)); memset((void *)&reply, 0, sizeof(mbus_frame));
ret = mbus_recv_frame(handle, &reply); ret = mbus_recv_frame(handle, &reply);
@ -2263,13 +2263,13 @@ mbus_probe_secondary_address(mbus_handle *handle, const char *mask, char *matchi
/* check for more data (collision) */ /* check for more data (collision) */
mbus_purge_frames(handle); mbus_purge_frames(handle);
return MBUS_PROBE_COLLISION; return MBUS_PROBE_COLLISION;
} }
/* check for more data (collision) */ /* check for more data (collision) */
if (mbus_purge_frames(handle)) if (mbus_purge_frames(handle))
{ {
return MBUS_PROBE_COLLISION; return MBUS_PROBE_COLLISION;
} }
if (mbus_frame_type(&reply) == MBUS_FRAME_TYPE_LONG) if (mbus_frame_type(&reply) == MBUS_FRAME_TYPE_LONG)
{ {
@ -2283,7 +2283,7 @@ mbus_probe_secondary_address(mbus_handle *handle, const char *mask, char *matchi
return MBUS_PROBE_NOTHING; return MBUS_PROBE_NOTHING;
} }
snprintf(matching_addr, 17, "%s", addr); snprintf(matching_addr, 17, "%s", addr);
if (handle->found_event) if (handle->found_event)
{ {
@ -2291,20 +2291,20 @@ mbus_probe_secondary_address(mbus_handle *handle, const char *mask, char *matchi
} }
return MBUS_PROBE_SINGLE; return MBUS_PROBE_SINGLE;
} }
else else
{ {
MBUS_ERROR("%s: Unexpected reply for address [mask %s]. Expected long frame.\n", MBUS_ERROR("%s: Unexpected reply for address [mask %s]. Expected long frame.\n",
__PRETTY_FUNCTION__, mask); __PRETTY_FUNCTION__, mask);
return MBUS_PROBE_NOTHING; return MBUS_PROBE_NOTHING;
} }
} }
else if ((ret == MBUS_PROBE_ERROR) || else if ((ret == MBUS_PROBE_ERROR) ||
(ret == MBUS_PROBE_COLLISION)) (ret == MBUS_PROBE_COLLISION))
{ {
break; break;
} }
} }
return ret; return ret;
} }

275
mbus/mbus-protocol.c
View File

@ -523,27 +523,27 @@ mbus_data_int_decode(unsigned char *int_data, size_t int_data_size, int *value)
if (!int_data || (int_data_size < 1)) if (!int_data || (int_data_size < 1))
{ {
return -1; return -1;
} }
neg = int_data[int_data_size-1] & 0x80; neg = int_data[int_data_size-1] & 0x80;
for (i = int_data_size; i > 0; i--) for (i = int_data_size; i > 0; i--)
{ {
if (neg) if (neg)
{ {
*value = (*value << 8) + (int_data[i-1] ^ 0xFF); *value = (*value << 8) + (int_data[i-1] ^ 0xFF);
} }
else else
{ {
*value = (*value << 8) + int_data[i-1]; *value = (*value << 8) + int_data[i-1];
} }
} }
if (neg) if (neg)
{ {
*value = *value * -1 - 1; *value = *value * -1 - 1;
} }
return 0; return 0;
} }
@ -557,27 +557,27 @@ mbus_data_long_decode(unsigned char *int_data, size_t int_data_size, long *value
if (!int_data || (int_data_size < 1)) if (!int_data || (int_data_size < 1))
{ {
return -1; return -1;
} }
neg = int_data[int_data_size-1] & 0x80; neg = int_data[int_data_size-1] & 0x80;
for (i = int_data_size; i > 0; i--) for (i = int_data_size; i > 0; i--)
{ {
if (neg) if (neg)
{ {
*value = (*value << 8) + (int_data[i-1] ^ 0xFF); *value = (*value << 8) + (int_data[i-1] ^ 0xFF);
} }
else else
{ {
*value = (*value << 8) + int_data[i-1]; *value = (*value << 8) + int_data[i-1];
} }
} }
if (neg) if (neg)
{ {
*value = *value * -1 - 1; *value = *value * -1 - 1;
} }
return 0; return 0;
} }
@ -591,27 +591,27 @@ mbus_data_long_long_decode(unsigned char *int_data, size_t int_data_size, long l
if (!int_data || (int_data_size < 1)) if (!int_data || (int_data_size < 1))
{ {
return -1; return -1;
} }
neg = int_data[int_data_size-1] & 0x80; neg = int_data[int_data_size-1] & 0x80;
for (i = int_data_size; i > 0; i--) for (i = int_data_size; i > 0; i--)
{ {
if (neg) if (neg)
{ {
*value = (*value << 8) + (int_data[i-1] ^ 0xFF); *value = (*value << 8) + (int_data[i-1] ^ 0xFF);
} }
else else
{ {
*value = (*value << 8) + int_data[i-1]; *value = (*value << 8) + int_data[i-1];
} }
} }
if (neg) if (neg)
{ {
*value = *value * -1 - 1; *value = *value * -1 - 1;
} }
return 0; return 0;
} }
@ -949,7 +949,7 @@ mbus_data_product_name(mbus_data_variable_header *header)
{ {
case 0xE6: case 0xE6:
strcpy(buff,"GMC-I A230 EMMOD 206"); strcpy(buff,"GMC-I A230 EMMOD 206");
break; break;
} }
} }
else if (manufacturer == mbus_manufacturer_id("SLB")) else if (manufacturer == mbus_manufacturer_id("SLB"))
@ -993,12 +993,12 @@ mbus_data_product_name(mbus_data_variable_header *header)
} }
else if (manufacturer == mbus_manufacturer_id("RAM")) else if (manufacturer == mbus_manufacturer_id("RAM"))
{ {
switch (header->version) switch (header->version)
{ {
case 0x03: case 0x03:
strcpy(buff, "Rossweiner ETK/ETW Modularis"); strcpy(buff, "Rossweiner ETK/ETW Modularis");
break; break;
} }
} }
else if (manufacturer == mbus_manufacturer_id("RKE")) else if (manufacturer == mbus_manufacturer_id("RKE"))
{ {
@ -1702,48 +1702,47 @@ mbus_unit_prefix(int exp)
unsigned char unsigned char
mbus_dif_datalength_lookup(unsigned char dif) mbus_dif_datalength_lookup(unsigned char dif)
{ {
switch (dif & MBUS_DATA_RECORD_DIF_MASK_DATA) switch (dif & MBUS_DATA_RECORD_DIF_MASK_DATA)
{ {
case 0x0: case 0x0:
return 0; return 0;
case 0x1: case 0x1:
return 1; return 1;
case 0x2: case 0x2:
return 2; return 2;
case 0x3: case 0x3:
return 3; return 3;
case 0x4: case 0x4:
return 4; return 4;
case 0x5: case 0x5:
return 4; return 4;
case 0x6: case 0x6:
return 6; return 6;
case 0x7: case 0x7:
return 8; return 8;
case 0x8:
case 0x8: return 0;
return 0; case 0x9:
case 0x9: return 1;
return 1; case 0xA:
case 0xA: return 2;
return 2; case 0xB:
case 0xB: return 3;
return 3; case 0xC:
case 0xC: return 4;
return 4; case 0xD:
case 0xD:
// variable data length, // variable data length,
// data length stored in data field // data length stored in data field
return 0; return 0;
case 0xE: case 0xE:
return 6; return 6;
case 0xF: case 0xF:
return 8; return 8;
default: // never reached default: // never reached
return 0x00; return 0x00;
} }
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -1947,7 +1946,7 @@ mbus_vif_unit_lookup(unsigned char vif)
// nn = 10 hours // nn = 10 hours
// nn = 11 days // nn = 11 days
// E010 01nn Operating Time coded like OnTime // E010 01nn Operating Time coded like OnTime
// E111 00nn Averaging Duration coded like OnTime // E111 00nn Averaging Duration coded like OnTime
// E111 01nn Actuality Duration coded like OnTime // E111 01nn Actuality Duration coded like OnTime
case 0x20: case 0x20:
case 0x20+1: case 0x20+1:
@ -2209,10 +2208,10 @@ mbus_vib_unit_lookup(mbus_value_information_block *vib)
snprintf(buff, sizeof(buff), "Password"); snprintf(buff, sizeof(buff), "Password");
} }
else if (vib->vife[0] == 0x17 || vib->vife[0] == 0x97) else if (vib->vife[0] == 0x17 || vib->vife[0] == 0x97)
{ {
// VIFE = E001 0111 Error flags // VIFE = E001 0111 Error flags
snprintf(buff, sizeof(buff), "Error flags"); snprintf(buff, sizeof(buff), "Error flags");
} }
else if (vib->vife[0] == 0x10) else if (vib->vife[0] == 0x10)
{ {
// VIFE = E001 0000 Customer location // VIFE = E001 0000 Customer location
@ -2545,25 +2544,25 @@ mbus_data_record_value(mbus_data_record *record)
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
long mbus_data_record_storage_number(mbus_data_record *record) long mbus_data_record_storage_number(mbus_data_record *record)
{ {
int bit_index = 0; int bit_index = 0;
long result = 0; long result = 0;
int i; int i;
if (record) if (record)
{ {
result |= (record->drh.dib.dif & MBUS_DATA_RECORD_DIF_MASK_STORAGE_NO) >> 6; result |= (record->drh.dib.dif & MBUS_DATA_RECORD_DIF_MASK_STORAGE_NO) >> 6;
bit_index++; bit_index++;
for (i=0; i<record->drh.dib.ndife; i++) for (i=0; i<record->drh.dib.ndife; i++)
{ {
result |= (record->drh.dib.dife[i] & MBUS_DATA_RECORD_DIFE_MASK_STORAGE_NO) << bit_index; result |= (record->drh.dib.dife[i] & MBUS_DATA_RECORD_DIFE_MASK_STORAGE_NO) << bit_index;
bit_index += 4; bit_index += 4;
} }
return result; return result;
} }
return -1; return -1;
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -2571,22 +2570,22 @@ long mbus_data_record_storage_number(mbus_data_record *record)
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
long mbus_data_record_tariff(mbus_data_record *record) long mbus_data_record_tariff(mbus_data_record *record)
{ {
int bit_index = 0; int bit_index = 0;
long result = 0; long result = 0;
int i; int i;
if (record && (record->drh.dib.ndife > 0)) if (record && (record->drh.dib.ndife > 0))
{ {
for (i=0; i<record->drh.dib.ndife; i++) for (i=0; i<record->drh.dib.ndife; i++)
{ {
result |= ((record->drh.dib.dife[i] & MBUS_DATA_RECORD_DIFE_MASK_TARIFF) >> 4) << bit_index; result |= ((record->drh.dib.dife[i] & MBUS_DATA_RECORD_DIFE_MASK_TARIFF) >> 4) << bit_index;
bit_index += 2; bit_index += 2;
} }
return result; return result;
} }
return -1; return -1;
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -2594,22 +2593,22 @@ long mbus_data_record_tariff(mbus_data_record *record)
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
int mbus_data_record_device(mbus_data_record *record) int mbus_data_record_device(mbus_data_record *record)
{ {
int bit_index = 0; int bit_index = 0;
int result = 0; int result = 0;
int i; int i;
if (record && (record->drh.dib.ndife > 0)) if (record && (record->drh.dib.ndife > 0))
{ {
for (i=0; i<record->drh.dib.ndife; i++) for (i=0; i<record->drh.dib.ndife; i++)
{ {
result |= ((record->drh.dib.dife[i] & MBUS_DATA_RECORD_DIFE_MASK_DEVICE) >> 6) << bit_index; result |= ((record->drh.dib.dife[i] & MBUS_DATA_RECORD_DIFE_MASK_DEVICE) >> 6) << bit_index;
bit_index++; bit_index++;
} }
return result; return result;
} }
return -1; return -1;
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -3561,7 +3560,7 @@ mbus_data_variable_print(mbus_data_variable *data)
int int
mbus_data_fixed_print(mbus_data_fixed *data) mbus_data_fixed_print(mbus_data_fixed *data)
{ {
int val; int val;
if (data) if (data)
{ {
@ -3574,12 +3573,11 @@ mbus_data_fixed_print(mbus_data_fixed *data)
printf("%s: Unit1 = %s\n", __PRETTY_FUNCTION__, mbus_data_fixed_unit(data->cnt1_type)); printf("%s: Unit1 = %s\n", __PRETTY_FUNCTION__, mbus_data_fixed_unit(data->cnt1_type));
if ((data->status & MBUS_DATA_FIXED_STATUS_FORMAT_MASK) == MBUS_DATA_FIXED_STATUS_FORMAT_BCD) if ((data->status & MBUS_DATA_FIXED_STATUS_FORMAT_MASK) == MBUS_DATA_FIXED_STATUS_FORMAT_BCD)
{ {
val = mbus_data_bcd_decode(data->cnt1_val, 4); val = mbus_data_bcd_decode(data->cnt1_val, 4);
} }
else else
{ {
mbus_data_int_decode(data->cnt1_val, 4, &val); mbus_data_int_decode(data->cnt1_val, 4, &val);
} }
printf("%s: Counter1 = %d\n", __PRETTY_FUNCTION__, val); printf("%s: Counter1 = %d\n", __PRETTY_FUNCTION__, val);
@ -3782,17 +3780,16 @@ mbus_data_variable_record_xml(mbus_data_record *record, int record_cnt, int fram
" <Function>%s</Function>\n", str_encoded); " <Function>%s</Function>\n", str_encoded);
len += snprintf(&buff[len], sizeof(buff) - len, len += snprintf(&buff[len], sizeof(buff) - len,
" <StorageNumber>%ld</StorageNumber>\n", " <StorageNumber>%ld</StorageNumber>\n",
mbus_data_record_storage_number(record)); mbus_data_record_storage_number(record));
if ((tariff = mbus_data_record_tariff(record)) >= 0)
if ((tariff = mbus_data_record_tariff(record)) >= 0) {
{ len += snprintf(&buff[len], sizeof(buff) - len, " <Tariff>%ld</Tariff>\n",
len += snprintf(&buff[len], sizeof(buff) - len, " <Tariff>%ld</Tariff>\n", tariff);
tariff); len += snprintf(&buff[len], sizeof(buff) - len, " <Device>%d</Device>\n",
len += snprintf(&buff[len], sizeof(buff) - len, " <Device>%d</Device>\n", mbus_data_record_device(record));
mbus_data_record_device(record)); }
}
mbus_str_xml_encode(str_encoded, mbus_data_record_unit(record), sizeof(str_encoded)); mbus_str_xml_encode(str_encoded, mbus_data_record_unit(record), sizeof(str_encoded));
len += snprintf(&buff[len], sizeof(buff) - len, len += snprintf(&buff[len], sizeof(buff) - len,

2
mbus/mbus-serial.c
View File

@ -372,5 +372,3 @@ mbus_serial_recv_frame(mbus_handle *handle, mbus_frame *frame)
return MBUS_RECV_RESULT_OK; return MBUS_RECV_RESULT_OK;
} }

14
mbus/mbus-serial.h
View File

@ -33,12 +33,12 @@ typedef struct _mbus_serial_data
struct termios t; struct termios t;
} mbus_serial_data; } mbus_serial_data;
int mbus_serial_connect(mbus_handle *handle); int mbus_serial_connect(mbus_handle *handle);
int mbus_serial_disconnect(mbus_handle *handle); int mbus_serial_disconnect(mbus_handle *handle);
int mbus_serial_send_frame(mbus_handle *handle, mbus_frame *frame); int mbus_serial_send_frame(mbus_handle *handle, mbus_frame *frame);
int mbus_serial_recv_frame(mbus_handle *handle, mbus_frame *frame); int mbus_serial_recv_frame(mbus_handle *handle, mbus_frame *frame);
int mbus_serial_set_baudrate(mbus_handle *handle, long baudrate); int mbus_serial_set_baudrate(mbus_handle *handle, long baudrate);
void mbus_serial_data_free(mbus_handle *handle); void mbus_serial_data_free(mbus_handle *handle);
#ifdef __cplusplus #ifdef __cplusplus
} }
@ -46,5 +46,3 @@ void mbus_serial_data_free(mbus_handle *handle);
#endif /* MBUS_SERIAL_H */ #endif /* MBUS_SERIAL_H */

31
test/mbus_parse.c
View File

@ -20,10 +20,10 @@ main(int argc, char *argv[])
FILE *fp = NULL; FILE *fp = NULL;
size_t buff_len, len; size_t buff_len, len;
int normalized = 0; int normalized = 0;
unsigned char buf[1024]; unsigned char buf[1024];
mbus_frame reply; mbus_frame reply;
mbus_frame_data frame_data; mbus_frame_data frame_data;
char *xml_result = NULL, *file = NULL; char *xml_result = NULL, *file = NULL;
if (argc == 3 && strcmp(argv[1], "-n") == 0) if (argc == 3 && strcmp(argv[1], "-n") == 0)
{ {
@ -47,8 +47,8 @@ main(int argc, char *argv[])
return 1; return 1;
} }
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
len = fread(buf, 1, sizeof(buf), fp); len = fread(buf, 1, sizeof(buf), fp);
if (ferror(fp) != 0) if (ferror(fp) != 0)
{ {
@ -56,17 +56,17 @@ main(int argc, char *argv[])
return 1; return 1;
} }
fclose(fp); fclose(fp);
memset(&reply, 0, sizeof(reply)); memset(&reply, 0, sizeof(reply));
memset(&frame_data, 0, sizeof(frame_data)); memset(&frame_data, 0, sizeof(frame_data));
mbus_parse(&reply, buf, len); mbus_parse(&reply, buf, len);
mbus_frame_data_parse(&reply, &frame_data); mbus_frame_data_parse(&reply, &frame_data);
mbus_frame_print(&reply); mbus_frame_print(&reply);
xml_result = normalized ? mbus_frame_data_xml_normalized(&frame_data) : mbus_frame_data_xml(&frame_data); xml_result = normalized ? mbus_frame_data_xml_normalized(&frame_data) : mbus_frame_data_xml(&frame_data);
if (xml_result == NULL) if (xml_result == NULL)
{ {
fprintf(stderr, "Failed to generate XML representation of MBUS frame: %s\n", mbus_error_str()); fprintf(stderr, "Failed to generate XML representation of MBUS frame: %s\n", mbus_error_str());
return 1; return 1;
@ -74,7 +74,6 @@ main(int argc, char *argv[])
printf("%s", xml_result); printf("%s", xml_result);
free(xml_result); free(xml_result);
return 0; return 0;
} }

43
test/mbus_parse_hex.c
View File

@ -19,13 +19,13 @@ main(int argc, char *argv[])
{ {
FILE *fp = NULL; FILE *fp = NULL;
size_t buff_len, len; size_t buff_len, len;
int result, normalized = 0; int result, normalized = 0;
unsigned char raw_buff[4096], buff[4096]; unsigned char raw_buff[4096], buff[4096];
mbus_frame reply; mbus_frame reply;
mbus_frame_data frame_data; mbus_frame_data frame_data;
char *xml_result = NULL, *file = NULL; char *xml_result = NULL, *file = NULL;
if (argc == 3 && strcmp(argv[1], "-n") == 0) if (argc == 3 && strcmp(argv[1], "-n") == 0)
{ {
file = argv[2]; file = argv[2];
normalized = 1; normalized = 1;
@ -60,16 +60,16 @@ main(int argc, char *argv[])
buff_len = mbus_hex2bin(buff,sizeof(buff),raw_buff,sizeof(raw_buff)); buff_len = mbus_hex2bin(buff,sizeof(buff),raw_buff,sizeof(raw_buff));
memset(&reply, 0, sizeof(reply)); memset(&reply, 0, sizeof(reply));
memset(&frame_data, 0, sizeof(frame_data)); memset(&frame_data, 0, sizeof(frame_data));
//mbus_parse_set_debug(1); //mbus_parse_set_debug(1);
result = mbus_parse(&reply, buff, buff_len); result = mbus_parse(&reply, buff, buff_len);
if (result < 0) if (result < 0)
{ {
fprintf(stderr, "mbus_parse: %s\n", mbus_error_str()); fprintf(stderr, "mbus_parse: %s\n", mbus_error_str());
return 1; return 1;
} }
else if (result > 0) else if (result > 0)
@ -80,10 +80,10 @@ main(int argc, char *argv[])
result = mbus_frame_data_parse(&reply, &frame_data); result = mbus_frame_data_parse(&reply, &frame_data);
if (result != 0) if (result != 0)
{ {
mbus_frame_print(&reply); mbus_frame_print(&reply);
fprintf(stderr, "mbus_frame_data_parse: %s\n", mbus_error_str()); fprintf(stderr, "mbus_frame_data_parse: %s\n", mbus_error_str());
return 1; return 1;
} }
@ -97,11 +97,10 @@ main(int argc, char *argv[])
fprintf(stderr, "Failed to generate XML representation of MBUS frame: %s\n", mbus_error_str()); fprintf(stderr, "Failed to generate XML representation of MBUS frame: %s\n", mbus_error_str());
return 1; return 1;
} }
printf("%s", xml_result); printf("%s", xml_result);
free(xml_result); free(xml_result);
mbus_data_record_free(frame_data.data_var.record); mbus_data_record_free(frame_data.data_var.record);
return 0; return 0;
} }