Skip to content

Commit 83dcf34

Browse files
committed
Remove discovery headers; update RDM handler enums
Delete rdm_discovery.h and rdm_discovery_statemachine.h (discovery state machine and related API removed/relocated). Update lib-rdm/src/handlers/rdmhandler.cpp: rename enum members to k-prefixed identifiers (PowerState: kFullOff, kStandby, kNormal; ResetMode: kCold) and update all usages accordingly, and change the preprocessor guard from !defined(NODE_RDMNET_LLRP_ONLY) to defined(RDM_RESPONDER). Adjusted conditional checks and responses to match the new identifiers.
1 parent 1cf5068 commit 83dcf34

6 files changed

Lines changed: 19 additions & 608 deletions

File tree

lib-displayudf/Rules.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ ifneq ($(MAKE_FLAGS),)
1414
EXTRA_SRCDIR+=src/e131
1515
endif
1616

17+
ifneq (,$(findstring NODE_RDMNET_LLRP_ONLY,$(MAKE_FLAGS)))
18+
EXTRA_INCLUDES+=../lib-rdm/include
19+
endif
20+
1721
ifneq (,$(findstring NODE_DDP_DISPLAY,$(MAKE_FLAGS)))
1822
EXTRA_INCLUDES+=../lib-ddp/include
1923
endif

lib-dmxnode/Rules.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ ifneq ($(MAKE_FLAGS),)
88
ifeq ($(findstring NODE_E131,$(MAKE_FLAGS)), NODE_E131)
99
EXTRA_INCLUDES+=../lib-e131/include
1010
endif
11+
ifneq (,$(findstring NODE_RDMNET_LLRP_ONLY,$(MAKE_FLAGS)))
12+
EXTRA_INCLUDES+=../lib-rdm/include
13+
endif
1114
ifneq (,$(findstring RDM_RESPONDER,$(MAKE_FLAGS)))
1215
EXTRA_INCLUDES+=../lib-rdmsensor/include
1316
endif

lib-pixeldmx/Rules.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ EXTRA_INCLUDES+=../lib-network/include
66
EXTRA_SRCDIR+=src/json
77

88
ifneq ($(MAKE_FLAGS),)
9+
ifneq (,$(findstring NODE_RDMNET_LLRP_ONLY,$(MAKE_FLAGS)))
10+
EXTRA_INCLUDES+=../lib-rdm/include
11+
endif
912
ifeq ($(findstring OUTPUT_DMX_SEND,$(MAKE_FLAGS)), OUTPUT_DMX_SEND)
1013
EXTRA_INCLUDES+=../lib-dmx/include
1114
endif

0 commit comments

Comments
 (0)