datacopy is not needed for simu (#7105)
datacopy is not needed for simu
This commit is contained in:
@@ -76,7 +76,7 @@ set(GVARS_VARIANT 1)
|
|||||||
set(FRSKY_VARIANT 2)
|
set(FRSKY_VARIANT 2)
|
||||||
set(3POS_VARIANT 4)
|
set(3POS_VARIANT 4)
|
||||||
|
|
||||||
set(FIRMWARE_DEPENDENCIES firmware_translations)
|
set(RADIO_DEPENDENCIES firmware_translations)
|
||||||
|
|
||||||
set(FATFS_SRC
|
set(FATFS_SRC
|
||||||
${FATFS_DIR}/ff.c
|
${FATFS_DIR}/ff.c
|
||||||
@@ -150,7 +150,9 @@ include(gui/CMakeLists.txt)
|
|||||||
|
|
||||||
if(RAMBACKUP)
|
if(RAMBACKUP)
|
||||||
add_definitions(-DRAMBACKUP)
|
add_definitions(-DRAMBACKUP)
|
||||||
set(SRC ${SRC} storage/rambackup.cpp storage/rlc.cpp)
|
set(SRC ${SRC} storage/rlc.cpp)
|
||||||
|
set(FIRMWARE_SRC ${FIRMWARE_SRC} storage/rambackup.cpp)
|
||||||
|
set(GTEST_SRC ${GTEST_SRC} ${RADIO_SRC_DIRECTORY}/storage/rambackup.cpp)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(NOT LUA STREQUAL NO)
|
if(NOT LUA STREQUAL NO)
|
||||||
@@ -165,7 +167,7 @@ if(NOT LUA STREQUAL NO)
|
|||||||
add_definitions(-DLUA_SCRIPT_LOAD_MODE="${LUA_SCRIPT_LOAD_MODE}")
|
add_definitions(-DLUA_SCRIPT_LOAD_MODE="${LUA_SCRIPT_LOAD_MODE}")
|
||||||
endif()
|
endif()
|
||||||
include_directories(${LUA_DIR})
|
include_directories(${LUA_DIR})
|
||||||
set(FIRMWARE_DEPENDENCIES ${FIRMWARE_DEPENDENCIES} ${LUA_EXPORT})
|
set(RADIO_DEPENDENCIES ${RADIO_DEPENDENCIES} ${LUA_EXPORT})
|
||||||
if(LUA STREQUAL YES)
|
if(LUA STREQUAL YES)
|
||||||
add_definitions(-DLUA_MODEL_SCRIPTS)
|
add_definitions(-DLUA_MODEL_SCRIPTS)
|
||||||
set(GUI_SRC ${GUI_SRC} model_custom_scripts.cpp)
|
set(GUI_SRC ${GUI_SRC} model_custom_scripts.cpp)
|
||||||
@@ -496,7 +498,7 @@ if(NOT MSVC)
|
|||||||
|
|
||||||
add_executable(firmware ${SRC} ${FIRMWARE_HEADERS})
|
add_executable(firmware ${SRC} ${FIRMWARE_HEADERS})
|
||||||
link_libraries(firmware -lstdc++)
|
link_libraries(firmware -lstdc++)
|
||||||
add_dependencies(firmware ${FIRMWARE_DEPENDENCIES})
|
add_dependencies(firmware ${RADIO_DEPENDENCIES} ${FIRMWARE_DEPENDENCIES})
|
||||||
|
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
TARGET firmware POST_BUILD
|
TARGET firmware POST_BUILD
|
||||||
|
|||||||
+1
-1
@@ -167,7 +167,7 @@ void checkEeprom()
|
|||||||
#else
|
#else
|
||||||
void checkEeprom()
|
void checkEeprom()
|
||||||
{
|
{
|
||||||
#if defined(RAMBACKUP)
|
#if defined(RAMBACKUP) && !defined(SIMU)
|
||||||
if (TIME_TO_RAMBACKUP()) {
|
if (TIME_TO_RAMBACKUP()) {
|
||||||
rambackupWrite();
|
rambackupWrite();
|
||||||
rambackupDirtyMsk = 0;
|
rambackupDirtyMsk = 0;
|
||||||
|
|||||||
@@ -1909,7 +1909,7 @@ void opentxInit()
|
|||||||
|
|
||||||
// handling of storage for radios that have no EEPROM
|
// handling of storage for radios that have no EEPROM
|
||||||
#if !defined(EEPROM)
|
#if !defined(EEPROM)
|
||||||
#if defined(RAMBACKUP)
|
#if defined(RAMBACKUP) && !defined(SIMU)
|
||||||
if (globalData.unexpectedShutdown) {
|
if (globalData.unexpectedShutdown) {
|
||||||
// SDCARD not available, try to restore last model from RAM
|
// SDCARD not available, try to restore last model from RAM
|
||||||
TRACE("rambackupRestore");
|
TRACE("rambackupRestore");
|
||||||
|
|||||||
@@ -91,12 +91,13 @@ endif()
|
|||||||
add_definitions(-DPCBREV=${PCBREV})
|
add_definitions(-DPCBREV=${PCBREV})
|
||||||
add_definitions(-DPCBREV_${PCBREV})
|
add_definitions(-DPCBREV_${PCBREV})
|
||||||
|
|
||||||
set(FIRMWARE_DEPENDENCIES
|
set(RADIO_DEPENDENCIES
|
||||||
${FIRMWARE_DEPENDENCIES}
|
${RADIO_DEPENDENCIES}
|
||||||
${BITMAPS_TARGET}
|
${BITMAPS_TARGET}
|
||||||
datacopy
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
set(FIRMWARE_DEPENDENCIES datacopy)
|
||||||
|
|
||||||
add_definitions(-DPCBHORUS -DSTM32F429_439xx -DSDRAM -DCOLORLCD)
|
add_definitions(-DPCBHORUS -DSTM32F429_439xx -DSDRAM -DCOLORLCD)
|
||||||
add_definitions(-DEEPROM_VARIANT=0 -DAUDIO -DVOICE -DRTCLOCK)
|
add_definitions(-DEEPROM_VARIANT=0 -DAUDIO -DVOICE -DRTCLOCK)
|
||||||
add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
|
add_definitions(-DGPS_USART_BAUDRATE=${INTERNAL_GPS_BAUDRATE})
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ if(Qt5Widgets_FOUND)
|
|||||||
qt5_wrap_cpp(SIMULATOR_SRC ${COMPANION_SRC_DIRECTORY}/simulation/simulatorinterface.h opentxsimulator.h)
|
qt5_wrap_cpp(SIMULATOR_SRC ${COMPANION_SRC_DIRECTORY}/simulation/simulatorinterface.h opentxsimulator.h)
|
||||||
list(APPEND SIMULATOR_SRC ${SIMU_SRC} opentxsimulator.cpp)
|
list(APPEND SIMULATOR_SRC ${SIMU_SRC} opentxsimulator.cpp)
|
||||||
add_library(${SIMULATOR_TARGET} SHARED ${SIMULATOR_SRC})
|
add_library(${SIMULATOR_TARGET} SHARED ${SIMULATOR_SRC})
|
||||||
add_dependencies(${SIMULATOR_TARGET} ${FIRMWARE_DEPENDENCIES})
|
add_dependencies(${SIMULATOR_TARGET} ${RADIO_DEPENDENCIES})
|
||||||
target_compile_definitions(${SIMULATOR_TARGET} PUBLIC ${APP_COMMON_DEFINES}) # set in top-level CMakeLists
|
target_compile_definitions(${SIMULATOR_TARGET} PUBLIC ${APP_COMMON_DEFINES}) # set in top-level CMakeLists
|
||||||
target_link_libraries(${SIMULATOR_TARGET} ${SDL_LIBRARY} Qt5::Core)
|
target_link_libraries(${SIMULATOR_TARGET} ${SDL_LIBRARY} Qt5::Core)
|
||||||
add_custom_target(libsimulator DEPENDS ${SIMULATOR_TARGET})
|
add_custom_target(libsimulator DEPENDS ${SIMULATOR_TARGET})
|
||||||
@@ -97,7 +97,7 @@ if(FOX_FOUND)
|
|||||||
set(SIMU_SRC ${SIMU_SRC} ${FATFS_DIR}/FatFs/ff.c ${FATFS_DIR}/option/ccsbcs.c)
|
set(SIMU_SRC ${SIMU_SRC} ${FATFS_DIR}/FatFs/ff.c ${FATFS_DIR}/option/ccsbcs.c)
|
||||||
endif()
|
endif()
|
||||||
add_executable(simu WIN32 ${SIMU_SRC} ${RADIO_SRC_DIRECTORY}/simu.cpp)
|
add_executable(simu WIN32 ${SIMU_SRC} ${RADIO_SRC_DIRECTORY}/simu.cpp)
|
||||||
add_dependencies(simu ${FIRMWARE_DEPENDENCIES})
|
add_dependencies(simu ${RADIO_DEPENDENCIES})
|
||||||
target_include_directories(simu PUBLIC ${FOX_INCLUDE_DIR} )
|
target_include_directories(simu PUBLIC ${FOX_INCLUDE_DIR} )
|
||||||
target_link_libraries(simu ${FOX_LIBRARY} pthread ${SDL_LIBRARY})
|
target_link_libraries(simu ${FOX_LIBRARY} pthread ${SDL_LIBRARY})
|
||||||
target_compile_definitions(simu PUBLIC -DSIMU)
|
target_compile_definitions(simu PUBLIC -DSIMU)
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ set(EEPROM EEPROM_RAW)
|
|||||||
set(GUI_DIR 128x64)
|
set(GUI_DIR 128x64)
|
||||||
set(NAVIGATION_TYPE 9x)
|
set(NAVIGATION_TYPE 9x)
|
||||||
set(TARGET_DIR sky9x)
|
set(TARGET_DIR sky9x)
|
||||||
set(FIRMWARE_DEPENDENCIES ${FIRMWARE_DEPENDENCIES} 9x_bitmaps)
|
set(RADIO_DEPENDENCIES ${RADIO_DEPENDENCIES} 9x_bitmaps)
|
||||||
set(PPM_LIMITS_SYMETRICAL YES)
|
set(PPM_LIMITS_SYMETRICAL YES)
|
||||||
set(PXX1 YES)
|
set(PXX1 YES)
|
||||||
add_definitions(-DDISABLE_MULTI_UPDATE)
|
add_definitions(-DDISABLE_MULTI_UPDATE)
|
||||||
|
|||||||
@@ -356,4 +356,4 @@ if(INTERNAL_MODULE_PPM)
|
|||||||
add_definitions(-DINTERNAL_MODULE_PPM)
|
add_definitions(-DINTERNAL_MODULE_PPM)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(FIRMWARE_DEPENDENCIES ${FIRMWARE_DEPENDENCIES} ${BITMAPS_TARGET})
|
set(RADIO_DEPENDENCIES ${RADIO_DEPENDENCIES} ${BITMAPS_TARGET})
|
||||||
|
|||||||
@@ -52,8 +52,8 @@ if(GTEST_INCDIR AND GTEST_SRCDIR AND Qt5Widgets_FOUND)
|
|||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mno-ms-bitfields")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mno-ms-bitfields")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_executable(gtests-radio EXCLUDE_FROM_ALL ${TEST_SRC_FILES} ${CMAKE_CURRENT_SOURCE_DIR}/location.h ${RADIO_SRC} ../targets/simu/simpgmspace.cpp ../targets/simu/simueeprom.cpp ../targets/simu/simufatfs.cpp)
|
add_executable(gtests-radio EXCLUDE_FROM_ALL ${GTEST_SRC} ${TEST_SRC_FILES} ${CMAKE_CURRENT_SOURCE_DIR}/location.h ${RADIO_SRC} ../targets/simu/simpgmspace.cpp ../targets/simu/simueeprom.cpp ../targets/simu/simufatfs.cpp)
|
||||||
add_dependencies(gtests-radio ${FIRMWARE_DEPENDENCIES} gtests-radio-lib)
|
add_dependencies(gtests-radio ${RADIO_DEPENDENCIES} ${FIRMWARE_DEPENDENCIES} gtests-radio-lib)
|
||||||
if(PCB STREQUAL X12S OR PCB STREQUAL X10)
|
if(PCB STREQUAL X12S OR PCB STREQUAL X10)
|
||||||
add_dependencies(gtests-radio ${HORUS_MODEL_FILES})
|
add_dependencies(gtests-radio ${HORUS_MODEL_FILES})
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
Reference in New Issue
Block a user