Reorganize module type/subType/rfProtocol

2022-03-24 10:40:17 +01:00
parent 049f337665
commit 86d1ca4364
38 changed files with 163 additions and 275 deletions
@@ -262,7 +262,10 @@ uint8_t getRequiredProtocol(uint8_t module)

 #if defined(DSM2)
    case MODULE_TYPE_DSM2:
-      protocol = limit<uint8_t>(PROTOCOL_CHANNELS_DSM2_LP45, PROTOCOL_CHANNELS_DSM2_LP45+g_model.moduleData[module].rfProtocol, PROTOCOL_CHANNELS_DSM2_DSMX);
+      protocol = limit<uint8_t>(
+          PROTOCOL_CHANNELS_DSM2_LP45,
+          PROTOCOL_CHANNELS_DSM2_LP45 + g_model.moduleData[module].subType,
+          PROTOCOL_CHANNELS_DSM2_DSMX);
      // The module is set to OFF during one second before BIND start
      {
        static tmr10ms_t bindStartTime = 0;