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

replace magic number with define

Browse Source
This commit is contained in:
Stefan Wahren 2012-12-20 20:12:19 +01:00
parent b3a3dfec0b
commit a4e92f6eab
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,7 +146,7 @@ main(int argc, char **argv)
} }
// else MBUS_PROBE_SINGLE // else MBUS_PROBE_SINGLE
address = 253; address = MBUS_ADDRESS_NETWORK_LAYER;
} }
else else
{ {

2
bin/mbus-serial-request-data.c
View File

@ -113,7 +113,7 @@ main(int argc, char **argv)
} }
// else MBUS_PROBE_SINGLE // else MBUS_PROBE_SINGLE
if (mbus_send_request_frame(handle, 253) == -1) if (mbus_send_request_frame(handle, MBUS_ADDRESS_NETWORK_LAYER) == -1)
{ {
fprintf(stderr, "Failed to send M-Bus request frame.\n"); fprintf(stderr, "Failed to send M-Bus request frame.\n");
return 1; return 1;

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

@ -95,7 +95,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, 253) == -1) if (mbus_send_request_frame(handle, MBUS_ADDRESS_NETWORK_LAYER) == -1)
{ {
printf("Failed to send request to selected secondary device: %s\n", mbus_error_str()); printf("Failed to send request to selected secondary device: %s\n", mbus_error_str());
return 1; return 1;

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

@ -112,7 +112,7 @@ main(int argc, char **argv)
fprintf(stderr, "%s: Error: Failed to select secondary address [%s].\n", __PRETTY_FUNCTION__, addr_str); fprintf(stderr, "%s: Error: Failed to select secondary address [%s].\n", __PRETTY_FUNCTION__, addr_str);
return 1; return 1;
} }
address = 253; address = MBUS_ADDRESS_NETWORK_LAYER;
} }
else else
{ {

2
bin/mbus-tcp-request-data-multi-reply.c
View File

@ -106,7 +106,7 @@ main(int argc, char **argv)
} }
// else MBUS_PROBE_SINGLE // else MBUS_PROBE_SINGLE
address = 253; address = MBUS_ADDRESS_NETWORK_LAYER;
} }
else else
{ {

2
bin/mbus-tcp-request-data.c
View File

@ -95,7 +95,7 @@ main(int argc, char **argv)
} }
// else MBUS_PROBE_SINGLE // else MBUS_PROBE_SINGLE
if (mbus_send_request_frame(handle, 253) == -1) if (mbus_send_request_frame(handle, MBUS_ADDRESS_NETWORK_LAYER) == -1)
{ {
fprintf(stderr, "Failed to send M-Bus request frame.\n"); fprintf(stderr, "Failed to send M-Bus request frame.\n");
return 1; return 1;

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

@ -80,7 +80,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, 253) == -1) if (mbus_send_request_frame(handle, MBUS_ADDRESS_NETWORK_LAYER) == -1)
{ {
printf("Failed to send request to selected secondary device: %s\n", mbus_error_str()); printf("Failed to send request to selected secondary device: %s\n", mbus_error_str());
return 1; return 1;

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

@ -1983,7 +1983,7 @@ mbus_probe_secondary_address(mbus_handle * handle, const char *mask, char *match
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, 253) == -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__,
@ -2082,7 +2082,7 @@ int mbus_read_slave(mbus_handle * handle, mbus_address *address, mbus_frame * re
} }
/* else MBUS_PROBE_SINGLE */ /* else MBUS_PROBE_SINGLE */
if (mbus_send_request_frame(handle, 253) == -1) if (mbus_send_request_frame(handle, MBUS_ADDRESS_NETWORK_LAYER) == -1)
{ {
MBUS_ERROR("%s: Failed to send M-Bus request frame.\n", MBUS_ERROR("%s: Failed to send M-Bus request frame.\n",
__PRETTY_FUNCTION__); __PRETTY_FUNCTION__);

2
mbus/mbus-protocol.c
View File

@ -3956,7 +3956,7 @@ mbus_frame_select_secondary_pack(mbus_frame *frame, char *address)
} }
frame->control = MBUS_CONTROL_MASK_SND_UD | MBUS_CONTROL_MASK_DIR_M2S | MBUS_CONTROL_MASK_FCB; frame->control = MBUS_CONTROL_MASK_SND_UD | MBUS_CONTROL_MASK_DIR_M2S | MBUS_CONTROL_MASK_FCB;
frame->address = 253; // for addressing secondary slaves frame->address = MBUS_ADDRESS_NETWORK_LAYER; // for addressing secondary slaves
frame->control_information = 0x52; // mode 1 frame->control_information = 0x52; // mode 1
frame->data_size = 8; frame->data_size = 8;