Cosmetics. Merge Unbind with Delete
This commit is contained in:
@@ -246,14 +246,24 @@ enum MenuModelSetupItems {
|
|||||||
#if defined(PXX2)
|
#if defined(PXX2)
|
||||||
const char * STR_BIND = "Bind";
|
const char * STR_BIND = "Bind";
|
||||||
const char * STR_SHARE = "Share";
|
const char * STR_SHARE = "Share";
|
||||||
const char * STR_UNBIND = "Unbind";
|
|
||||||
const char * STR_ERASE = "Erase";
|
const char * STR_ERASE = "Erase";
|
||||||
|
|
||||||
|
bool isPXX2ReceiverEmpty(uint8_t moduleIdx, uint8_t receiverIdx)
|
||||||
|
{
|
||||||
|
return is_memclear(g_model.moduleData[moduleIdx].pxx2.receiverName[receiverIdx], PXX2_LEN_RX_NAME);
|
||||||
|
}
|
||||||
|
|
||||||
|
void removePXX2Receiver(uint8_t moduleIdx, uint8_t receiverIdx)
|
||||||
|
{
|
||||||
|
memclear(g_model.moduleData[moduleIdx].pxx2.receiverName[receiverIdx], PXX2_LEN_RX_NAME);
|
||||||
|
g_model.moduleData[moduleIdx].pxx2.receivers &= ~(1 << receiverIdx);
|
||||||
|
storageDirty(EE_MODEL);
|
||||||
|
}
|
||||||
|
|
||||||
void removePXX2ReceiverIfEmpty(uint8_t moduleIdx, uint8_t receiverIdx)
|
void removePXX2ReceiverIfEmpty(uint8_t moduleIdx, uint8_t receiverIdx)
|
||||||
{
|
{
|
||||||
if (is_memclear(g_model.moduleData[moduleIdx].pxx2.receiverName[receiverIdx], PXX2_LEN_RX_NAME)) {
|
if (isPXX2ReceiverEmpty(moduleIdx, receiverIdx)) {
|
||||||
g_model.moduleData[moduleIdx].pxx2.receivers &= ~(1 << receiverIdx);
|
removePXX2Receiver(moduleIdx, receiverIdx);
|
||||||
storageDirty(EE_MODEL);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -294,17 +304,12 @@ void onPXX2ReceiverMenu(const char * result)
|
|||||||
moduleSettings[moduleIdx].mode = MODULE_MODE_SHARE;
|
moduleSettings[moduleIdx].mode = MODULE_MODE_SHARE;
|
||||||
s_editMode = 1;
|
s_editMode = 1;
|
||||||
}
|
}
|
||||||
else if (result == STR_DELETE) {
|
else if (result == STR_DELETE || result == STR_ERASE) {
|
||||||
g_model.moduleData[moduleIdx].pxx2.receivers &= ~(1 << receiverIdx);
|
|
||||||
memclear(g_model.moduleData[moduleIdx].pxx2.receiverName[receiverIdx], PXX2_LEN_RX_NAME);
|
|
||||||
storageDirty(EE_MODEL);
|
|
||||||
}
|
|
||||||
else if (result == STR_UNBIND || result == STR_ERASE) {
|
|
||||||
memclear(&reusableBuffer.moduleSetup.pxx2, sizeof(reusableBuffer.moduleSetup.pxx2));
|
memclear(&reusableBuffer.moduleSetup.pxx2, sizeof(reusableBuffer.moduleSetup.pxx2));
|
||||||
reusableBuffer.moduleSetup.pxx2.resetReceiverIndex = receiverIdx;
|
reusableBuffer.moduleSetup.pxx2.resetReceiverIndex = receiverIdx;
|
||||||
reusableBuffer.moduleSetup.pxx2.resetReceiverFlags = (result == STR_ERASE ? 0xFF : 0x01);
|
reusableBuffer.moduleSetup.pxx2.resetReceiverFlags = (result == STR_ERASE ? 0xFF : 0x01);
|
||||||
moduleSettings[moduleIdx].mode = MODULE_MODE_RESET;
|
moduleSettings[moduleIdx].mode = MODULE_MODE_RESET;
|
||||||
s_editMode = 1;
|
removePXX2Receiver(moduleIdx, receiverIdx);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
removePXX2ReceiverIfEmpty(moduleIdx, receiverIdx);
|
removePXX2ReceiverIfEmpty(moduleIdx, receiverIdx);
|
||||||
@@ -1345,11 +1350,12 @@ void menuModelSetup(event_t event)
|
|||||||
if (attr && EVT_KEY_MASK(event) == KEY_ENTER) {
|
if (attr && EVT_KEY_MASK(event) == KEY_ENTER) {
|
||||||
killEvents(event);
|
killEvents(event);
|
||||||
POPUP_MENU_ADD_ITEM(STR_BIND);
|
POPUP_MENU_ADD_ITEM(STR_BIND);
|
||||||
POPUP_MENU_ADD_ITEM(STR_OPTIONS);
|
if (!isPXX2ReceiverEmpty(moduleIdx, receiverIdx)) {
|
||||||
POPUP_MENU_ADD_ITEM(STR_SHARE);
|
POPUP_MENU_ADD_ITEM(STR_OPTIONS);
|
||||||
POPUP_MENU_ADD_ITEM(STR_DELETE);
|
POPUP_MENU_ADD_ITEM(STR_SHARE);
|
||||||
POPUP_MENU_ADD_ITEM(STR_UNBIND);
|
POPUP_MENU_ADD_ITEM(STR_DELETE);
|
||||||
POPUP_MENU_ADD_ITEM(STR_RESET);
|
POPUP_MENU_ADD_ITEM(STR_RESET);
|
||||||
|
}
|
||||||
POPUP_MENU_START(onPXX2ReceiverMenu);
|
POPUP_MENU_START(onPXX2ReceiverMenu);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -250,6 +250,7 @@ void Pxx2Pulses::setupResetFrame(uint8_t module)
|
|||||||
addFrameType(PXX2_TYPE_C_MODULE, PXX2_TYPE_ID_RESET);
|
addFrameType(PXX2_TYPE_C_MODULE, PXX2_TYPE_ID_RESET);
|
||||||
Pxx2Transport::addByte(reusableBuffer.moduleSetup.pxx2.resetReceiverIndex);
|
Pxx2Transport::addByte(reusableBuffer.moduleSetup.pxx2.resetReceiverIndex);
|
||||||
Pxx2Transport::addByte(reusableBuffer.moduleSetup.pxx2.resetReceiverFlags);
|
Pxx2Transport::addByte(reusableBuffer.moduleSetup.pxx2.resetReceiverFlags);
|
||||||
|
moduleSettings[module].mode = MODULE_MODE_NORMAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Pxx2Pulses::setupSpectrumAnalyser(uint8_t module)
|
void Pxx2Pulses::setupSpectrumAnalyser(uint8_t module)
|
||||||
@@ -310,7 +311,7 @@ void Pxx2Pulses::setupFrame(uint8_t module)
|
|||||||
setupBindFrame(module);
|
setupBindFrame(module);
|
||||||
break;
|
break;
|
||||||
case MODULE_MODE_RESET:
|
case MODULE_MODE_RESET:
|
||||||
setupRegisterFrame(module);
|
setupResetFrame(module);
|
||||||
break;
|
break;
|
||||||
case MODULE_MODE_SPECTRUM_ANALYSER:
|
case MODULE_MODE_SPECTRUM_ANALYSER:
|
||||||
setupSpectrumAnalyser(module);
|
setupSpectrumAnalyser(module);
|
||||||
|
|||||||
Reference in New Issue
Block a user