dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed duplicate code in apps/readprop. (#959)

Browse Source
This commit is contained in:
Steve Karg
2025-04-07 13:43:34 -05:00
committed by GitHub
parent 31af2507fb
commit c0c46ef235
1 changed files with 3 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/readprop/main.c
+3 -28
View File
@@ -334,35 +334,10 @@ int main(int argc, char *argv[])
} }
address_init(); address_init();
if (specific_address) { if (specific_address) {
bacnet_address_init(&dest, &mac, dnet, &adr); if ((dnet < 0) || (dnet > BACNET_BROADCAST_NETWORK)) {
if (adr.len && mac.len) { dnet = BACNET_BROADCAST_NETWORK;
memcpy(&dest.mac[0], &mac.adr[0], mac.len);
dest.mac_len = mac.len;
memcpy(&dest.adr[0], &adr.adr[0], adr.len);
dest.len = adr.len;
if ((dnet >= 0) && (dnet <= BACNET_BROADCAST_NETWORK)) {
dest.net = dnet;
} else {
dest.net = BACNET_BROADCAST_NETWORK;
}
} else if (mac.len) {
memcpy(&dest.mac[0], &mac.adr[0], mac.len);
dest.mac_len = mac.len;
dest.len = 0;
if ((dnet >= 0) && (dnet <= BACNET_BROADCAST_NETWORK)) {
dest.net = dnet;
} else {
dest.net = 0;
}
} else {
if ((dnet >= 0) && (dnet <= BACNET_BROADCAST_NETWORK)) {
dest.net = dnet;
} else {
dest.net = BACNET_BROADCAST_NETWORK;
}
dest.mac_len = 0;
dest.len = 0;
} }
bacnet_address_init(&dest, &mac, dnet, &adr);
address_add(Target_Device_Object_Instance, MAX_APDU, &dest); address_add(Target_Device_Object_Instance, MAX_APDU, &dest);
} }
/* setup my info */ /* setup my info */