Directories moved
This commit is contained in:
@@ -107,21 +107,21 @@ if(NOT PCB STREQUAL 9XR AND NOT PCB STREQUAL 9XRPRO)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(CPU_TYPE STREQUAL STM32F4)
|
if(CPU_TYPE STREQUAL STM32F4)
|
||||||
include(common/arm/stm32/f4/CMakeLists.txt)
|
include(targets/common/arm/stm32/f4/CMakeLists.txt)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(CPU_TYPE STREQUAL STM32F2)
|
if(CPU_TYPE STREQUAL STM32F2)
|
||||||
include(common/arm/stm32/f2/CMakeLists.txt)
|
include(targets/common/arm/stm32/f2/CMakeLists.txt)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(CPU_FAMILY STREQUAL STM32)
|
if(CPU_FAMILY STREQUAL STM32)
|
||||||
include(common/arm/stm32/CMakeLists.txt)
|
include(targets/common/arm/stm32/CMakeLists.txt)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(ARCH STREQUAL ARM)
|
if(ARCH STREQUAL ARM)
|
||||||
include(common/arm/CMakeLists.txt)
|
include(targets/common/arm/CMakeLists.txt)
|
||||||
else()
|
else()
|
||||||
include(common/avr/CMakeLists.txt)
|
include(targets/common/avr/CMakeLists.txt)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
foreach(LANGUAGE ${GUI_LANGUAGES})
|
foreach(LANGUAGE ${GUI_LANGUAGES})
|
||||||
|
|||||||
@@ -27,7 +27,7 @@
|
|||||||
|
|
||||||
#include "opentx.h"
|
#include "opentx.h"
|
||||||
#include "telemetry/mavlink.h"
|
#include "telemetry/mavlink.h"
|
||||||
#include "targets/common_avr/serial_driver.h"
|
#include "targets/common/avr/serial_driver.h"
|
||||||
|
|
||||||
#define APSIZE (BSS | DBLSIZE)
|
#define APSIZE (BSS | DBLSIZE)
|
||||||
|
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
#ifndef _BOARD_STOCK_H_
|
#ifndef _BOARD_STOCK_H_
|
||||||
#define _BOARD_STOCK_H_
|
#define _BOARD_STOCK_H_
|
||||||
|
|
||||||
#include "../common_avr/board_avr.h"
|
#include "../common/avr/board_avr.h"
|
||||||
|
|
||||||
//
|
//
|
||||||
// elev thr
|
// elev thr
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ set(DSM2 "NO" CACHE STRING "LCD type (NO/PPM/SERIAL)")
|
|||||||
set(LUA NO)
|
set(LUA NO)
|
||||||
set(PULSES_SRC pulses_avr.cpp)
|
set(PULSES_SRC pulses_avr.cpp)
|
||||||
set(SRC ${SRC} main_avr.cpp)
|
set(SRC ${SRC} main_avr.cpp)
|
||||||
set(FIRMWARE_SRC ${FIRMWARE_SRC} targets/common_avr/adc_driver.cpp)
|
set(FIRMWARE_SRC ${FIRMWARE_SRC} targets/common/avr/adc_driver.cpp)
|
||||||
add_definitions(-DLCD_${LCD})
|
add_definitions(-DLCD_${LCD})
|
||||||
if(DSM2)
|
if(DSM2)
|
||||||
add_definitions(-DDSM2 -DDSM2_${DSM2})
|
add_definitions(-DDSM2 -DDSM2_${DSM2})
|
||||||
@@ -67,8 +67,8 @@ elseif(EXT STREQUAL JETI)
|
|||||||
set(SRC ${SRC} telemetry/jeti.cpp)
|
set(SRC ${SRC} telemetry/jeti.cpp)
|
||||||
elseif(EXT STREQUAL MAVLINK)
|
elseif(EXT STREQUAL MAVLINK)
|
||||||
add_definitions(-DMAVLINK)
|
add_definitions(-DMAVLINK)
|
||||||
include_directories(${THIRDPARTY_DIR} gui/${GUI_DIR} targets/common_avr)
|
include_directories(${THIRDPARTY_DIR} gui/${GUI_DIR} targets/common/avr)
|
||||||
set(SRC ${SRC} telemetry/mavlink.cpp targets/common_avr/serial_driver.cpp)
|
set(SRC ${SRC} telemetry/mavlink.cpp targets/common/avr/serial_driver.cpp)
|
||||||
set(GUI_SRC ${GUI_SRC} view_mavlink.cpp)
|
set(GUI_SRC ${GUI_SRC} view_mavlink.cpp)
|
||||||
math(EXPR EEPROM_VARIANT ${EEPROM_VARIANT}+${MAVLINK_VARIANT})
|
math(EXPR EEPROM_VARIANT ${EEPROM_VARIANT}+${MAVLINK_VARIANT})
|
||||||
elseif(EXT STREQUAL TELEMETREZ)
|
elseif(EXT STREQUAL TELEMETREZ)
|
||||||
@@ -86,7 +86,7 @@ if(EXT STREQUAL FRSKY OR EXT STREQUAL FRSKY_SPORT OR EXT STREQUAL TELEMETREZ)
|
|||||||
option(VARIO "Vario support" ON)
|
option(VARIO "Vario support" ON)
|
||||||
add_definitions(-DFRSKY)
|
add_definitions(-DFRSKY)
|
||||||
set(SRC ${SRC} telemetry/telemetry.cpp telemetry/telemetry_holders.cpp telemetry/frsky.cpp telemetry/frsky_d.cpp)
|
set(SRC ${SRC} telemetry/telemetry.cpp telemetry/telemetry_holders.cpp telemetry/frsky.cpp telemetry/frsky_d.cpp)
|
||||||
set(FIRMWARE_SRC ${FIRMWARE_SRC} targets/common_avr/telemetry_driver.cpp)
|
set(FIRMWARE_SRC ${FIRMWARE_SRC} targets/common/avr/telemetry_driver.cpp)
|
||||||
set(GUI_SRC ${GUI_SRC} view_telemetry.cpp)
|
set(GUI_SRC ${GUI_SRC} view_telemetry.cpp)
|
||||||
if(FRSKY_HUB)
|
if(FRSKY_HUB)
|
||||||
add_definitions(-DFRSKY_HUB)
|
add_definitions(-DFRSKY_HUB)
|
||||||
@@ -21,7 +21,7 @@
|
|||||||
#ifndef _BOARD_GRUVIN9X_H_
|
#ifndef _BOARD_GRUVIN9X_H_
|
||||||
#define _BOARD_GRUVIN9X_H_
|
#define _BOARD_GRUVIN9X_H_
|
||||||
|
|
||||||
#include "../common_avr/board_avr.h"
|
#include "../common/avr/board_avr.h"
|
||||||
|
|
||||||
// Board driver
|
// Board driver
|
||||||
void boardInit(void);
|
void boardInit(void);
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
#ifndef _BOARD_MEGA2560_H_
|
#ifndef _BOARD_MEGA2560_H_
|
||||||
#define _BOARD_MEGA2560_H_
|
#define _BOARD_MEGA2560_H_
|
||||||
|
|
||||||
#include "../common_avr/board_avr.h"
|
#include "../common/avr/board_avr.h"
|
||||||
|
|
||||||
//Mods for futur use ? Beta tester love it
|
//Mods for futur use ? Beta tester love it
|
||||||
//#define ROTENC_DIV2 // rotenc resolution/2
|
//#define ROTENC_DIV2 // rotenc resolution/2
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
#define MAVLINK_COMM_NUM_BUFFERS 1
|
#define MAVLINK_COMM_NUM_BUFFERS 1
|
||||||
|
|
||||||
#include "GCS_MAVLink/include_v1.0/mavlink_types.h"
|
#include "GCS_MAVLink/include_v1.0/mavlink_types.h"
|
||||||
#include "targets/common_avr/serial_driver.h"
|
#include "targets/common/avr/serial_driver.h"
|
||||||
#include "opentx.h"
|
#include "opentx.h"
|
||||||
|
|
||||||
extern int8_t mav_heartbeat;
|
extern int8_t mav_heartbeat;
|
||||||
|
|||||||
Reference in New Issue
Block a user