committed by
Bertrand Songis
parent
bb2ca31dad
commit
8b4d2b698d
@@ -8,7 +8,8 @@ set(PWR_BUTTON "PRESS" CACHE STRING "Pwr button type (PRESS/SWITCH)")
|
||||
set(CPU_TYPE STM32F4)
|
||||
set(HSE_VALUE 12000000)
|
||||
set(SDCARD YES)
|
||||
set(EEPROM SDCARD)
|
||||
set(STORAGE SDCARD)
|
||||
set(STORAGE_FORMAT BIN)
|
||||
set(HAPTIC YES)
|
||||
set(GUI_DIR colorlcd)
|
||||
set(NAVIGATION_TYPE horus)
|
||||
@@ -24,6 +25,11 @@ set(RAMBACKUP YES)
|
||||
set(PPM_LIMITS_SYMETRICAL YES)
|
||||
set(USB_SERIAL ON CACHE BOOL "Enable USB serial (CDC)")
|
||||
|
||||
option(YAML_STORAGE "Enable YAML storage" NO)
|
||||
if(YAML_STORAGE)
|
||||
set(STORAGE_FORMAT YAML)
|
||||
endif()
|
||||
|
||||
# for size report script
|
||||
set(CPU_TYPE_FULL STM32F429xI)
|
||||
set(SIZE_TARGET_MEM_DEFINE "MEM_SIZE_SDRAM2=8192")
|
||||
|
||||
@@ -124,7 +124,7 @@ uint32_t sdMounted();
|
||||
#endif
|
||||
|
||||
#if defined(DISK_CACHE)
|
||||
#include "diskio.h"
|
||||
#include "FatFs/diskio.h"
|
||||
DRESULT __disk_read(BYTE drv, BYTE * buff, DWORD sector, UINT count);
|
||||
DRESULT __disk_write(BYTE drv, const BYTE * buff, DWORD sector, UINT count);
|
||||
#else
|
||||
|
||||
@@ -124,11 +124,20 @@ bool redirectToSettingsDirectory(const std::string & path)
|
||||
*/
|
||||
if (!simuSettingsDirectory.empty()) {
|
||||
#if defined(COLORLCD)
|
||||
if (path == RADIO_MODELSLIST_PATH || path == RADIO_SETTINGS_PATH) {
|
||||
if (path == RADIO_MODELSLIST_PATH || path == RADIO_SETTINGS_PATH
|
||||
#if defined(SDCARD_YAML)
|
||||
|| path == RADIO_MODELSLIST_YAML_PATH || path == RADIO_SETTINGS_YAML_PATH
|
||||
#endif
|
||||
) {
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
if (startsWith(path, "/MODELS") && endsWith(path, MODELS_EXT)) {
|
||||
if (startsWith(path, "/MODELS")
|
||||
&& (endsWith(path, MODELS_EXT)
|
||||
#if defined(SDCARD_YAML)
|
||||
|| endsWith(path, YAML_EXT)
|
||||
#endif
|
||||
)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,8 @@ set(LUA NO)
|
||||
set(MCU cortex-m3)
|
||||
set(SDCARD YES)
|
||||
set(HAPTIC YES)
|
||||
set(EEPROM EEPROM_RAW)
|
||||
set(STORAGE EEPROM)
|
||||
set(STORAGE_FORMAT RAW)
|
||||
set(GUI_DIR 128x64)
|
||||
set(NAVIGATION_TYPE 9x)
|
||||
set(TARGET_DIR sky9x)
|
||||
|
||||
@@ -271,7 +271,8 @@ endif()
|
||||
|
||||
set(HSE_VALUE 12000000)
|
||||
set(SDCARD YES)
|
||||
set(EEPROM EEPROM_RLC)
|
||||
set(STORAGE EEPROM)
|
||||
set(STORAGE_FORMAT RLC)
|
||||
set(TARGET_DIR taranis)
|
||||
set(PPM_LIMITS_SYMETRICAL YES)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user