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

Fixed the apps/blinkt example project to control 8 lighting outputs. (#1143)

Browse Source
This commit is contained in:
Steve Karg
2025-11-14 16:23:17 -06:00
committed by GitHub
parent 25d14c7c15
commit c1e685d490
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1
View File
@@ -148,6 +148,7 @@ The git repositories are hosted at the following sites:
### Fixed ### Fixed
* Fixed the apps/blinkt example project to control 8 lighting outputs.(#1143)
* Fixed the sequence of BACnet/SC datalink initialization that was * Fixed the sequence of BACnet/SC datalink initialization that was
broken during datalink environment changes and POSIX file refactoring. broken during datalink environment changes and POSIX file refactoring.
Refactored the UUID and VMAC random functions into port specific Refactored the UUID and VMAC random functions into port specific
apps/blinkt/main.c
+6 -6
View File
@@ -213,7 +213,7 @@ static void bacnet_output_init(void)
{ {
unsigned i = 0; unsigned i = 0;
uint8_t led_max; uint8_t led_max;
uint32_t object_instance = 1; uint32_t object_instance = 0, member_element = 0;
BACNET_COLOR_COMMAND command = { 0 }; BACNET_COLOR_COMMAND command = { 0 };
BACNET_OBJECT_ID object_id; BACNET_OBJECT_ID object_id;
uint32_t light_channel_instance = 1; uint32_t light_channel_instance = 1;
@@ -236,6 +236,8 @@ static void bacnet_output_init(void)
/* configure outputs and bindings */ /* configure outputs and bindings */
led_max = blinkt_led_count(); led_max = blinkt_led_count();
for (i = 0; i < led_max; i++) { for (i = 0; i < led_max; i++) {
object_instance = 1 + i;
member_element = 1 + i;
/* color */ /* color */
Color_Create(object_instance); Color_Create(object_instance);
Color_Write_Enable(object_instance); Color_Write_Enable(object_instance);
@@ -255,7 +257,7 @@ static void bacnet_output_init(void)
member.deviceIdentifier.type = OBJECT_DEVICE; member.deviceIdentifier.type = OBJECT_DEVICE;
member.deviceIdentifier.instance = Device_Object_Instance_Number(); member.deviceIdentifier.instance = Device_Object_Instance_Number();
Channel_Reference_List_Member_Element_Set( Channel_Reference_List_Member_Element_Set(
color_channel_instance, 1 + i, &member); color_channel_instance, member_element, &member);
/* color temperature */ /* color temperature */
Color_Temperature_Create(object_instance); Color_Temperature_Create(object_instance);
@@ -273,7 +275,7 @@ static void bacnet_output_init(void)
member.deviceIdentifier.type = OBJECT_DEVICE; member.deviceIdentifier.type = OBJECT_DEVICE;
member.deviceIdentifier.instance = Device_Object_Instance_Number(); member.deviceIdentifier.instance = Device_Object_Instance_Number();
Channel_Reference_List_Member_Element_Set( Channel_Reference_List_Member_Element_Set(
temp_channel_instance, 1 + i, &member); temp_channel_instance, member_element, &member);
/* lighting output */ /* lighting output */
Lighting_Output_Create(object_instance); Lighting_Output_Create(object_instance);
@@ -291,9 +293,7 @@ static void bacnet_output_init(void)
member.deviceIdentifier.type = OBJECT_DEVICE; member.deviceIdentifier.type = OBJECT_DEVICE;
member.deviceIdentifier.instance = Device_Object_Instance_Number(); member.deviceIdentifier.instance = Device_Object_Instance_Number();
Channel_Reference_List_Member_Element_Set( Channel_Reference_List_Member_Element_Set(
light_channel_instance, 1 + i, &member); light_channel_instance, member_element, &member);
object_instance = 1 + i;
} }
Color_Write_Present_Value_Callback_Set(Color_Write_Value_Handler); Color_Write_Present_Value_Callback_Set(Color_Write_Value_Handler);
Color_Temperature_Write_Present_Value_Callback_Set( Color_Temperature_Write_Present_Value_Callback_Set(