From db21bf1bfa06cc99a26315589e52676dbed61d33 Mon Sep 17 00:00:00 2001 From: Steve Karg Date: Sun, 25 Jun 2023 09:31:07 -0500 Subject: [PATCH 1/2] Increment version to 1.1.0 for release --- src/bacnet/version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bacnet/version.h b/src/bacnet/version.h index 90528fb8..b935abc7 100644 --- a/src/bacnet/version.h +++ b/src/bacnet/version.h @@ -29,8 +29,8 @@ #define BACNET_VERSION(x,y,z) (((x)<<16)+((y)<<8)+(z)) #endif -#define BACNET_VERSION_TEXT "1.0.0" -#define BACNET_VERSION_CODE BACNET_VERSION(1,0,0) +#define BACNET_VERSION_TEXT "1.1.0" +#define BACNET_VERSION_CODE BACNET_VERSION(1,1,0) #define BACNET_VERSION_MAJOR ((BACNET_VERSION_CODE>>16)&0xFF) #define BACNET_VERSION_MINOR ((BACNET_VERSION_CODE>>8)&0xFF) #define BACNET_VERSION_MAINTENANCE (BACNET_VERSION_CODE&0xFF) From 5b7eac60cf227dca149392521acabef4bb3117da Mon Sep 17 00:00:00 2001 From: Steve Karg Date: Wed, 28 Jun 2023 12:46:56 -0500 Subject: [PATCH 2/2] cleaned up lwIP function header javadoc (#441) Co-authored-by: Steve Karg --- .github/issue-branch.yml | 9 +++++++++ ports/lwip/bip.c | 13 ++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 .github/issue-branch.yml diff --git a/.github/issue-branch.yml b/.github/issue-branch.yml new file mode 100644 index 00000000..02039e7e --- /dev/null +++ b/.github/issue-branch.yml @@ -0,0 +1,9 @@ +branches: + - label: enhancement + prefix: feature/ + - label: bug + prefix: bugfix/ + - label: documentation + prefix: chore/ + - label: '*' + prefix: issues/ diff --git a/ports/lwip/bip.c b/ports/lwip/bip.c index 07456248..28a3c584 100644 --- a/ports/lwip/bip.c +++ b/ports/lwip/bip.c @@ -236,8 +236,7 @@ static int bip_encode_bip_address(BACNET_IP_ADDRESS *baddr, /** Function to send a packet out the BACnet/IP socket (Annex J). * @ingroup DLBIP * - * @param dest [in] Destination address - * @param port [in] UDP port number + * @param dest [in] Destination address and port * @param mtu_len [in] PBUF packet * @return number of bytes sent, or 0 on failure. */ @@ -318,6 +317,10 @@ void bip_server_callback(void *arg, pbuf_free(pkt); } +/** + * @brief Get the BACnet/IP unicast address in full BACnet address format + * @param my_address - pointer to the #BACNET_ADDRESS to fill + */ void bip_get_my_address(BACNET_ADDRESS *my_address) { int i = 0; @@ -337,8 +340,12 @@ void bip_get_my_address(BACNET_ADDRESS *my_address) return; } +/** + * @brief Get the BACnet/IP broadcast address in full BACnet address format + * @param dest - pointer to the #BACNET_ADDRESS to fill + */ void bip_get_broadcast_address(BACNET_ADDRESS *dest) -{ /* destination address */ +{ int i = 0; /* counter */ if (dest) {