SD Card version cleanup + update more OTX references (#1194)
* Remove references to `REQUIRED_SDCARD_VERSION` * EdgeTX, not OpenTX * Alignment
This commit is contained in:
@@ -7,8 +7,6 @@ set(CODENAME "dev")
|
||||
set(VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX})
|
||||
set(VERSION_FAMILY ${VERSION_MAJOR}.${VERSION_MINOR})
|
||||
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}${VERSION_SUFFIX})
|
||||
set(SDCARD_REVISION "0037")
|
||||
set(SDCARD_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}V${SDCARD_REVISION})
|
||||
|
||||
cmake_minimum_required(VERSION 3.13)
|
||||
|
||||
|
||||
@@ -265,7 +265,6 @@ add_definitions(-g)
|
||||
add_definitions(-DCPUARM)
|
||||
add_definitions(-DGPS)
|
||||
add_definitions(-DBATTGRAPH -DTHRTRACE)
|
||||
add_definitions(-DREQUIRED_SDCARD_VERSION="${SDCARD_VERSION}")
|
||||
|
||||
include_directories(${RTOS_DIR}/include)
|
||||
|
||||
|
||||
@@ -262,9 +262,9 @@ int8_t STORAGE_GetMaxLun (void)
|
||||
/* Firmware.txt */
|
||||
const char firmware_txt[] =
|
||||
#if defined(BOOT)
|
||||
"OpenTX Bootloader"
|
||||
"EdgeTX Bootloader"
|
||||
#else
|
||||
"OpenTX Firmware"
|
||||
"EdgeTX Firmware"
|
||||
#endif
|
||||
" for " FLAVOUR "\r\n\r\n"
|
||||
#if defined(BOOT)
|
||||
@@ -272,14 +272,13 @@ const char firmware_txt[] =
|
||||
#else
|
||||
"FWVERSION "
|
||||
#endif
|
||||
"opentx-" FLAVOUR "-" VERSION " (" GIT_STR ")\r\n"
|
||||
"edgetx-" FLAVOUR "-" VERSION " (" GIT_STR ")\r\n"
|
||||
"DATE " DATE "\r\n"
|
||||
"TIME " TIME "\r\n"
|
||||
"req SD ver " REQUIRED_SDCARD_VERSION "\r\n"
|
||||
#if !defined(BOOT)
|
||||
"BOOTVER "
|
||||
"BOOTVER "
|
||||
#else
|
||||
"FWVERSION "
|
||||
"FWVERSION "
|
||||
#endif
|
||||
;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user