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

feat(gateway_bacnet): enhance BACnet object binding with out_of_service and reliability fields

Browse Source 
feat(gateway_bacnet): add functions to clear BACnet objects and set their states

feat(gateway_bridge): implement discovery inventory management and scanning functionality

fix(gateway_bridge): update handleGet to support new inventory and effective model actions

refactor(gateway_bridge): improve BACnet binding handling and reliability reporting

Co-authored-by: Copilot <copilot@github.com>
This commit is contained in:
Tony
2026-05-02 21:16:32 +08:00
parent fa2eae87cf
commit 30a96c5125
7 changed files with 810 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/gateway_bacnet/src/gateway_bacnet_stack_port.c
+104 -1
View File
@@ -39,6 +39,91 @@ static const char Multistate_Value_States[] =
"State 15\0"
"State 16\0";
static bool clear_analog_value_objects(void)
{
unsigned count = Analog_Value_Count();
while (count > 0) {
count--;
Analog_Value_Delete(Analog_Value_Index_To_Instance(count));
}
return true;
}
static bool clear_analog_output_objects(void)
{
unsigned count = Analog_Output_Count();
while (count > 0) {
count--;
Analog_Output_Delete(Analog_Output_Index_To_Instance(count));
}
return true;
}
static bool clear_binary_value_objects(void)
{
unsigned count = Binary_Value_Count();
while (count > 0) {
count--;
Binary_Value_Delete(Binary_Value_Index_To_Instance(count));
}
return true;
}
static bool clear_binary_output_objects(void)
{
unsigned count = Binary_Output_Count();
while (count > 0) {
count--;
Binary_Output_Delete(Binary_Output_Index_To_Instance(count));
}
return true;
}
static bool clear_multistate_value_objects(void)
{
unsigned count = Multistate_Value_Count();
while (count > 0) {
count--;
Multistate_Value_Delete(Multistate_Value_Index_To_Instance(count));
}
return true;
}
static void set_analog_value_state(
uint32_t object_instance, bool out_of_service, BACNET_RELIABILITY reliability)
{
Analog_Value_Out_Of_Service_Set(object_instance, out_of_service);
Analog_Value_Reliability_Set(object_instance, reliability);
}
static void set_analog_output_state(
uint32_t object_instance, bool out_of_service, BACNET_RELIABILITY reliability)
{
Analog_Output_Out_Of_Service_Set(object_instance, out_of_service);
Analog_Output_Reliability_Set(object_instance, reliability);
}
static void set_binary_value_state(
uint32_t object_instance, bool out_of_service, BACNET_RELIABILITY reliability)
{
Binary_Value_Out_Of_Service_Set(object_instance, out_of_service);
Binary_Value_Reliability_Set(object_instance, reliability);
}
static void set_binary_output_state(
uint32_t object_instance, bool out_of_service, BACNET_RELIABILITY reliability)
{
Binary_Output_Out_Of_Service_Set(object_instance, out_of_service);
Binary_Output_Reliability_Set(object_instance, reliability);
}
static void set_multistate_value_state(
uint32_t object_instance, bool out_of_service, BACNET_RELIABILITY reliability)
{
Multistate_Value_Out_Of_Service_Set(object_instance, out_of_service);
Multistate_Value_Reliability_Set(object_instance, reliability);
}
static void notify_write_real(
gateway_bacnet_object_kind_t object_kind, uint32_t object_instance, double value)
{
@@ -209,7 +294,9 @@ bool gateway_bacnet_stack_upsert_object(
gateway_bacnet_object_kind_t object_kind,
uint32_t object_instance,
const char* object_name,
const char* description)
const char* description,
bool out_of_service,
uint32_t reliability)
{
if (!object_name || object_name[0] == '\0') {
object_name = "DALI BACnet Object";
@@ -218,6 +305,8 @@ bool gateway_bacnet_stack_upsert_object(
description = "";
}
BACNET_RELIABILITY object_reliability = (BACNET_RELIABILITY)reliability;
switch (object_kind) {
case GW_BACNET_OBJECT_ANALOG_VALUE:
if (!Analog_Value_Valid_Instance(object_instance)) {
@@ -227,6 +316,7 @@ bool gateway_bacnet_stack_upsert_object(
Analog_Value_Description_Set(object_instance, description);
Analog_Value_Units_Set(object_instance, UNITS_PERCENT);
Analog_Value_Present_Value_Set(object_instance, 0.0f, BACNET_NO_PRIORITY);
set_analog_value_state(object_instance, out_of_service, object_reliability);
return true;
case GW_BACNET_OBJECT_ANALOG_OUTPUT:
if (!Analog_Output_Valid_Instance(object_instance)) {
@@ -236,6 +326,7 @@ bool gateway_bacnet_stack_upsert_object(
Analog_Output_Description_Set(object_instance, description);
Analog_Output_Units_Set(object_instance, UNITS_PERCENT);
Analog_Output_Present_Value_Set(object_instance, 0.0f, BACNET_MAX_PRIORITY);
set_analog_output_state(object_instance, out_of_service, object_reliability);
return true;
case GW_BACNET_OBJECT_BINARY_VALUE:
if (!Binary_Value_Valid_Instance(object_instance)) {
@@ -245,6 +336,7 @@ bool gateway_bacnet_stack_upsert_object(
Binary_Value_Description_Set(object_instance, description);
Binary_Value_Write_Enable(object_instance);
Binary_Value_Present_Value_Set(object_instance, BINARY_INACTIVE);
set_binary_value_state(object_instance, out_of_service, object_reliability);
return true;
case GW_BACNET_OBJECT_BINARY_OUTPUT:
if (!Binary_Output_Valid_Instance(object_instance)) {
@@ -253,6 +345,7 @@ bool gateway_bacnet_stack_upsert_object(
Binary_Output_Name_Set(object_instance, object_name);
Binary_Output_Description_Set(object_instance, description);
Binary_Output_Present_Value_Set(object_instance, BINARY_INACTIVE, BACNET_MAX_PRIORITY);
set_binary_output_state(object_instance, out_of_service, object_reliability);
return true;
case GW_BACNET_OBJECT_MULTI_STATE_VALUE:
if (!Multistate_Value_Valid_Instance(object_instance)) {
@@ -263,12 +356,22 @@ bool gateway_bacnet_stack_upsert_object(
Multistate_Value_State_Text_List_Set(object_instance, Multistate_Value_States);
Multistate_Value_Write_Enable(object_instance);
Multistate_Value_Present_Value_Set(object_instance, 1);
set_multistate_value_state(object_instance, out_of_service, object_reliability);
return true;
default:
return false;
}
}
bool gateway_bacnet_stack_clear_objects(void)
{
return clear_analog_value_objects() &&
clear_analog_output_objects() &&
clear_binary_value_objects() &&
clear_binary_output_objects() &&
clear_multistate_value_objects();
}
void gateway_bacnet_stack_send_i_am(void)
{
Send_I_Am(&Handler_Transmit_Buffer[0]);