Bsongis/move everything (#3669)

* Directories moved

* Directories moved

* Directories moved

* Directories moved

* Directories moved

* rename horus directories in gui to 480x272

* Directories moved

* Rename taranis to 212x64

* Directories moved - TARANIS target removed, it's now X9E / X9D+ / X9D

* Directories moved - TARANIS target removed, it's now X9E / X9D+ / X9D

* Directories moved - TARANIS target removed, it's now X9E / X9D+ / X9D

* Directories moved - TARANIS target removed, it's now X9E / X9D+ / X9D

* Directories moved - TARANIS target removed, it's now X9E / X9D+ / X9D

* Directories moved - TARANIS target removed, it's now X9E / X9D+ / X9D

* Directories moved - TARANIS target removed, it's now X9E / X9D+ / X9D

* Fix x9e compile

* Directories moved - TARANIS target removed, it's now X9E / X9D+ / X9D

* Directories moved - TARANIS target removed, it's now X9E / X9D+ / X9D

* Directories moved - TARANIS target removed, it's now X9E / X9D+ / X9D

* Directories moved - TARANIS target removed, it's now X9E / X9D+ / X9D

* Directories moved - TARANIS target removed, it's now X9E / X9D+ / X9D

* Minor improvement of path handling

* Another bunch of files renamed :)

* Another bunch of files renamed :)

* Another bunch of files renamed :)

* Another bunch of files renamed :)

* Another bunch of files renamed :)

* Rename 9x to 128x64

* Compilation fixes

* Compilation fixes

* Compilation fixes

* Compilation fixes

* Compilation fixes

* Compilation fixes

.travis.yml

@@ -24,4 +24,4 @@ install:
   - sudo dpkg --install gcc-avr_1%3a4.8-2.1_amd64.deb avr-libc_1%3a1.8.0-4.1_all.deb libmpfr4_3.1.2-1_amd64.deb binutils-avr_2.23.1-2.1_amd64.deb libmpc3_1.0.1-1ubuntu1_amd64.deb
 
 script:
-  - ./radio/util/commit-tests.sh .
+  - ./tools/commit-tests.sh .

companion/src/firmwareinterface.cpp

@@ -130,10 +130,12 @@ QString FirmwareInterface::seekLabel(const QString & label)
 
 QString FirmwareInterface::getFlavour() const
 {
-  if (flavour == "opentx-x9dp")
-    return "opentx-taranis-plus";
-  else if (flavour == "opentx-x9d")
-    return "opentx-taranis";
+  if (flavour == "opentx-taranis-x9e")
+    return "opentx-x9e";
+  else if (flavour == "opentx-x9dp" || flavour == "opentx-taranis-plus")
+    return "opentx-x9d+";
+  else if (flavour == "opentx-taranis")
+    return "opentx-x9d";
   else
     return flavour;
 }

radio/src/CMakeLists.txt

@@ -1,7 +1,7 @@
 include(CMakeForceCompiler)
 include(Bitmaps)
 
-set(PCB "TARANIS" CACHE STRING "Radio type")
+set(PCB "X9D+" CACHE STRING "Radio type")
 set(TRANSLATIONS "EN" CACHE STRING "Radio language")
 option(HELI "Heli menu" ON)
 option(FLIGHT_MODES "Flight Modes" ON)
