variable name to match standard

rdm/device.cpp

@@ -292,7 +292,7 @@ void Device::get(const MsgPtr message, MsgPtr response)
 {
   if (!actionPrep_(message, response))
     return;
-  parameters_.at(message->propertyID)->get(message, response);
+  parameters_.at(message->parameterId)->get(message, response);
 }
 
 
@@ -305,7 +305,7 @@ void Device::set(const MsgPtr message, MsgPtr response)
 {
   if (!actionPrep_(message, response))
     return;
-  parameters_.at(message->propertyID)->set(message, response);
+  parameters_.at(message->parameterId)->set(message, response);
 }
 
 
@@ -372,17 +372,17 @@ void Device::enqueueStatus(StatusPtr status)
  */
 bool Device::actionPrep_(const MsgPtr message, MsgPtr response)
 {
-  if (!parameters_.count(message->propertyID))
+  if (!parameters_.count(message->parameterId))
     {
       response->nak(NR_UNKNOWN_PID);
       return false;
     }
 
-  if (message->propertyID == last_rx_pid_)
+  if (message->parameterId == last_rx_pid_)
     ++ack_overflow_page;
   else {
     ack_overflow_page = 0;
-    last_rx_pid_ = message->propertyID;
+    last_rx_pid_ = message->parameterId;
     }
   return true;
 }
@@ -770,7 +770,7 @@ void Device::actionSensorDispatch(const MsgPtr message, MsgPtr response)
             return;
           }
         auto sensor = sensors_.at(index);
-        switch (message->propertyID) {
+        switch (message->parameterId) {
           case SENSOR_DEFINITION:
             sensor->actionGetSensorDefinition(index, response);
             break;
@@ -789,7 +789,7 @@ void Device::actionSensorDispatch(const MsgPtr message, MsgPtr response)
           }
         auto setSensor = [index, message, response](Sensor * sensor)
         {
-          switch (message->propertyID) {
+          switch (message->parameterId) {
             case SENSOR_VALUE:
               sensor->actionSetSensorValue(index, response);
               break;

rdm/message.cpp

@@ -47,7 +47,7 @@ Message::Message(const Message &obj)
   , portID(obj.portID)
   , messageCount(obj.messageCount)
   , subDevice(obj.subDevice)
-  , propertyID(obj.propertyID)
+  , parameterId(obj.parameterId)
   , failure_mode(0)
 {
   data_.insert(data_.end(), obj.data()->begin(), obj.data()->end());
@@ -174,7 +174,7 @@ void Message::read(const std::vector<uint8_t> &data)
   // Manufacturer-specific parameter whose details are either published by the
   // Manufacturer for third-party support or proprietary for the Manufacturer’s
   // own use.
-  propertyID = readType<uint16_t>(data, 21);
+  parameterId = readType<uint16_t>(data, 21);
 
   // 6.2.10.3 Parameter Data Length (PDL)
   // The Parameter Data Length (PDL) is the number of slots included in the
@@ -206,7 +206,7 @@ void Message::read(const std::vector<uint8_t> &data)
 void Message::write(std::vector<uint8_t> &data) const
 {
   if (commandClass == DISCOVERY_COMMAND_RESPONSE &&
-      propertyID == DISC_UNIQUE_BRANCH)
+      parameterId == DISC_UNIQUE_BRANCH)
     {
       writeDiscBranch(data);
       return;
@@ -223,7 +223,7 @@ void Message::write(std::vector<uint8_t> &data) const
   data.push_back(messageCount);
   writeType(data, subDevice);
   data.push_back(commandClass);
-  writeType(data, propertyID);
+  writeType(data, parameterId);
   data.push_back(length());
   data.insert(data.end(), data_.begin(), data_.end());
   writeType(data, checksum());
@@ -288,7 +288,7 @@ uint16_t Message::checksum() const
   sum = addSum_(sum, messageCount);
   sum = addSum_(sum, subDevice);
   sum = addSum_(sum, commandClass);
-  sum = addSum_(sum, propertyID);
+  sum = addSum_(sum, parameterId);
   sum = addSum_(sum, length());
   for (uint8_t val : data_)
     sum = addSum_(sum, val);

rdm/message.h

@@ -56,7 +56,7 @@ struct Message
   uint8_t messageCount;
   uint16_t subDevice;
   uint8_t commandClass;
-  PID propertyID;
+  PID parameterId;
 
   union {
     uint8_t failure_mode;

rdm/responder.cpp

@@ -202,7 +202,7 @@ void Responder::receive(const MsgPtr message)
   response->source = id;
   response->destination = message->source;
   response->subDevice = message->subDevice;
-  response->propertyID = message->propertyID;
+  response->parameterId = message->parameterId;
   response->transaction = message->transaction;
 
   /// 5.3 Broadcast Message Addressing
@@ -268,7 +268,7 @@ void Responder::rxDiscovery(const MsgPtr message, MsgPtr response)
   if (!actionPrep_(message, response))
     return;
 
-  parameters_.at(message->propertyID)->disc(message, response);
+  parameters_.at(message->parameterId)->disc(message, response);
 }
 
 
@@ -460,7 +460,7 @@ void Responder::actionGetQueuedMessage(const MsgPtr message, MsgPtr response)
 
   if (queued_messages_.empty())
     {
-      response->propertyID = STATUS_MESSAGES;
+      response->parameterId = STATUS_MESSAGES;
       actionGetStatusMessages(message, response);
       return;
     }