From 8fa1d91e659355b47d6e1a0dc2a408a969af3704 Mon Sep 17 00:00:00 2001
From: Peter Feerick <pfeerick@users.noreply.github.com>
Date: Tue, 7 Dec 2021 19:48:36 +1000
Subject: [PATCH] SD Card version cleanup + update more OTX references (#1194)

* Remove references to `REQUIRED_SDCARD_VERSION`

* EdgeTX, not OpenTX

* Alignment
---
 CMakeLists.txt                                        |  2 --
 radio/src/targets/common/arm/CMakeLists.txt           |  1 -
 .../src/targets/common/arm/stm32/usbd_storage_msd.cpp | 11 +++++------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ed872064..458aab7f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
 
diff --git a/radio/src/targets/common/arm/CMakeLists.txt b/radio/src/targets/common/arm/CMakeLists.txt
index 7fe68eed2..be3c1e721 100644
--- a/radio/src/targets/common/arm/CMakeLists.txt
+++ b/radio/src/targets/common/arm/CMakeLists.txt
@@ -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)
 
diff --git a/radio/src/targets/common/arm/stm32/usbd_storage_msd.cpp b/radio/src/targets/common/arm/stm32/usbd_storage_msd.cpp
index 3e9022796..5bc65ea97 100644
--- a/radio/src/targets/common/arm/stm32/usbd_storage_msd.cpp
+++ b/radio/src/targets/common/arm/stm32/usbd_storage_msd.cpp
@@ -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
   ;