Skip to content

Commit 5c962da

Browse files
committed
Update DmxNode layout and fix UID byte order
Replace separate personality and reserved fields with a two-byte reserved array in DmxNode, and remove emitting the personality value from the DMX node JSON output. Also correct the mapping of serial_number bytes into the RDM UID (reverse the order) to fix UID byte order/endian handling.
1 parent dd56e5a commit 5c962da

3 files changed

Lines changed: 5 additions & 7 deletions

File tree

lib-configstore/include/configurationstore.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,7 @@ struct Flags
167167
struct DmxNode
168168
{
169169
uint32_t flags;
170-
uint8_t personality;
171-
uint8_t reserved;
170+
uint8_t reserved[2];
172171
uint16_t universe[dmxnode::kParamPorts];
173172
uint16_t direction;
174173
uint16_t merge_mode;

lib-dmxnode/src/json/json_config_dmxnode.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ uint32_t GetDmxNode(char* buffer, uint32_t length)
3838
assert(dmx_node != nullptr);
3939

4040
return json::helpers::Serialize(buffer, length, [&](JsonDoc& doc) {
41-
doc[json::DmxNodeParamsConst::kPersonality.name] = "node";
4241
doc[json::DmxNodeParamsConst::kNodeName.name] = dmx_node->GetLongName();
4342
doc[json::DmxNodeParamsConst::kFailsafe.name] = dmxnode::GetFailsafe(dmx_node->GetFailSafe());
4443
doc[json::DmxNodeParamsConst::kDisableMergeTimeout.name] = dmx_node->GetDisableMergeTimeout() ? 1 : 0;

lib-rdm/include/rdm_device_base.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ class Base
6565

6666
uid_[0] = RDMConst::MANUFACTURER_ID[0];
6767
uid_[1] = RDMConst::MANUFACTURER_ID[1];
68-
uid_[2] = serial_number_[0];
69-
uid_[3] = serial_number_[1];
70-
uid_[4] = serial_number_[2];
71-
uid_[5] = serial_number_[3];
68+
uid_[2] = serial_number_[3];
69+
uid_[3] = serial_number_[2];
70+
uid_[4] = serial_number_[1];
71+
uid_[5] = serial_number_[0];
7272
}
7373

7474
uint8_t uid_[RDM_UID_SIZE];

0 commit comments

Comments
 (0)