Wismy/fport2 (#7956)
Add Fport2 option RX6R/RX4R/G-RX8/G-RX6/RXSR OTA support
This commit is contained in:
@@ -48,6 +48,7 @@ enum {
|
|||||||
ITEM_RECEIVER_SETTINGS_TELEMETRY,
|
ITEM_RECEIVER_SETTINGS_TELEMETRY,
|
||||||
ITEM_RECEIVER_SETTINGS_TELEMETRY_25MW,
|
ITEM_RECEIVER_SETTINGS_TELEMETRY_25MW,
|
||||||
ITEM_RECEIVER_SETTINGS_SPORT_FPORT,
|
ITEM_RECEIVER_SETTINGS_SPORT_FPORT,
|
||||||
|
ITEM_RECEIVER_SETTINGS_FPORT2,
|
||||||
ITEM_RECEIVER_SETTINGS_CAPABILITY_NOT_SUPPORTED1,
|
ITEM_RECEIVER_SETTINGS_CAPABILITY_NOT_SUPPORTED1,
|
||||||
ITEM_RECEIVER_SETTINGS_CAPABILITY_NOT_SUPPORTED2,
|
ITEM_RECEIVER_SETTINGS_CAPABILITY_NOT_SUPPORTED2,
|
||||||
ITEM_RECEIVER_SETTINGS_PINMAP_FIRST
|
ITEM_RECEIVER_SETTINGS_PINMAP_FIRST
|
||||||
@@ -82,6 +83,7 @@ bool menuModelReceiverOptions(event_t event)
|
|||||||
isModuleR9MAccess(g_moduleIdx) && receiverVariant == PXX2_VARIANT_EU && reusableBuffer.hardwareAndSettings.moduleSettings.txPower > 14 /*25mW*/ ? READONLY_ROW : (uint8_t)0, // Telemetry
|
isModuleR9MAccess(g_moduleIdx) && receiverVariant == PXX2_VARIANT_EU && reusableBuffer.hardwareAndSettings.moduleSettings.txPower > 14 /*25mW*/ ? READONLY_ROW : (uint8_t)0, // Telemetry
|
||||||
IF_RECEIVER_CAPABILITY(RECEIVER_CAPABILITY_TELEMETRY_25MW, 0),
|
IF_RECEIVER_CAPABILITY(RECEIVER_CAPABILITY_TELEMETRY_25MW, 0),
|
||||||
IF_RECEIVER_CAPABILITY(RECEIVER_CAPABILITY_FPORT, 0),
|
IF_RECEIVER_CAPABILITY(RECEIVER_CAPABILITY_FPORT, 0),
|
||||||
|
IF_RECEIVER_CAPABILITY(RECEIVER_CAPABILITY_FPORT2, 0),
|
||||||
uint8_t(reusableBuffer.hardwareAndSettings.modules[g_moduleIdx].receivers[receiverId].information.capabilityNotSupported ? READONLY_ROW : HIDDEN_ROW),
|
uint8_t(reusableBuffer.hardwareAndSettings.modules[g_moduleIdx].receivers[receiverId].information.capabilityNotSupported ? READONLY_ROW : HIDDEN_ROW),
|
||||||
uint8_t(reusableBuffer.hardwareAndSettings.modules[g_moduleIdx].receivers[receiverId].information.capabilityNotSupported ? READONLY_ROW : HIDDEN_ROW),
|
uint8_t(reusableBuffer.hardwareAndSettings.modules[g_moduleIdx].receivers[receiverId].information.capabilityNotSupported ? READONLY_ROW : HIDDEN_ROW),
|
||||||
0 // channels ...
|
0 // channels ...
|
||||||
@@ -177,6 +179,14 @@ bool menuModelReceiverOptions(event_t event)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case ITEM_RECEIVER_SETTINGS_FPORT2:
|
||||||
|
lcdDrawText(MENUS_MARGIN_LEFT, y, "F.Port2");
|
||||||
|
reusableBuffer.hardwareAndSettings.receiverSettings.fport2 = editCheckBox(reusableBuffer.hardwareAndSettings.receiverSettings.fport2, RECEIVER_OPTIONS_2ND_COLUMN, y, attr, event);
|
||||||
|
if (attr && checkIncDec_Ret) {
|
||||||
|
reusableBuffer.hardwareAndSettings.receiverSettings.dirty = RECEIVER_SETTINGS_DIRTY;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
case ITEM_RECEIVER_SETTINGS_CAPABILITY_NOT_SUPPORTED1:
|
case ITEM_RECEIVER_SETTINGS_CAPABILITY_NOT_SUPPORTED1:
|
||||||
lcdDrawText(LCD_W/2, y+1, STR_MORE_OPTIONS_AVAILABLE, SMLSIZE|CENTERED);
|
lcdDrawText(LCD_W/2, y+1, STR_MORE_OPTIONS_AVAILABLE, SMLSIZE|CENTERED);
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ enum {
|
|||||||
ITEM_RECEIVER_SETTINGS_TELEMETRY,
|
ITEM_RECEIVER_SETTINGS_TELEMETRY,
|
||||||
ITEM_RECEIVER_SETTINGS_TELEMETRY_25MW,
|
ITEM_RECEIVER_SETTINGS_TELEMETRY_25MW,
|
||||||
ITEM_RECEIVER_SETTINGS_SPORT_FPORT,
|
ITEM_RECEIVER_SETTINGS_SPORT_FPORT,
|
||||||
|
ITEM_RECEIVER_SETTINGS_FPORT2,
|
||||||
ITEM_RECEIVER_SETTINGS_CAPABILITY_NOT_SUPPORTED1,
|
ITEM_RECEIVER_SETTINGS_CAPABILITY_NOT_SUPPORTED1,
|
||||||
ITEM_RECEIVER_SETTINGS_CAPABILITY_NOT_SUPPORTED2,
|
ITEM_RECEIVER_SETTINGS_CAPABILITY_NOT_SUPPORTED2,
|
||||||
ITEM_RECEIVER_SETTINGS_PINMAP_FIRST
|
ITEM_RECEIVER_SETTINGS_PINMAP_FIRST
|
||||||
@@ -82,6 +83,7 @@ void menuModelReceiverOptions(event_t event)
|
|||||||
isModuleR9MAccess(g_moduleIdx) && receiverVariant == PXX2_VARIANT_EU && reusableBuffer.hardwareAndSettings.moduleSettings.txPower > 14 /*25mW*/ ? READONLY_ROW : (uint8_t)0, // Telemetry
|
isModuleR9MAccess(g_moduleIdx) && receiverVariant == PXX2_VARIANT_EU && reusableBuffer.hardwareAndSettings.moduleSettings.txPower > 14 /*25mW*/ ? READONLY_ROW : (uint8_t)0, // Telemetry
|
||||||
IF_RECEIVER_CAPABILITY(RECEIVER_CAPABILITY_TELEMETRY_25MW, 0),
|
IF_RECEIVER_CAPABILITY(RECEIVER_CAPABILITY_TELEMETRY_25MW, 0),
|
||||||
IF_RECEIVER_CAPABILITY(RECEIVER_CAPABILITY_FPORT, 0),
|
IF_RECEIVER_CAPABILITY(RECEIVER_CAPABILITY_FPORT, 0),
|
||||||
|
IF_RECEIVER_CAPABILITY(RECEIVER_CAPABILITY_FPORT2, 0),
|
||||||
uint8_t(reusableBuffer.hardwareAndSettings.modules[g_moduleIdx].receivers[receiverId].information.capabilityNotSupported ? READONLY_ROW : HIDDEN_ROW),
|
uint8_t(reusableBuffer.hardwareAndSettings.modules[g_moduleIdx].receivers[receiverId].information.capabilityNotSupported ? READONLY_ROW : HIDDEN_ROW),
|
||||||
uint8_t(reusableBuffer.hardwareAndSettings.modules[g_moduleIdx].receivers[receiverId].information.capabilityNotSupported ? READONLY_ROW : HIDDEN_ROW),
|
uint8_t(reusableBuffer.hardwareAndSettings.modules[g_moduleIdx].receivers[receiverId].information.capabilityNotSupported ? READONLY_ROW : HIDDEN_ROW),
|
||||||
0 // channels ...
|
0 // channels ...
|
||||||
@@ -171,6 +173,13 @@ void menuModelReceiverOptions(event_t event)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case ITEM_RECEIVER_SETTINGS_FPORT2:
|
||||||
|
reusableBuffer.hardwareAndSettings.receiverSettings.fport2 = editCheckBox(reusableBuffer.hardwareAndSettings.receiverSettings.fport2, RECEIVER_OPTIONS_2ND_COLUMN, y, "F.Port2", attr, event);
|
||||||
|
if (attr && checkIncDec_Ret) {
|
||||||
|
reusableBuffer.hardwareAndSettings.receiverSettings.dirty = RECEIVER_SETTINGS_DIRTY;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
|
||||||
case ITEM_RECEIVER_SETTINGS_CAPABILITY_NOT_SUPPORTED1:
|
case ITEM_RECEIVER_SETTINGS_CAPABILITY_NOT_SUPPORTED1:
|
||||||
lcdDrawText(LCD_W/2, y+1, STR_MORE_OPTIONS_AVAILABLE, SMLSIZE|CENTERED);
|
lcdDrawText(LCD_W/2, y+1, STR_MORE_OPTIONS_AVAILABLE, SMLSIZE|CENTERED);
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -111,6 +111,7 @@ class ReceiverSettings {
|
|||||||
uint8_t pwmRate;
|
uint8_t pwmRate;
|
||||||
uint8_t fport;
|
uint8_t fport;
|
||||||
uint8_t enablePwmCh5Ch6;
|
uint8_t enablePwmCh5Ch6;
|
||||||
|
uint8_t fport2;
|
||||||
uint8_t outputsCount;
|
uint8_t outputsCount;
|
||||||
uint8_t outputsMapping[24];
|
uint8_t outputsMapping[24];
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -227,6 +227,8 @@ void Pxx2Pulses::setupReceiverSettingsFrame(uint8_t module)
|
|||||||
flag1 |= PXX2_RX_SETTINGS_FLAG1_TELEMETRY_25MW;
|
flag1 |= PXX2_RX_SETTINGS_FLAG1_TELEMETRY_25MW;
|
||||||
if (reusableBuffer.hardwareAndSettings.receiverSettings.enablePwmCh5Ch6)
|
if (reusableBuffer.hardwareAndSettings.receiverSettings.enablePwmCh5Ch6)
|
||||||
flag1 |= PXX2_RX_SETTINGS_FLAG1_ENABLE_PWM_CH5_CH6;
|
flag1 |= PXX2_RX_SETTINGS_FLAG1_ENABLE_PWM_CH5_CH6;
|
||||||
|
if (reusableBuffer.hardwareAndSettings.receiverSettings.fport2)
|
||||||
|
flag1 |= PXX2_RX_SETTINGS_FLAG1_FPORT2;
|
||||||
Pxx2Transport::addByte(flag1);
|
Pxx2Transport::addByte(flag1);
|
||||||
uint8_t outputsCount = min<uint8_t>(24, reusableBuffer.hardwareAndSettings.receiverSettings.outputsCount);
|
uint8_t outputsCount = min<uint8_t>(24, reusableBuffer.hardwareAndSettings.receiverSettings.outputsCount);
|
||||||
for (int i = 0; i < outputsCount; i++) {
|
for (int i = 0; i < outputsCount; i++) {
|
||||||
|
|||||||
@@ -55,6 +55,7 @@
|
|||||||
#define PXX2_RX_SETTINGS_FLAG1_FPORT (1 << 3)
|
#define PXX2_RX_SETTINGS_FLAG1_FPORT (1 << 3)
|
||||||
#define PXX2_RX_SETTINGS_FLAG1_TELEMETRY_25MW (1 << 2)
|
#define PXX2_RX_SETTINGS_FLAG1_TELEMETRY_25MW (1 << 2)
|
||||||
#define PXX2_RX_SETTINGS_FLAG1_ENABLE_PWM_CH5_CH6 (1 << 1)
|
#define PXX2_RX_SETTINGS_FLAG1_ENABLE_PWM_CH5_CH6 (1 << 1)
|
||||||
|
#define PXX2_RX_SETTINGS_FLAG1_FPORT2 (1 << 0)
|
||||||
|
|
||||||
#define PXX2_TX_SETTINGS_FLAG0_WRITE (1 << 6)
|
#define PXX2_TX_SETTINGS_FLAG0_WRITE (1 << 6)
|
||||||
#define PXX2_TX_SETTINGS_FLAG1_EXTERNAL_ANTENNA (1 << 3)
|
#define PXX2_TX_SETTINGS_FLAG1_EXTERNAL_ANTENNA (1 << 3)
|
||||||
@@ -220,16 +221,16 @@ static const uint8_t PXX2ReceiverOptions[] = {
|
|||||||
0b11111110, // X8R
|
0b11111110, // X8R
|
||||||
0b11111110, // RX8R
|
0b11111110, // RX8R
|
||||||
0b11111110, // RX8R-PRO
|
0b11111110, // RX8R-PRO
|
||||||
0b11111110, // RX6R
|
0b11111111, // RX6R
|
||||||
0b11111110, // RX4R
|
0b11111111, // RX4R
|
||||||
0b11111110, // G-RX8
|
0b11111111, // G-RX8
|
||||||
0b11111110, // G-RX6
|
0b11111111, // G-RX6
|
||||||
0b11111110, // X6R
|
0b11111110, // X6R
|
||||||
0b11111110, // X4R
|
0b11111110, // X4R
|
||||||
0b11111110, // X4R-SB
|
0b11111110, // X4R-SB
|
||||||
0b11111110, // XSR
|
0b11111110, // XSR
|
||||||
0b11111110, // XSR-M
|
0b11111110, // XSR-M
|
||||||
0b11111110, // RXSR
|
0b11111111, // RXSR
|
||||||
0b11111110, // S6R
|
0b11111110, // S6R
|
||||||
0b11111110, // S8R
|
0b11111110, // S8R
|
||||||
0b11111110, // XM
|
0b11111110, // XM
|
||||||
@@ -266,6 +267,7 @@ enum ReceiverCapabilities {
|
|||||||
RECEIVER_CAPABILITY_FPORT,
|
RECEIVER_CAPABILITY_FPORT,
|
||||||
RECEIVER_CAPABILITY_TELEMETRY_25MW,
|
RECEIVER_CAPABILITY_TELEMETRY_25MW,
|
||||||
RECEIVER_CAPABILITY_ENABLE_PWM_CH5_CH6,
|
RECEIVER_CAPABILITY_ENABLE_PWM_CH5_CH6,
|
||||||
|
RECEIVER_CAPABILITY_FPORT2,
|
||||||
RECEIVER_CAPABILITY_COUNT
|
RECEIVER_CAPABILITY_COUNT
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -92,6 +92,9 @@ void processReceiverSettingsFrame(uint8_t module, const uint8_t * frame)
|
|||||||
if (frame[4] & PXX2_RX_SETTINGS_FLAG1_ENABLE_PWM_CH5_CH6)
|
if (frame[4] & PXX2_RX_SETTINGS_FLAG1_ENABLE_PWM_CH5_CH6)
|
||||||
destination->enablePwmCh5Ch6 = 1;
|
destination->enablePwmCh5Ch6 = 1;
|
||||||
|
|
||||||
|
if (frame[4] & PXX2_RX_SETTINGS_FLAG1_FPORT2)
|
||||||
|
destination->fport2 = 1;
|
||||||
|
|
||||||
uint8_t outputsCount = min<uint8_t>(16, frame[0] - 4);
|
uint8_t outputsCount = min<uint8_t>(16, frame[0] - 4);
|
||||||
destination->outputsCount = outputsCount;
|
destination->outputsCount = outputsCount;
|
||||||
for (uint8_t pin = 0; pin < outputsCount; pin++) {
|
for (uint8_t pin = 0; pin < outputsCount; pin++) {
|
||||||
|
|||||||
Reference in New Issue
Block a user