If modelRegistrationID is default it will be kept the same than ownerRegistrationID
This commit is contained in:
@@ -268,4 +268,14 @@ inline bool isModuleOptionAvailable(uint8_t modelId, uint8_t option)
|
||||
return moduleOptions[modelId] & (1 << option);
|
||||
}
|
||||
|
||||
inline bool isDefaultModelRegistrationID()
|
||||
{
|
||||
return is_memclear(g_model.modelRegistrationID, PXX2_LEN_REGISTRATION_ID);
|
||||
}
|
||||
|
||||
inline const char * currentRegistrationID()
|
||||
{
|
||||
return isDefaultModelRegistrationID() ? g_eeGeneral.ownerRegistrationID : g_model.modelRegistrationID;
|
||||
}
|
||||
|
||||
#endif // _MODULES_H_
|
||||
|
||||
@@ -157,8 +157,9 @@ void Pxx2Pulses::setupRegisterFrame(uint8_t module)
|
||||
for (uint8_t i=0; i<PXX2_LEN_RX_NAME; i++) {
|
||||
Pxx2Transport::addByte(zchar2char(reusableBuffer.moduleSetup.pxx2.registerRxName[i]));
|
||||
}
|
||||
const char * registrationID = currentRegistrationID();
|
||||
for (uint8_t i=0; i<PXX2_LEN_REGISTRATION_ID; i++) {
|
||||
Pxx2Transport::addByte(zchar2char(g_model.modelRegistrationID[i]));
|
||||
Pxx2Transport::addByte(zchar2char(registrationID[i]));
|
||||
}
|
||||
Pxx2Transport::addByte(reusableBuffer.moduleSetup.pxx2.registerLoopIndex);
|
||||
}
|
||||
@@ -239,8 +240,9 @@ void Pxx2Pulses::setupBindFrame(uint8_t module)
|
||||
}
|
||||
else {
|
||||
Pxx2Transport::addByte(0x00);
|
||||
const char * registrationID = currentRegistrationID();
|
||||
for (uint8_t i=0; i<PXX2_LEN_REGISTRATION_ID; i++) {
|
||||
Pxx2Transport::addByte(zchar2char(g_model.modelRegistrationID[i]));
|
||||
Pxx2Transport::addByte(zchar2char(registrationID[i]));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user