New UI merged

This commit is contained in:
Bertrand Songis
2019-08-28 20:50:14 +02:00
parent 1f41076b0e
commit f4f8893ae9
806 changed files with 30836 additions and 11704 deletions
+3 -3
View File
@@ -86,12 +86,12 @@ const uint32_t CROSSFIRE_BAUDRATES[] = {
400000,
115200,
};
const uint8_t CROSSFIRE_PERIODS[] = {
const uint8_t CROSSFIRE_FRAME_PERIODS[] = {
4,
16,
};
#define CROSSFIRE_BAUDRATE CROSSFIRE_BAUDRATES[g_eeGeneral.telemetryBaudrate]
#define CROSSFIRE_PERIOD CROSSFIRE_PERIODS[g_eeGeneral.telemetryBaudrate]
#define CROSSFIRE_BAUDRATE CROSSFIRE_BAUDRATES[g_eeGeneral.telemetryBaudrate]
#define CROSSFIRE_PERIOD CROSSFIRE_FRAME_PERIODS[g_eeGeneral.telemetryBaudrate]
#else
#define CROSSFIRE_BAUDRATE 400000
#define CROSSFIRE_PERIOD 4 // 4ms
+2
View File
@@ -140,7 +140,9 @@ void processRegisterFrame(uint8_t module, uint8_t * frame)
cmpStrWithZchar((char *)&frame[12], g_model.modelRegistrationID, PXX2_LEN_REGISTRATION_ID)) {
reusableBuffer.moduleSetup.pxx2.registerStep = REGISTER_OK;
moduleState[module].mode = MODULE_MODE_NORMAL;
#if !defined(COLORLCD)
POPUP_INFORMATION(STR_REG_OK);
#endif
}
}
break;
+1 -1
View File
@@ -293,7 +293,7 @@ void MultiModuleSyncStatus::getRefreshString(char *statusText)
void MultiModuleStatus::getStatusString(char *statusText)
{
if (!isValid()) {
#if defined(PCBTARANIS) || defined(PCBHORUS)
#if defined(PCBFRSKY)
if (IS_INTERNAL_MODULE_ENABLED())
strcpy(statusText, STR_DISABLE_INTERNAL);
else
+1 -1
View File
@@ -170,7 +170,7 @@ void telemetryWakeup()
audioEvent(AU_SENSOR_LOST);
}
#if defined(PCBTARANIS) || defined(PCBHORUS)
#if defined(PCBFRSKY)
if (isBadAntennaDetected()) {
AUDIO_RAS_RED();
POPUP_WARNING(STR_WARNING);