Merge with latest 2.3

This commit is contained in:
Bertrand Songis
2020-06-18 11:14:07 +02:00
121 changed files with 3269 additions and 1775 deletions
+1 -1
View File
@@ -26,7 +26,7 @@
uint8_t getExposCount()
{
uint8_t count = 0;
uint8_t ch ;
uint8_t ch;
for (int i=MAX_EXPOS-1 ; i>=0; i--) {
ch = EXPO_VALID(expoAddress(i));
+1 -1
View File
@@ -26,7 +26,7 @@
uint8_t getMixesCount()
{
uint8_t count = 0;
uint8_t ch ;
uint8_t ch;
for (int i=MAX_MIXERS-1; i>=0; i--) {
ch = mixAddress(i)->srcRaw;
@@ -80,5 +80,6 @@ void startBindMenu(uint8_t moduleIdx)
selection += 1;
POPUP_MENU_SELECT_ITEM(selection);
POPUP_MENU_TITLE(STR_SELECT_MODE);
POPUP_MENU_START(onBindMenu);
}
@@ -304,7 +304,7 @@ void modelSetupModulePxx2ReceiverLine(uint8_t moduleIdx, uint8_t receiverIdx, co
for (auto rx = 0; rx < popupMenuItemsCount; rx++) {
popupMenuItems[rx] = reusableBuffer.moduleSetup.bindInformation.candidateReceiversNames[rx];
}
popupMenuTitle = STR_PXX2_SELECT_RX;
POPUP_MENU_TITLE(STR_PXX2_SELECT_RX);
POPUP_MENU_START(onPXX2BindMenu);
}
}
+6
View File
@@ -83,6 +83,7 @@ enum
{
warningText = nullptr;
warningInfoText = nullptr;
popupMenuTitle = nullptr;
popupMenuHandler = nullptr;
popupMenuItemsCount = 0;
}
@@ -171,6 +172,11 @@ inline void POPUP_MENU_SELECT_ITEM(uint8_t index)
popupMenuSelectedItem = (index > 0 ? (index < popupMenuItemsCount ? index : popupMenuItemsCount) : 0);
}
inline void POPUP_MENU_TITLE(const char * s)
{
popupMenuTitle = s;
}
inline void POPUP_MENU_START(PopupMenuHandler handler)
{
if (handler != popupMenuHandler) {
@@ -585,7 +585,7 @@ void menuRadioSdManager(event_t _event)
for (auto rx = 0; rx < popupMenuItemsCount; rx++) {
popupMenuItems[rx] = reusableBuffer.sdManager.otaUpdateInformation.candidateReceiversNames[rx];
}
popupMenuTitle = STR_PXX2_SELECT_RX;
POPUP_MENU_TITLE(STR_PXX2_SELECT_RX);
POPUP_MENU_START(onUpdateReceiverSelection);
}
}
@@ -21,9 +21,9 @@
#include "opentx.h"
#if LCD_W >= 212
#define TRAINER_CALIB_COLUMN_WIDTH 12
#define TRAINER_CALIB_COLUMN_WIDTH (6 * FW)
#else
#define TRAINER_CALIB_COLUMN_WIDTH 8
#define TRAINER_CALIB_COLUMN_WIDTH (4 * FW + 2)
#endif
void menuRadioTrainer(event_t event)
@@ -86,8 +86,8 @@ void menuRadioTrainer(event_t event)
if (attr)
s_editMode = 0;
lcdDrawText(0*FW, MENU_HEADER_HEIGHT+1+6*FH, STR_CAL, attr);
for (uint8_t i=0; i<4; i++) {
uint8_t x = (i*TRAINER_CALIB_COLUMN_WIDTH + 16) * FW/2;
for (uint8_t i = 0; i < 4; i++) {
uint8_t x = 8*FW + (i * TRAINER_CALIB_COLUMN_WIDTH);
int32_t chVal = ppmInput[i] - g_eeGeneral.trainer.calib[i];
chVal *= g_eeGeneral.trainer.mix[i].studWeight * 10;
chVal /= 512;