From 6e1c568b2e528db38db3ba10e69fb70487dcb331 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Thu, 18 Apr 2019 21:50:36 +0200 Subject: [PATCH] Revert "If modelRegistrationID is default it will be kept the same than ownerRegistrationID" This reverts commit b1ea16c3 --- radio/src/pulses/modules.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/radio/src/pulses/modules.h b/radio/src/pulses/modules.h index 80511d5b5..8113cabbd 100644 --- a/radio/src/pulses/modules.h +++ b/radio/src/pulses/modules.h @@ -270,12 +270,7 @@ inline bool isModuleOptionAvailable(uint8_t modelId, uint8_t 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; + return memcmp(g_model.modelRegistrationID, g_eeGeneral.ownerRegistrationID, PXX2_LEN_REGISTRATION_ID) == 0; } #endif // _MODULES_H_