* [Simulator] Create RadioKeyWidget class for UI buttons & refactor ButtonsWidget; Refactor SimulatedUIWidget (and subtypes) to use new RadioKeyWidgets/ButtonsWidget; Centralize help text for key mappings and get creative with some icons; Simplify some radio UI setups with rectangular buttons.
* [Simulator] Convert all simulator data I/O to signals/slots mechanism:
* SimulatorInterface/OpenTxSimulator:
- Now inherits from QObject to allow signal/slot interface;
- Allows data exchange on a per-item basis (eg. each I/O value is treated separately instead of sending whole arrays or structs of data);
- Checks for data changes and only emits signals when change is detected (GUI can now assume only new values are being sent);
- Manages its own 10ms timer (doesn't rely on GUI to do that);
- Sends "heartbeat" signals @ 1Hz for status monitoring;
* Simulator GUI:
- All data is exchanged between GUI elements as well as SimulatorInterface via signals/slots using standardized methods;
- Data is sent immediately, and only, when actually changed (eg. a control is moved) instead of in bulk at specific time intervals;
- Similarly, an asynchronous method is used for reading incoming data, w/out timers or loops;
- Improve VirtualJoystickWidget to be more encapsulated and configurable;
- Pause telemetry simulator if window is hidden;
* [Simulator] Move SimulatorInterface instance to separate thread, ensure safe asynchronous operations & proper timer interactions; Protect/remove some functions, & reorganize the order (cosmetics).
* [Simulator] Traces are now delivered to OpenTxSimulator and one or more QIODevice(s) can be added as recipient(s); Add SimulatorInterface::getCapability() for compile-time settings; Remove reversed POT1/SLIDER1 mixer exception (Taranis) requirement for SIMU; Fix plus/minus key delay on wheel event w/out encoder.
* [Simulator] Add current knob/slider/trim input value in tool-tips (KnobWidget and SliderWidget).
* [Simulator] Fix trims widget internal value not properly updating, and remove trim influence on virtual joystick X/Y value display (closes #4671).
* [SimulatorInterface] Add handling of transmitter input voltage, including a rough conversion of volts to ADC value for different boards, and default battery volts lookup function; Clear analogs array before starting.
* [Simulator] Add SimulatorInterface::init() method to separate pre-startup tasks; Report actual trim range, not just extended on/off; Change how radio widget states are restored; VirtualJoystickWidget: Connect trim changes directly from simulator, connect joystick events directly, report stick mode directly instead of setting values/constraints externally.
* [Simulator] Calculate default Tx V input based on configured range in radio settings (or warning V+2 for radios which don't support a range).
* [Simulator] Add functional aux. trims for Horus (closes #4699).
* [Companion] Remove problematic QMessageLogContext from AppDebugMessageHandler::messageOutput().
* [Simulator] Prevent trim change via slider if disabled for flight mode (closes #4600).
* [OpenTxSimulator] Fixes for Qt < 5.4.
* [OpenTxSimulator] Fix slot name.
120 lines
5.2 KiB
CMake
120 lines
5.2 KiB
CMake
foreach(FILE ${SRC})
|
|
set(SIMU_SRC ${SIMU_SRC} ../../${FILE})
|
|
endforeach()
|
|
|
|
set(SIMU_SRC
|
|
${SIMU_SRC}
|
|
simpgmspace.cpp
|
|
simueeprom.cpp
|
|
simufatfs.cpp
|
|
simudisk.cpp
|
|
)
|
|
|
|
remove_definitions(-DCLI)
|
|
|
|
if(SDL_FOUND)
|
|
include_directories(${SDL_INCLUDE_DIR})
|
|
add_definitions(-DJOYSTICKS)
|
|
endif()
|
|
|
|
if(SIMU_LUA_COMPILER)
|
|
add_definitions(-DLUA_COMPILER)
|
|
endif()
|
|
|
|
if(Qt5Widgets_FOUND)
|
|
set(SIMULATOR_FLAVOUR opentx-${FLAVOUR})
|
|
set(SIMULATOR_TARGET ${SIMULATOR_FLAVOUR}-simulator)
|
|
add_definitions(-DSIMULATOR_FLAVOUR="${SIMULATOR_FLAVOUR}")
|
|
include_directories(${COMPANION_SRC_DIRECTORY} ${COMPANION_SRC_DIRECTORY}/simulation)
|
|
qt5_wrap_cpp(SIMULATOR_SRC ${COMPANION_SRC_DIRECTORY}/simulation/simulatorinterface.h opentxsimulator.h)
|
|
list(APPEND SIMULATOR_SRC ${SIMU_SRC} opentxsimulator.cpp)
|
|
add_library(${SIMULATOR_TARGET} SHARED ${SIMULATOR_SRC})
|
|
add_dependencies(${SIMULATOR_TARGET} ${FIRMWARE_DEPENDENCIES})
|
|
target_compile_definitions(${SIMULATOR_TARGET} PUBLIC ${APP_COMMON_DEFINES}) # set in top-level CMakeLists
|
|
target_link_libraries(${SIMULATOR_TARGET} ${SDL_LIBRARY})
|
|
qt5_use_modules(${SIMULATOR_TARGET} Core)
|
|
add_custom_target(libsimulator DEPENDS ${SIMULATOR_TARGET})
|
|
|
|
# Prepare the "all-simu-libs" target to build simulator libraries for *every* supported PCB type (PCB_TYPES list)
|
|
# (a fast build machine or corresponding amount of patience is recommended for this target).
|
|
if(${CMAKE_GENERATOR} MATCHES ".*Unix Makefiles$")
|
|
# Ensure parallel builds with GCC make (try with MAKEFLAGS but this seems to be getting clobbered somewhere).
|
|
# otherwise 'make' may complain: "warning: jobserver unavailable: using -j1..." and build single-threaded. (Ninja always rocks this.)
|
|
set(mkflags "$ENV{MAKEFLAGS}")
|
|
if (mkflags STREQUAL "")
|
|
set(mkflags "-j")
|
|
endif()
|
|
endif()
|
|
set(all_libs_cmd ${CMAKE_COMMAND} -E echo "Building all simulator libraries")
|
|
foreach(pcb ${PCB_TYPES})
|
|
set(pcbrev "")
|
|
if(pcb STREQUAL SKY9X)
|
|
set(pcbrev "-DPCBREV=REVC")
|
|
elseif(pcb STREQUAL X12S)
|
|
set(pcbrev "-DPCBREV=13")
|
|
endif()
|
|
set(all_libs_cmd ${all_libs_cmd} && ${CMAKE_COMMAND} -DPCB=${pcb} ${pcbrev} -Wno-dev ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} && ${CMAKE_COMMAND} --build . --target libsimulator -- ${mkflags})
|
|
endforeach()
|
|
add_custom_target(all-simu-libs COMMAND ${all_libs_cmd} USES_TERMINAL WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
|
|
endif()
|
|
|
|
if(WIN32)
|
|
include_directories(SYSTEM ${WIN_INCLUDE_DIRS})
|
|
target_link_libraries(${SIMULATOR_TARGET} PRIVATE ${WIN_LINK_LIBRARIES})
|
|
endif(WIN32)
|
|
|
|
if(MSVC)
|
|
set(CMAKE_CXX_FLAGS "/EHsc /LD /MP")
|
|
else()
|
|
if(MINGW)
|
|
# struct packing breaks on MinGW w/out -mno-ms-bitfields: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52991 & http://stackoverflow.com/questions/24015852/struct-packing-and-alignment-with-mingw
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mno-ms-bitfields")
|
|
endif()
|
|
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0")
|
|
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0")
|
|
endif()
|
|
|
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS}")
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS}")
|
|
|
|
use_cxx11() # ensure gnu++11 in CXX_FLAGS with CMake < 3.1
|
|
|
|
if(FOX_FOUND)
|
|
if(SIMU_DISKIO)
|
|
set(SIMU_SRC ${SIMU_SRC} ${FATFS_DIR}/FatFs/ff.c ${FATFS_DIR}/option/ccsbcs.c)
|
|
endif()
|
|
add_executable(simu WIN32 ${SIMU_SRC} ${RADIO_SRC_DIRECTORY}/simu.cpp)
|
|
add_dependencies(simu ${FIRMWARE_DEPENDENCIES})
|
|
target_include_directories(simu PUBLIC ${FOX_INCLUDE_DIR} )
|
|
target_link_libraries(simu ${FOX_LIBRARY} pthread ${SDL_LIBRARY})
|
|
target_compile_definitions(simu PUBLIC -DSIMU)
|
|
if(SIMU_DISKIO)
|
|
target_compile_definitions(simu PUBLIC -DSIMU_DISKIO)
|
|
endif()
|
|
endif()
|
|
|
|
if(APPLE)
|
|
# OS X compiler no longer automatically includes /Library/Frameworks in search path
|
|
set(CMAKE_SHARED_LINKER_FLAGS -F/Library/Frameworks)
|
|
|
|
set(SIMULATOR_BUNDLES)
|
|
foreach(library ${OPENTX_LIBRARIES})
|
|
set(SIMULATOR_BUNDLE "${library}-bundle")
|
|
add_custom_target(${SIMULATOR_BUNDLE}
|
|
COMMAND install_name_tool -change /opt/local/Library/Frameworks/QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/4/QtCore lib${library}.dylib
|
|
COMMAND install_name_tool -change /opt/local/Library/Frameworks/QtNetwork.framework/Versions/4/QtNetwork @executable_path/../Frameworks/QtNetwork.framework/Versions/4/QtNetwork lib${library}.dylib
|
|
COMMAND install_name_tool -change /opt/local/Library/Frameworks/QtXml.framework/Versions/4/QtXml @executable_path/../Frameworks/QtXml.framework/Versions/4/QtXml lib${library}.dylib
|
|
COMMAND install_name_tool -change /opt/local/Library/Frameworks/QtGui.framework/Versions/4/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/4/QtGui lib${library}.dylib
|
|
COMMAND install_name_tool -change @rpath/SDL.framework/Versions/A/SDL @executable_path/../Frameworks/SDL.framework/Versions/A/SDL lib${library}.dylib
|
|
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
|
|
COMMAND pwd
|
|
COMMAND cp lib${library}.dylib companion.app/Contents/Resources/
|
|
DEPENDS ${library}
|
|
)
|
|
list(APPEND SIMULATOR_BUNDLES ${SIMULATOR_BUNDLE})
|
|
endforeach()
|
|
add_custom_target(opentx-simulators-bundle DEPENDS ${SIMULATOR_BUNDLES})
|
|
endif(APPLE)
|
|
|
|
PrintTargetReport("simu/libsimulator")
|