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

Updated to version 1.3.6 for release on 2024-05-12 Mother's Day! (#635)

Browse Source 
* Updated to version 1.3.6 for release on 2024-05-12 Mother's Day!
This commit is contained in:
Steve Karg
2024-05-12 09:06:23 -05:00
committed by GitHub
parent 06ff987b79
commit 3222244e4e
9 changed files with 84 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/basic/object/channel.c
-3
View File
@@ -1528,7 +1528,6 @@ bool Channel_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
BACNET_APPLICATION_DATA_VALUE value;
int element_len = 0;
uint32_t count = 0;
uint32_t array_index = 0;
/* decode the some of the request */
len = bacapp_decode_application_data(
@@ -1589,7 +1588,6 @@ bool Channel_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
wp_data->error_code = ERROR_CODE_WRITE_ACCESS_DENIED;
} else if (wp_data->array_index == BACNET_ARRAY_ALL) {
count = CONTROL_GROUPS_MAX;
array_index = 1;
/* extra elements still encoded in application data */
element_len = len;
do {
@@ -1611,7 +1609,6 @@ bool Channel_Write_Property(BACNET_WRITE_PROPERTY_DATA *wp_data)
}
}
count--;
array_index++;
if (count) {
element_len = bacapp_decode_application_data(
&wp_data->application_data[len],
src/bacnet/basic/object/gateway/gw_device.c
+1 -1
View File
@@ -361,7 +361,7 @@ bool Routed_Device_Is_Valid_Network(uint16_t dest_net, int *DNET_list)
uint32_t Routed_Device_Index_To_Instance(unsigned index)
{
index = index;
(void)index;
return Devices[iCurrent_Device_Idx].bacObj.Object_Instance_Number;
}
src/bacnet/datalink/bvlc.c
-2
View File
@@ -2139,7 +2139,6 @@ bool bvlc_address_from_ascii(BACNET_IP_ADDRESS *addr, const char *addrstr)
uint16_t tmp = 0;
char c = 0;
unsigned char i = 0, j = 0;
uint8_t charsread = 0;
if (!addr) {
return false;
@@ -2168,7 +2167,6 @@ bool bvlc_address_from_ascii(BACNET_IP_ADDRESS *addr, const char *addrstr)
return false;
}
++addrstr;
++charsread;
} while ((c != '.') && (c != 0) && (c != ' '));
}
src/bacnet/version.h
+2 -2
View File
@@ -17,8 +17,8 @@
#define BACNET_VERSION(x,y,z) (((x)<<16)+((y)<<8)+(z))
#endif
#define BACNET_VERSION_TEXT "1.3.5"
#define BACNET_VERSION_CODE BACNET_VERSION(1,3,5)
#define BACNET_VERSION_TEXT "1.3.6"
#define BACNET_VERSION_CODE BACNET_VERSION(1,3,6)
#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)