Revert "If modelRegistrationID is default it will be kept the same than ownerRegistrationID"

This reverts commit b1ea16c3
This commit is contained in:
Bertrand Songis
2019-04-18 21:51:26 +02:00
parent 1ab95c6665
commit 6e1c568b2e
+1 -6
View File
@@ -270,12 +270,7 @@ inline bool isModuleOptionAvailable(uint8_t modelId, uint8_t option)
inline bool isDefaultModelRegistrationID() inline bool isDefaultModelRegistrationID()
{ {
return is_memclear(g_model.modelRegistrationID, PXX2_LEN_REGISTRATION_ID); return memcmp(g_model.modelRegistrationID, g_eeGeneral.ownerRegistrationID, PXX2_LEN_REGISTRATION_ID) == 0;
}
inline const char * currentRegistrationID()
{
return isDefaultModelRegistrationID() ? g_eeGeneral.ownerRegistrationID : g_model.modelRegistrationID;
} }
#endif // _MODULES_H_ #endif // _MODULES_H_