@@ -53,9 +53,9 @@ set(M128_VARIANT    32768)
 set(FIRMWARE_DEPENDENCIES firmware_translations)
 
 set(9X_GUI_SRC
-  menu_model_inputs_mixes.cpp
-  menu_general_diagkeys.cpp
-  menu_general_diaganas.cpp
+  model_inputs_mixes.cpp
+  radio_diagkeys.cpp
+  radio_diaganas.cpp
   )
 
 set(FATFS_SRC
@@ -66,7 +66,7 @@ set(FATFS_SRC
 
 if(PCB STREQUAL HORUS)
   include(targets/horus/CMakeLists.txt)
-elseif(PCB STREQUAL TARANIS)
+elseif(PCB STREQUAL X9E OR PCB STREQUAL X9D+ OR PCB STREQUAL X9D OR PCB STREQUAL X7D)
   include(targets/taranis/CMakeLists.txt)
 elseif(PCB STREQUAL SKY9X OR PCB STREQUAL 9XRPRO OR PCB STREQUAL AR9X)
   include(targets/sky9x/CMakeLists.txt)
@@ -78,11 +78,11 @@ elseif(PCB STREQUAL 9X2561)
   string(TOLOWER ${PCB} FLAVOUR)
   set(EEPROM EEPROM_RLC)
   add_definitions(-DEEPROM_VARIANT=${M2561_VARIANT})
-  set(GUI_DIR 9x)
+  set(GUI_DIR 128x64)
   set(TARGET_DIR 9x)
   set(FIRMWARE_DEPENDENCIES ${FIRMWARE_DEPENDENCIES} 9x_bitmaps)
   add_definitions(-DPCBSTD -DPCB${PCB} -DCPUM2561)
-  set(TARGET_SRC ${TARGET_SRC} board_stock.cpp)
+  set(TARGET_SRC ${TARGET_SRC} board.cpp)
   set(GUI_SRC ${GUI_SRC} ${9X_GUI_SRC})
   if(SP22)
     add_definitions(-DSP22)
@@ -99,6 +99,8 @@ else()
   message(FATAL_ERROR "Unknown PCB '${PCB}'")
 endif()
 
+include_directories(gui gui/${GUI_DIR})
+
 if(NOT PCB STREQUAL 9XR AND NOT PCB STREQUAL 9XRPRO)
   option(DBLKEYS "Double Keys" ON)
   if(DBLKEYS)
@@ -124,6 +126,8 @@ else()
   include(targets/common/avr/CMakeLists.txt)
 endif()
 
+include_directories(targets/${TARGET_DIR} ${THIRDPARTY_DIR})
+
 foreach(LANGUAGE ${GUI_LANGUAGES})
   string(TOUPPER ${LANGUAGE} LANGUAGE_CAPITALIZED)
   if(TRANSLATIONS STREQUAL ${LANGUAGE_CAPITALIZED})
@@ -158,7 +162,6 @@ set(GUI_SRC
   lcd.cpp
   splash.cpp
   fonts.cpp
-  helpers.cpp
   navigation.cpp
   popups.cpp
   widgets.cpp
@@ -168,16 +171,16 @@ set(GUI_SRC
 set(GUI_SRC
   ${GUI_SRC}
   menu_model.cpp
-  menu_model_select.cpp
-  menu_model_setup.cpp
-  menu_model_limits.cpp
-  menu_model_logical_switches.cpp
+  model_select.cpp
+  model_setup.cpp
+  model_outputs.cpp
+  model_logical_switches.cpp
   model_special_functions.cpp
-  menu_model_telemetry.cpp
-  menu_general.cpp
+  model_telemetry.cpp
+  menu_radio.cpp
   radio_setup.cpp
-  menu_general_trainer.cpp
-  menu_general_version.cpp
+  radio_trainer.cpp
+  radio_version.cpp
   radio_calibration.cpp
   view_main.cpp
   view_statistics.cpp
@@ -198,7 +201,7 @@ endif()
 if(TEMPLATES)
   add_definitions(-DTEMPLATES)
   set(SRC ${SRC} templates.cpp)
-  set(GUI_SRC ${GUI_SRC} menu_model_templates.cpp)
+  set(GUI_SRC ${GUI_SRC} model_templates.cpp)
 endif()
 
 if(NOT LUA STREQUAL NO)
@@ -207,7 +210,7 @@ if(NOT LUA STREQUAL NO)
   set(FIRMWARE_DEPENDENCIES ${FIRMWARE_DEPENDENCIES} ${LUA_EXPORT})
   if(LUA STREQUAL YES)
     add_definitions(-DLUA_MODEL_SCRIPTS)
-    set(GUI_SRC ${GUI_SRC} menu_model_custom_scripts.cpp)
+    set(GUI_SRC ${GUI_SRC} model_custom_scripts.cpp)
   endif()
   set(SRC ${SRC} lua/interface.cpp lua/api_general.cpp lua/api_lcd.cpp lua/api_model.cpp)
   set(LUA_SRC lapi.c lcode.c lctype.c ldebug.c ldo.c ldump.c lfunc.c lgc.c llex.c lmem.c lobject.c lopcodes.c lparser.c
@@ -221,17 +224,17 @@ endif()
 
 if(HELI)
   add_definitions(-DHELI)
-  set(GUI_SRC ${GUI_SRC} menu_model_heli.cpp)
+  set(GUI_SRC ${GUI_SRC} model_heli.cpp)
 endif()
 
 if(FLIGHT_MODES)
   add_definitions(-DFLIGHT_MODES)
-  set(GUI_SRC ${GUI_SRC} menu_model_flightmodes.cpp)
+  set(GUI_SRC ${GUI_SRC} model_flightmodes.cpp)
 endif()
 
 if(CURVES)
   add_definitions(-DCURVES)
-  set(GUI_SRC ${GUI_SRC} menu_model_curves.cpp)
+  set(GUI_SRC ${GUI_SRC} model_curves.cpp)
 endif()
 
 if(GVARS)
@@ -273,7 +276,7 @@ if(SDCARD)
   add_definitions(-DSDCARD)
   include_directories(${FATFS_DIR} ${FATFS_DIR}/option)
   set(SRC ${SRC} sdcard.cpp rtc.cpp logs.cpp)
-  set(GUI_SRC ${GUI_SRC} menu_general_sdmanager.cpp)
+  set(GUI_SRC ${GUI_SRC} radio_sdmanager.cpp)
   set(FIRMWARE_SRC ${FIRMWARE_SRC} ${FATFS_SRC})
 endif()
 
@@ -399,7 +402,7 @@ endif()
   set(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CPP_FLAGS} -g")
   set(CMAKE_EXE_LINKER_FLAGS "-mcpu=${MCU} -mthumb -lm -T${RADIO_SRC_DIRECTORY}/${LINKER_SCRIPT} -Wl,-Map=firmware.map,--cref,--no-warn-mismatch,--gc-sections")
 
-  if(PCB STREQUAL TARANIS)
+  if(PCB STREQUAL X9D OR PCB STREQUAL X9D+ OR PCB STREQUAL X9E)
     add_subdirectory(targets/${TARGET_DIR}/bootloader)
     include_directories(${CMAKE_CURRENT_BINARY_DIR}/targets/${TARGET_DIR}/bootloader)
     set(FIRMWARE_DEPENDENCIES ${FIRMWARE_DEPENDENCIES} bootloader)

radio/src/bitmaps/128x64/CMakeLists.txt

@@ -1,4 +1,4 @@
 add_bitmaps_target(9x_xbm_1bit ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.xbm 128 1bit 4)
 add_bitmaps_target(9x_fonts_1bit ${RADIO_SRC_DIRECTORY}/fonts/std/*.png 128 "")
-add_bitmaps_target(9x_bitmaps ${RADIO_SRC_DIRECTORY}/bitmaps/9x/*.png 128 1bit)
+add_bitmaps_target(9x_bitmaps ${RADIO_SRC_DIRECTORY}/bitmaps/128x64/*.png 128 1bit)
 add_dependencies(9x_bitmaps 9x_fonts_1bit 9x_xbm_1bit)

radio/src/bitmaps/212x64/CMakeLists.txt

@@ -1,4 +1,4 @@
 add_bitmaps_target(taranis_xbm ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.xbm 128 1bit 4)
 add_bitmaps_target(taranis_fonts ${RADIO_SRC_DIRECTORY}/fonts/std/*.png 128 "")
-add_bitmaps_target(taranis_bitmaps ${RADIO_SRC_DIRECTORY}/bitmaps/taranis/*.png 212 4bits)
+add_bitmaps_target(taranis_bitmaps ${RADIO_SRC_DIRECTORY}/bitmaps/212x64/*.png 212 4bits)
 add_dependencies(taranis_bitmaps taranis_fonts taranis_xbm)

radio/src/bitmaps/480x272/CMakeLists.txt

@@ -1,12 +1,12 @@
-add_bitmaps_target(horus_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/horus/bmp_*.png" 480 5/6/5)
-add_bitmaps_target(horus_calibration_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/horus/calibration/bmp_*.png" 480 5/6/5)
-add_bitmaps_target(horus_button_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/horus/button/alpha_*.png" 480 4/4/4/4)
-add_bitmaps_target(horus_alpha_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/horus/alpha_*.png" 480 4/4/4/4)
-add_bitmaps_target(horus_alpha_calibration_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/horus/calibration/alpha_*.png" 480 4/4/4/4)
-add_bitmaps_target(horus_masks ${RADIO_SRC_DIRECTORY}/bitmaps/horus/mask_*.png 480 8bits)
-add_bitmaps_target(horus_slider_masks "${RADIO_SRC_DIRECTORY}/bitmaps/horus/slider/*.png" 480 8bits)
-add_bitmaps_target(horus_layouts_masks "${RADIO_SRC_DIRECTORY}/gui/horus/layouts/*.png" 480 8bits)
-add_bitmaps_target(horus_themes_bitmaps "${RADIO_SRC_DIRECTORY}/gui/horus/themes/*.png" 480 5/6/5)
-add_bitmaps_target(horus_fonts ${RADIO_SRC_DIRECTORY}/fonts/horus/*.png 480 8bits)
-add_bitmaps_target(horus_volume_masks ${RADIO_SRC_DIRECTORY}/bitmaps/horus/volume/*.png 480 8bits)
+add_bitmaps_target(horus_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/480x272/bmp_*.png" 480 5/6/5)
+add_bitmaps_target(horus_calibration_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/480x272/calibration/bmp_*.png" 480 5/6/5)
+add_bitmaps_target(horus_button_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/480x272/button/alpha_*.png" 480 4/4/4/4)
+add_bitmaps_target(horus_alpha_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/480x272/alpha_*.png" 480 4/4/4/4)
+add_bitmaps_target(horus_alpha_calibration_bitmaps "${RADIO_SRC_DIRECTORY}/bitmaps/480x272/calibration/alpha_*.png" 480 4/4/4/4)
+add_bitmaps_target(horus_masks ${RADIO_SRC_DIRECTORY}/bitmaps/480x272/mask_*.png 480 8bits)
+add_bitmaps_target(horus_slider_masks "${RADIO_SRC_DIRECTORY}/bitmaps/480x272/slider/*.png" 480 8bits)
+add_bitmaps_target(horus_layouts_masks "${RADIO_SRC_DIRECTORY}/gui/480x272/layouts/*.png" 480 8bits)
+add_bitmaps_target(horus_themes_bitmaps "${RADIO_SRC_DIRECTORY}/gui/480x272/themes/*.png" 480 5/6/5)
+add_bitmaps_target(horus_fonts ${RADIO_SRC_DIRECTORY}/fonts/480x272/*.png 480 8bits)
+add_bitmaps_target(horus_volume_masks ${RADIO_SRC_DIRECTORY}/bitmaps/480x272/volume/*.png 480 8bits)
 add_dependencies(horus_bitmaps horus_calibration_bitmaps horus_button_bitmaps horus_alpha_bitmaps horus_alpha_calibration_bitmaps horus_masks horus_slider_masks horus_layouts_masks horus_themes_bitmaps horus_fonts horus_volume_masks)

radio/src/bitmaps/CMakeLists.txt

@@ -1,3 +1,3 @@
-add_subdirectory(9x)
-add_subdirectory(taranis)
-add_subdirectory(horus)
+add_subdirectory(128x64)
+add_subdirectory(212x64)
+add_subdirectory(480x272)

radio/src/datastructs.h

@@ -767,8 +767,8 @@ typedef uint8_t swarnenable_t;
 #endif
 
 #if defined(PCBHORUS)
-#include "gui/horus/layout.h"
-#include "gui/horus/topbar.h"
+#include "gui/480x272/layout.h"
+#include "gui/480x272/topbar.h"
 PACK(struct CustomScreenData {
   char layoutName[10];
   Layout::PersistentData layoutData;
@@ -967,7 +967,7 @@ PACK(struct TrainerData {
 #endif
 
 #if defined(PCBHORUS)
-  #include "gui/horus/theme.h"
+  #include "gui/480x272/theme.h"
   #define THEME_DATA \
     NOBACKUP(char themeName[8]); \
     NOBACKUP(Theme::PersistentData themeData);