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

Convert the property list values into int32_t to support the larger property values when an int is 8-bit or 16-bit. (#1145)

Browse Source
This commit is contained in:
Steve Karg
2025-11-16 08:34:45 -06:00
committed by GitHub
parent 3ea710f92f
commit e9dd910b55
180 changed files with 1071 additions and 861 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ports/esp32/src/ai.c
+4 -4
View File
@@ -31,11 +31,11 @@
ANALOG_INPUT_DESCR AI_Descr[MAX_ANALOG_INPUTS];
/* These three arrays are used by the ReadPropertyMultiple handler */
static const int Properties_Required[] = { PROP_OBJECT_IDENTIFIER,
static const int32_t Properties_Required[] = { PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS,
PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, PROP_UNITS, -1 };
static const int Properties_Optional[] = { PROP_DESCRIPTION, PROP_RELIABILITY,
static const int32_t Properties_Optional[] = { PROP_DESCRIPTION, PROP_RELIABILITY,
PROP_COV_INCREMENT,
#if defined(INTRINSIC_REPORTING)
PROP_TIME_DELAY, PROP_NOTIFICATION_CLASS, PROP_HIGH_LIMIT, PROP_LOW_LIMIT,
@@ -44,10 +44,10 @@ static const int Properties_Optional[] = { PROP_DESCRIPTION, PROP_RELIABILITY,
#endif
-1 };
static const int Properties_Proprietary[] = { 9997, 9998, 9999, -1 };
static const int32_t Properties_Proprietary[] = { 9997, 9998, 9999, -1 };
void Analog_Input_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary)
const int32_t **pRequired, const int32_t **pOptional, const int32_t **pProprietary)
{
if (pRequired)
*pRequired = Properties_Required;
ports/esp32/src/ai.h
+3 -3
View File
@@ -53,9 +53,9 @@ extern "C" {
} ANALOG_INPUT_DESCR;
void Analog_Input_Property_Lists(
const int **pRequired,
const int **pOptional,
const int **pProprietary);
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary);
bool Analog_Input_Valid_Instance(
uint32_t object_instance);
ports/esp32/src/bo.c
+4 -4
View File
@@ -36,18 +36,18 @@ static BACNET_BINARY_PV Binary_Output_Level[MAX_BINARY_OUTPUTS]
static bool Out_Of_Service[MAX_BINARY_OUTPUTS];
/* These three arrays are used by the ReadPropertyMultiple handler */
static const int Binary_Output_Properties_Required[] = { PROP_OBJECT_IDENTIFIER,
static const int32_t Binary_Output_Properties_Required[] = { PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_PRESENT_VALUE, PROP_STATUS_FLAGS,
PROP_EVENT_STATE, PROP_OUT_OF_SERVICE, PROP_POLARITY, PROP_PRIORITY_ARRAY,
PROP_RELINQUISH_DEFAULT, -1 };
static const int Binary_Output_Properties_Optional[] = { PROP_DESCRIPTION,
static const int32_t Binary_Output_Properties_Optional[] = { PROP_DESCRIPTION,
PROP_ACTIVE_TEXT, PROP_INACTIVE_TEXT, -1 };
static const int Binary_Output_Properties_Proprietary[] = { -1 };
static const int32_t Binary_Output_Properties_Proprietary[] = { -1 };
void Binary_Output_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary)
const int32_t **pRequired, const int32_t **pOptional, const int32_t **pProprietary)
{
if (pRequired)
*pRequired = Binary_Output_Properties_Required;
ports/esp32/src/bo.h
+3 -3
View File
@@ -23,9 +23,9 @@ extern "C" {
void);
void Binary_Output_Property_Lists(
const int **pRequired,
const int **pOptional,
const int **pProprietary);
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary);
bool Binary_Output_Valid_Instance(
uint32_t object_instance);
ports/esp32/src/device.c
+4 -4
View File
@@ -230,7 +230,7 @@ bool Device_Reinitialize(BACNET_REINITIALIZE_DEVICE_DATA *rd_data)
}
/* These three arrays are used by the ReadPropertyMultiple handler */
static const int Device_Properties_Required[] = { PROP_OBJECT_IDENTIFIER,
static const int32_t Device_Properties_Required[] = { PROP_OBJECT_IDENTIFIER,
PROP_OBJECT_NAME, PROP_OBJECT_TYPE, PROP_SYSTEM_STATUS, PROP_VENDOR_NAME,
PROP_VENDOR_IDENTIFIER, PROP_MODEL_NAME, PROP_FIRMWARE_REVISION,
PROP_APPLICATION_SOFTWARE_VERSION, PROP_PROTOCOL_VERSION,
@@ -240,7 +240,7 @@ static const int Device_Properties_Required[] = { PROP_OBJECT_IDENTIFIER,
PROP_APDU_TIMEOUT, PROP_NUMBER_OF_APDU_RETRIES, PROP_DEVICE_ADDRESS_BINDING,
PROP_DATABASE_REVISION, -1 };
static const int Device_Properties_Optional[] = {
static const int32_t Device_Properties_Optional[] = {
#if defined(BACDL_MSTP)
PROP_MAX_MASTER, PROP_MAX_INFO_FRAMES,
#endif
@@ -253,10 +253,10 @@ static const int Device_Properties_Optional[] = {
-1
};
static const int Device_Properties_Proprietary[] = { -1 };
static const int32_t Device_Properties_Proprietary[] = { -1 };
void Device_Property_Lists(
const int **pRequired, const int **pOptional, const int **pProprietary)
const int32_t **pRequired, const int32_t **pOptional, const int32_t **pProprietary)
{
if (pRequired)
*pRequired = Device_Properties_Required;
ports/esp32/src/device.h
+5 -5
View File
@@ -231,9 +231,9 @@ extern "C" {
bool Device_Interval_Offset_Set(uint32_t value);
void Device_Property_Lists(
const int **pRequired,
const int **pOptional,
const int **pProprietary);
const int32_t **pRequired,
const int32_t **pOptional,
const int32_t **pProprietary);
void Device_Objects_Property_List(
BACNET_OBJECT_TYPE object_type,
uint32_t object_instance,
@@ -391,11 +391,11 @@ extern "C" {
const uint8_t * mac_adress);
bool Routed_Device_GetNext(
const BACNET_ADDRESS * dest,
const int *DNET_list,
const int32_t *DNET_list,
int *cursor);
bool Routed_Device_Is_Valid_Network(
uint16_t dest_net,
const int *DNET_list);
const int32_t *DNET_list);
uint32_t Routed_Device_Index_To_Instance(
unsigned index);