Companion T12 support (#6480)
* Introduce T12 own variant, radio side * T12 Companion support continued * Remove warnings * Cosmetics
This commit is contained in:
@@ -269,6 +269,7 @@ void convertModelData_218_to_219(ModelData &model)
|
||||
void convertRadioData_218_to_219(RadioData & settings)
|
||||
{
|
||||
settings.version = 219;
|
||||
settings.variant = EEPROM_VARIANT;
|
||||
|
||||
#if defined(PCBHORUS)
|
||||
RadioData_v218 settings_v218 = (RadioData_v218 &)settings;
|
||||
|
||||
@@ -776,7 +776,19 @@ bool eeLoadGeneral()
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(PCBTARANIS)
|
||||
#if defined(RADIO_T12)
|
||||
if (g_eeGeneral.variant != (EEPROM_VARIANT & 0xFFFE)) {
|
||||
TRACE("EEPROM variant %d instead of %d", g_eeGeneral.variant, EEPROM_VARIANT);
|
||||
return false;
|
||||
}
|
||||
else if (g_eeGeneral.variant != EEPROM_VARIANT && g_eeGeneral.version == 218) {
|
||||
TRACE("V218 T12/X7 detected, allowing use", g_eeGeneral.variant, EEPROM_VARIANT); // Production firmware use v218 X7 variant
|
||||
}
|
||||
else {
|
||||
TRACE("EEPROM variant %d instead of %d", g_eeGeneral.variant, EEPROM_VARIANT);
|
||||
return false;
|
||||
}
|
||||
#elif defined(PCBTARANIS)
|
||||
if (g_eeGeneral.variant != EEPROM_VARIANT) {
|
||||
TRACE("EEPROM variant %d instead of %d", g_eeGeneral.variant, EEPROM_VARIANT);
|
||||
return false;
|
||||
|
||||
@@ -80,14 +80,15 @@ elseif(PCB STREQUAL X7)
|
||||
set(NAVIGATION_TYPE 9x)
|
||||
set(MULTIMODULE ON)
|
||||
add_definitions(-DRADIO_T12)
|
||||
add_definitions(-DEEPROM_VARIANT=0x4001)
|
||||
else()
|
||||
set(LUA_EXPORT lua_export_x7)
|
||||
set(FLAVOUR x7)
|
||||
set(NAVIGATION_TYPE x7)
|
||||
add_definitions(-DRADIO_X7)
|
||||
add_definitions(-DEEPROM_VARIANT=0x4000)
|
||||
endif()
|
||||
add_definitions(-DPCBX7 -DSOFTWARE_VOLUME)
|
||||
add_definitions(-DEEPROM_VARIANT=0x4000)
|
||||
add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
|
||||
set(GUI_DIR 128x64)
|
||||
set(BITMAPS_TARGET 9x_bitmaps)
|
||||
|
||||
Reference in New Issue
Block a user