Skip to content

Print name of frame type instead of number in mbus_frame_print. #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
strongly-typed wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Print name of frame type instead of number in mbus_frame_print. #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8fd5635
Print name of frame type instead of number.
strongly-typed May 13, 2016
36bf527
Return zero when print function was successful.
strongly-typed May 13, 2016
f53e377
Set error_str for errors in mbus_frame_pack.
strongly-typed May 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 57 additions & 2 deletions mbus/mbus-protocol.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3279,11 +3279,15 @@ mbus_frame_pack(mbus_frame *frame, unsigned char *data, size_t data_size)
{
if (mbus_frame_calc_length(frame) == -1)
{
snprintf(error_str, sizeof(error_str), "Length calculation of frame failed");

return -2;
}

if (mbus_frame_calc_checksum(frame) == -1)
{
snprintf(error_str, sizeof(error_str), "Checksum calculation of frame failed");

return -3;
}

Expand All @@ -3293,6 +3297,8 @@ mbus_frame_pack(mbus_frame *frame, unsigned char *data, size_t data_size)

if (data_size < MBUS_FRAME_ACK_BASE_SIZE)
{
snprintf(error_str, sizeof(error_str), "data_size (%d) < MBUS_FRAME_ACK_BASE_SIZE (%d)", data_size, MBUS_FRAME_ACK_BASE_SIZE);

return -4;
}

Expand All @@ -3304,6 +3310,8 @@ mbus_frame_pack(mbus_frame *frame, unsigned char *data, size_t data_size)

if (data_size < MBUS_FRAME_SHORT_BASE_SIZE)
{
snprintf(error_str, sizeof(error_str), "data_size (%d) < MBUS_FRAME_SHORT_BASE_SIZE (%d)", data_size, MBUS_FRAME_SHORT_BASE_SIZE);

return -4;
}

Expand All @@ -3319,6 +3327,8 @@ mbus_frame_pack(mbus_frame *frame, unsigned char *data, size_t data_size)

if (data_size < MBUS_FRAME_CONTROL_BASE_SIZE)
{
snprintf(error_str, sizeof(error_str), "data_size (%d) < MBUS_FRAME_CONTROL_BASE_SIZE (%d)", data_size, MBUS_FRAME_CONTROL_BASE_SIZE);

return -4;
}

Expand All @@ -3340,6 +3350,8 @@ mbus_frame_pack(mbus_frame *frame, unsigned char *data, size_t data_size)

if (data_size < frame->data_size + MBUS_FRAME_LONG_BASE_SIZE)
{
snprintf(error_str, sizeof(error_str), "data_size (%d) < frame->data_size + MBUS_FRAME_LONG_BASE_SIZE (%d + %d = %d)", data_size, frame->data_size, MBUS_FRAME_LONG_BASE_SIZE, frame->data_size + MBUS_FRAME_LONG_BASE_SIZE);

return -4;
}

Expand All @@ -3363,6 +3375,8 @@ mbus_frame_pack(mbus_frame *frame, unsigned char *data, size_t data_size)
return offset;

default:
snprintf(error_str, sizeof(error_str), "frame->type (%d) in unknown.", frame->type);

return -5;
}
}
Expand Down Expand Up @@ -3511,7 +3525,7 @@ mbus_frame_print(mbus_frame *frame)
return -2;
}

printf("%s: Dumping M-Bus frame [type %d, %d bytes]: ", __PRETTY_FUNCTION__, iter->type, len);
printf("%s: Dumping M-Bus frame [type %s, %d bytes]: ", __PRETTY_FUNCTION__, mbus_frame_type_print(iter->type), len);
for (i = 0; i < len; i++)
{
printf("%.2X ", data_buff[i]);
Expand All @@ -3522,6 +3536,43 @@ mbus_frame_print(mbus_frame *frame)
return 0;
}

//------------------------------------------------------------------------------
/// Return a string containing the frame type
//------------------------------------------------------------------------------
const char *
mbus_frame_type_print(const int type)
{
static char buff[128];

switch (type)
{
case MBUS_FRAME_TYPE_ANY:
snprintf(buff, sizeof(buff), "Any");
break;

case MBUS_FRAME_TYPE_ACK:
snprintf(buff, sizeof(buff), "Ack");
break;

case MBUS_FRAME_TYPE_SHORT:
snprintf(buff, sizeof(buff), "Short");
break;

case MBUS_FRAME_TYPE_CONTROL:
snprintf(buff, sizeof(buff), "Control");
break;

case MBUS_FRAME_TYPE_LONG:
snprintf(buff, sizeof(buff), "Long");
break;

default:
snprintf(buff, sizeof(buff), "unknown");
}

return buff;
}

//------------------------------------------------------------------------------
///
/// Print the data part of a frame.
Expand Down Expand Up @@ -3649,6 +3700,8 @@ mbus_data_variable_print(mbus_data_variable *data)

printf("\n");
}

return 0;
}

return -1;
Expand Down Expand Up @@ -3689,6 +3742,8 @@ mbus_data_fixed_print(mbus_data_fixed *data)
mbus_data_int_decode(data->cnt2_val, 4, &val);
printf("%s: Counter2 = %d\n", __PRETTY_FUNCTION__, val);
}

return 0;
}

return -1;
Expand Down Expand Up @@ -3724,7 +3779,7 @@ mbus_data_error_print(int error)
{
printf("%s: Error = %d\n", __PRETTY_FUNCTION__, error);

return -1;
return 0;
}

//------------------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions mbus/mbus-protocol.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,7 @@ char *mbus_frame_xml(mbus_frame *frame);
// Debug/dump
//
int mbus_frame_print(mbus_frame *frame);
const char * mbus_frame_type_print(const int type);
int mbus_frame_data_print(mbus_frame_data *data);
int mbus_data_fixed_print(mbus_data_fixed *data);
int mbus_data_error_print(int error);
Expand Down