From 8c0639a72c12b0a44180eb1340b4134c2761e009 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Fri, 31 May 2019 15:24:54 +0200 Subject: [PATCH] ACCST D16 is OK on ACCESS modules now --- radio/src/gui/128x64/model_setup.cpp | 4 +--- radio/src/pulses/modules_constants.h | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 2e9ce761f..8b7f872c5 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -795,9 +795,7 @@ void menuModelSetup(event_t event) } lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_ISRM_PXX2_RF_PROTOCOLS, index, attr); if (attr) { - // TODO change this once ACCST is available on ACCESS - // index = checkIncDec(event, index, 0, MODULE_SUBTYPE_ISRM_PXX2_LAST + 1 /* because of --- */, EE_MODEL); - index = checkIncDec(event, index, 0, MODULE_SUBTYPE_ISRM_PXX2_ACCESS + 1 /* because of --- */, EE_MODEL); + index = checkIncDec(event, index, 0, MODULE_SUBTYPE_ISRM_PXX2_LAST + 1 /* because of --- */, EE_MODEL); if (checkIncDec_Ret) { memclear(&g_model.moduleData[INTERNAL_MODULE], sizeof(ModuleData)); if (index > 0) { diff --git a/radio/src/pulses/modules_constants.h b/radio/src/pulses/modules_constants.h index 0f041e083..951255caa 100644 --- a/radio/src/pulses/modules_constants.h +++ b/radio/src/pulses/modules_constants.h @@ -29,8 +29,8 @@ enum ModuleSubtypePXX1 { enum ModuleSubtypeISRM_PXX2 { MODULE_SUBTYPE_ISRM_PXX2_ACCESS, MODULE_SUBTYPE_ISRM_PXX2_ACCST_D16, - MODULE_SUBTYPE_ISRM_PXX2_ACCST_LR12, - MODULE_SUBTYPE_ISRM_PXX2_LAST = MODULE_SUBTYPE_ISRM_PXX2_ACCST_LR12 + MODULE_SUBTYPE_ISRM_PXX2_ACCST_LR12, // not implemented in the module as of today + MODULE_SUBTYPE_ISRM_PXX2_LAST = MODULE_SUBTYPE_ISRM_PXX2_ACCST_D16 }; enum ModuleSubtypeR9M_PXX2 {