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

new function mbus_frame_direction to get the direction of a frame

Browse Source 
(slave to master or vice versa)
extended mbus_frame_data_parse to check the direction of a frame
This commit is contained in:
Stefan Wahren 2012-10-03 23:01:44 +02:00
parent fe4217772c
commit d6c5529247
1 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
mbus/mbus-protocol.c
View File

@ -300,6 +300,19 @@ mbus_frame_type(mbus_frame *frame)
return -1; return -1;
} }
//------------------------------------------------------------------------------
/// Return the M-Bus frame direction
//------------------------------------------------------------------------------
int
mbus_frame_direction(mbus_frame *frame)
{
if (frame)
{
return (frame->control & MBUS_CONTROL_MASK_DIR);
}
return -1;
}
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
/// Verify that parsed frame is a valid M-bus frame. /// Verify that parsed frame is a valid M-bus frame.
// //
@ -2713,7 +2726,23 @@ mbus_data_variable_parse(mbus_frame *frame, mbus_data_variable *data)
int int
mbus_frame_data_parse(mbus_frame *frame, mbus_frame_data *data) mbus_frame_data_parse(mbus_frame *frame, mbus_frame_data *data)
{ {
if (frame && data) char direction;
if (frame == NULL)
{
snprintf(error_str, sizeof(error_str), "Got null pointer to frame.");
return -1;
}
if (data == NULL)
{
snprintf(error_str, sizeof(error_str), "Got null pointer to data.");
return -1;
}
direction = (frame->control & MBUS_CONTROL_MASK_DIR);
if (direction == MBUS_CONTROL_MASK_DIR_S2M)
{ {
if (frame->control_information == MBUS_CONTROL_INFO_ERROR_GENERAL) if (frame->control_information == MBUS_CONTROL_INFO_ERROR_GENERAL)
{ {
@ -2761,9 +2790,13 @@ mbus_frame_data_parse(mbus_frame *frame, mbus_frame_data *data)
return -1; return -1;
} }
} }
else
snprintf(error_str, sizeof(error_str), "Got null pointer to frame or data."); {
snprintf(error_str, sizeof(error_str), "Wrong direction in frame (master to slave)");
return -1;
}
return -1; return -1;
} }