More fixes

radio/src/CMakeLists.txt

@@ -173,7 +173,7 @@ if(RTC_BACKUP_RAM)
   add_definitions(-DRTC_BACKUP_RAM)
   set(SRC ${SRC} storage/rlc.cpp)
   set(FIRMWARE_SRC ${FIRMWARE_SRC} storage/rtc_backup.cpp)
-  set(GTEST_SRC ${GTEST_SRC} ${RADIO_SRC_DIRECTORY}/storage/rtc_backup.cpp)
+  set(GTEST_SRC ${GTEST_SRC} ${RADIO_SRC_DIR}/storage/rtc_backup.cpp)
 endif()
 
 if(NOT LUA STREQUAL NO)

radio/src/gui/212x64/model_setup.cpp

@@ -1273,7 +1273,7 @@ void menuModelSetup(event_t event)
     {
       uint8_t moduleIdx = CURRENT_MODULE_EDITED(k);
       if (isModuleR9MNonAccess(moduleIdx)) {
-        lcdDrawText(INDENT_WIDTH, y, STR_RFPOWER);
+        lcdDrawText(INDENT_WIDTH, y, STR_RF_POWER);
         if (isModuleR9M_FCC_VARIANT(moduleIdx)) {
           lcdDrawTextAtIndex(MODEL_SETUP_2ND_COLUMN, y, STR_R9M_FCC_POWER_VALUES, g_model.moduleData[moduleIdx].pxx.power, LEFT | attr);
           if (attr)

radio/src/storage/rambackup.h

@@ -1,36 +0,0 @@
-/*
- * Copyright (C) OpenTX
- *
- * Based on code named
- *   th9x - http://code.google.com/p/th9x
- *   er9x - http://code.google.com/p/er9x
- *   gruvin9x - http://code.google.com/p/gruvin9x
- *
- * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#ifndef _RAMBACKUP_H_
-#define _RAMBACKUP_H_
-
-#include "rlc.h"
-
-PACK(struct RamBackup {
-  uint16_t size;
-  uint8_t data[4094];
-});
-
-extern RamBackup * ramBackup;
-
-void rambackupWrite();
-bool rambackupRestore();
-
-#endif

radio/src/storage/storage.h

@@ -71,7 +71,7 @@ void checkExternalAntenna();
 #endif
 
 #if defined(RTC_BACKUP_RAM)
-#include "rambackup.h"
+#include "rtc_backup.h"
 #endif
 
 #endif // _STORAGE_H_

radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt

@@ -54,7 +54,6 @@ endif()
 set(BOOTLOADER_SRC
   ${BOOTLOADER_SRC}
   ../../../../../gui/${GUI_DIR}/lcd.cpp
-  ../../../../../gui/common/stdlcd/fonts.cpp
   ../../../../../keys.cpp
   ../../../../../strhelpers.cpp
   ../../../../../stamp.cpp
@@ -133,6 +132,7 @@ if(PCB STREQUAL X10 OR PCB STREQUAL X12S OR PCB STREQUAL NV14)
 else()
   set(BOOTLOADER_SRC
     ${BOOTLOADER_SRC}
+    ../../../../../gui/common/stdlcd/fonts.cpp
     ../../../../../targets/${TARGET_DIR}/i2c_driver.cpp
     )
   remove_definitions(-DDEBUG)