piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity
Files
e76478f27aefc96a4a14275a30c00b449b79fdfd
edgetx-gx12/companion/src
T
History
Bertrand Songis de733579d5 Merge remote-tracking branch 'origin/next' into Horus 
# Conflicts:
#	companion/src/CMakeLists.txt
#	companion/src/firmwares/opentx/opentxinterface.cpp
#	companion/src/firmwares/opentx/simulator/CMakeLists.txt
#	companion/src/firmwares/opentx/stamp-opentx.h.in
#	radio/src/Makefile
#	radio/src/cli.cpp
#	radio/src/gui/Taranis/helpers.cpp
#	radio/src/gui/Taranis/lcd.cpp
#	radio/src/gui/Taranis/menu_model_setup.cpp
#	radio/src/gui/Taranis/view_main.cpp
#	radio/src/lua_api.cpp
#	radio/src/main_avr.cpp
#	radio/src/myeeprom.h
#	radio/src/opentx.cpp
#	radio/src/pulses/pxx_arm.cpp
#	radio/src/storage/eeprom_conversions.cpp
#	radio/src/targets/Horus/adc_driver.cpp
#	radio/src/targets/Horus/board_horus.cpp
#	radio/src/targets/Horus/board_horus.h
#	radio/src/targets/Horus/diskio.cpp
#	radio/src/targets/Horus/hal.h
#	radio/src/targets/Horus/haptic_driver.cpp
#	radio/src/targets/Horus/i2c_driver.cpp
#	radio/src/targets/Horus/keys_driver.cpp
#	radio/src/targets/Horus/lcd_driver.cpp
#	radio/src/targets/Horus/led_driver.cpp
#	radio/src/targets/Horus/pulses_driver.cpp
#	radio/src/targets/Horus/pwr_driver.c
#	radio/src/targets/Horus/sdio_sd.c
#	radio/src/targets/Horus/sdio_sd.h
#	radio/src/targets/Horus/serial2_driver.cpp
#	radio/src/targets/Horus/telemetry_driver.cpp
#	radio/src/targets/Horus/usb_conf.h
#	radio/src/targets/Horus/usbd_desc.c
#	radio/src/targets/Horus/usbd_storage_msd.cpp
2015-11-15 23:08:34 +01:00
..
cmake
[companion]CMake find QT lupdate. Fixes #2222.
2015-04-24 01:06:03 -03:00
firmwares
Merge remote-tracking branch 'origin/next' into Horus
2015-11-15 23:08:34 +01:00
generaledit
Fixes #2936: 3POS type removed from SH and SF switches (hw only supports 2POS type)
2015-10-10 16:38:04 +02:00
images
[Horus] Simulator graphics
2015-11-11 10:02:12 +01:00
modeledit
LR12 protocol actually doesn't support remote failsafe configuration
2015-11-13 19:26:34 +04:00
qcustomplot
Updated QCustomPlot to 1.3.1.
2015-05-21 22:08:45 -03:00
shared
Fixes #2870
2015-09-26 07:59:04 +02:00
simulation
Merge remote-tracking branch 'origin/next' into Horus
2015-11-15 23:08:34 +01:00
themes
companion - some missing icons added
2015-07-06 19:26:50 +02:00
translations
CZ translations
2015-11-04 23:19:50 +01:00
appdata.cpp
Companion settings moved to 2.2 directory
2015-10-25 20:09:44 +01:00
appdata.h
Companion settings moved to 2.2 directory
2015-10-25 20:09:44 +01:00
apppreferencesdialog.cpp
Fixes #2634 - Option ALLOW_NIGHTLY_BUILDS added
2015-08-05 18:51:50 +02:00
apppreferencesdialog.h
Allow direct editing of paths
2015-05-02 12:58:47 +02:00
apppreferencesdialog.ui
Semantics
2015-10-28 20:04:06 +04:00
burnconfigdialog.cpp
Refactoring
2014-12-16 21:17:39 +01:00
burnconfigdialog.h
Refactoring
2014-12-16 21:17:39 +01:00
burnconfigdialog.ui
Re #1909: tabs fixed in .ui files
2014-12-14 16:41:42 +01:00
CMakeLists.txt
Merge remote-tracking branch 'origin/next' into Horus
2015-11-15 23:08:34 +01:00
companion.cpp
Merge remote-tracking branch 'origin/next' into Horus
2015-11-15 23:08:34 +01:00
companion.desktop.in
VERSION_FAMILY dynamic string introduced
2015-11-14 19:17:34 +01:00
companion.qrc
[Horus] Simulator buttons modelized
2015-11-14 21:15:28 +01:00
comparedialog.cpp
Fixes #2896: draw curves without using temporary disk files
2015-09-19 18:19:08 +02:00
comparedialog.h
PrintDialog / CompareDialog refactoring
2015-08-23 09:54:15 +02:00
comparedialog.ui
CompareDialog deleted just after creation
2014-04-21 08:27:37 +02:00
constants.h
EEPROM v217->v218 conversions (on board + Companion)
2015-11-15 20:02:20 +01:00
contributorsdialog.cpp
3DR removed from the blacklist
2015-08-27 11:03:07 +02:00
contributorsdialog.h
Contributors / Release notes dialogs refactoring
2015-07-08 19:42:18 +02:00
converteeprom.cpp
Fixes #2870
2015-09-26 07:59:04 +02:00
converteeprom.h
Fixes #2870
2015-09-26 07:59:04 +02:00
customdebug.h
Debug output for eeprom import. Use "cmake -D CMAKE_BUILD_TYPE=Debug -D DEBUG_IMPORT=ON ../src" to turn it on
2015-06-28 09:34:46 +02:00
customizesplashdialog.cpp
Cosmetics
2015-08-11 06:56:02 +02:00
customizesplashdialog.h
Refactoring
2014-12-16 21:17:39 +01:00
customizesplashdialog.ui
Fixing image size bugs caused by the use of a frame
2014-03-09 23:19:20 +01:00
downloaddialog.cpp
Version automatically appended to the firmware name. Is now calculated
2014-05-28 15:12:23 +02:00
downloaddialog.h
Version automatically appended to the firmware name. Is now calculated
2014-05-28 15:12:23 +02:00
downloaddialog.ui
Most icons set correctly. Icons only seen in Windows (perhaps Mac).
2014-02-20 15:34:13 +01:00
eepromimportexport.h
Debug output for eeprom import. Use "cmake -D CMAKE_BUILD_TYPE=Debug -D DEBUG_IMPORT=ON ../src" to turn it on
2015-06-28 09:34:46 +02:00
eeprominterface.cpp
EEPROM v217->v218 conversions (on board + Companion)
2015-11-15 20:02:20 +01:00
eeprominterface.h
Merge pull request #3022 from opentx/kilrah/protocol_fixes
2015-11-02 00:42:39 +01:00
file.cpp
Merge remote-tracking branch 'origin/next' into Horus
2015-11-15 23:08:34 +01:00
file.h
Another dirty hack for the new Sky9x EEPROM format. This class should be
2015-04-28 23:08:28 +02:00
firmwareinterface.cpp
Fixes #2870
2015-09-26 07:59:04 +02:00
firmwareinterface.h
Fixes #2870
2015-09-26 07:59:04 +02:00
flasheepromdialog.cpp
Fixes #2870
2015-09-26 07:59:04 +02:00
flasheepromdialog.h
Fixes #2870
2015-09-26 07:59:04 +02:00
flasheepromdialog.ui
Fixes #2870
2015-09-26 07:59:04 +02:00
flashfirmwaredialog.cpp
Fixes #2870
2015-09-26 07:59:04 +02:00
flashfirmwaredialog.h
Fixes #2870
2015-09-26 07:59:04 +02:00
flashfirmwaredialog.ui
Fixes #2870
2015-09-26 07:59:04 +02:00
fusesdialog.cpp
Refactoring
2014-12-16 21:17:39 +01:00
fusesdialog.h
Refactoring
2014-12-16 21:17:39 +01:00
fusesdialog.ui
Refactoring
2014-12-16 21:17:39 +01:00
fwpreferencesdialog.cpp
Different voices directory (voices-21) on the web server
2015-06-16 07:54:04 +02:00
fwpreferencesdialog.h
Merge remote-tracking branch 'origin/next' into
2014-04-19 08:21:58 +02:00
fwpreferencesdialog.ui
Re #1909: tabs fixed in .ui files
2014-12-14 16:41:42 +01:00
helpers_html.cpp
Fixes #2870
2015-09-26 07:59:04 +02:00
helpers_html.h
Fixes #2870
2015-09-26 07:59:04 +02:00
helpers.cpp
[Horus] Companion simulator
2015-10-24 16:08:29 +02:00
helpers.h
PrintDialog / CompareDialog refactoring
2015-08-23 09:54:15 +02:00
hexinterface.cpp
Companion build on Linux
2013-12-02 18:47:43 +01:00
hexinterface.h
Companion build on Linux
2013-12-02 18:47:43 +01:00
htmldialog.ui
Contributors / Release notes dialogs refactoring
2015-07-08 19:42:18 +02:00
icon.ico
Updated all other images and icons.
2014-01-21 22:10:58 +01:00
icon.png
Updated all other images and icons.
2014-01-21 22:10:58 +01:00
icon.rc
Companion build on Linux
2013-12-02 18:47:43 +01:00
imgpreferences.ui
Cosmetics
2015-08-11 06:56:02 +02:00
logsdialog.cpp
Export to Google Earth now working (only) with the new telemetry fields (GPS, GAlt and GSpd)
2015-08-01 10:53:06 +02:00
logsdialog.h
Fixes #2546
2015-07-24 10:42:12 +02:00
logsdialog.ui
Fixes #2546
2015-07-24 10:42:12 +02:00
mainwindow.cpp
Wrong address for updates
2015-11-15 12:54:29 +01:00
mainwindow.h
Fixes #2815: some languages were not completelly disabled and caused Companion crash
2015-09-03 12:50:35 +02:00
mdichild.cpp
Next VC++ errors fixed
2015-09-18 07:15:45 +02:00
mdichild.h
Separate context menu for "General Settings", cosmetics
2015-08-16 09:28:43 +02:00
mdichild.ui
Most icons set correctly. Icons only seen in Windows (perhaps Mac).
2014-02-20 15:34:13 +01:00
modelprinter.cpp
Add channel names on companion failsafe sliders (fix #3021), remove redundant stuff
2015-11-01 14:06:49 +04:00
modelprinter.h
Fixes #2896: draw curves without using temporary disk files
2015-09-19 18:19:08 +02:00
modelslist.cpp
PrintDialog / CompareDialog refactoring
2015-08-23 09:54:15 +02:00
modelslist.h
Changed logics for opening model edit windows. Double clicking an empty slot always opens wizard. Clicking en existing always opens model edit. By using right click menu either can be specified.
2014-03-03 16:30:01 +01:00
mountlist.cpp
Re #2987: read_file_system_list() return value memory leak fixed
2015-10-24 19:53:41 +02:00
mountlist.h
Re #2987: read_file_system_list() return value memory leak fixed
2015-10-24 19:53:41 +02:00
multimodelprinter.cpp
Add channel names on companion failsafe sliders (fix #3021), remove redundant stuff
2015-11-01 14:06:49 +04:00
multimodelprinter.h
Fixes #2896: draw curves without using temporary disk files
2015-09-19 18:19:08 +02:00
printdialog.cpp
Fixes #2896: draw curves without using temporary disk files
2015-09-19 18:19:08 +02:00
printdialog.h
PrintDialog / CompareDialog refactoring
2015-08-23 09:54:15 +02:00
printdialog.ui
Fixes #1036
2014-04-30 22:10:01 +02:00
process_copy.cpp
Fixes #2870
2015-09-26 07:59:04 +02:00
process_copy.h
Fixes #2870
2015-09-26 07:59:04 +02:00
process_flash.cpp
Fixes #2870
2015-09-26 07:59:04 +02:00
process_flash.h
Fixes #2870
2015-09-26 07:59:04 +02:00
process_sync.cpp
Fixes #2870
2015-09-26 07:59:04 +02:00
process_sync.h
Fixes #2870
2015-09-26 07:59:04 +02:00
progressdialog.cpp
Fixes #2870
2015-09-26 07:59:04 +02:00
progressdialog.h
Fixes #2870
2015-09-26 07:59:04 +02:00
progressdialog.ui
Fixes #2870
2015-09-26 07:59:04 +02:00
progresswidget.cpp
Fixes #2870
2015-09-26 07:59:04 +02:00
progresswidget.h
Fixes #2870
2015-09-26 07:59:04 +02:00
progresswidget.ui
Fixes #2870
2015-09-26 07:59:04 +02:00
radio.xsd
Reformatted radio.xsd with VS2010 that has superior functions for auto formatting code. It used to be more or less built out of tab characters, which I am alergic to.
2014-02-26 15:35:13 +01:00
radiointerface.cpp
Re #2987: read_file_system_list() return value memory leak fixed
2015-10-24 19:53:41 +02:00
radiointerface.h
Fixes #2870
2015-09-26 07:59:04 +02:00
radionotfound.cpp
Fix for #1176 improved
2014-06-04 12:28:31 +02:00
radionotfound.h
Fix for #1176 improved
2014-06-04 12:28:31 +02:00
radionotfound.ui
Note added to Companion: if you have a Taranis that has not had the
2014-10-03 16:37:08 +02:00
releasenotesdialog.cpp
Fixes #2870
2015-09-26 07:59:04 +02:00
releasenotesdialog.h
Fixes #2870
2015-09-26 07:59:04 +02:00
releasenotesfirmwaredialog.cpp
Fixes #2870
2015-09-26 07:59:04 +02:00
releasenotesfirmwaredialog.h
Fixes #2870
2015-09-26 07:59:04 +02:00
simulator.cpp
Merge remote-tracking branch 'origin/next' into Horus
2015-11-15 23:08:34 +01:00
simulator.desktop.in
VERSION_FAMILY dynamic string introduced
2015-11-14 19:17:34 +01:00
splash.h
FlashInterface rework (missing initialisations, a lot of errors in
2014-04-04 21:48:27 +02:00
splashlabel.h
Cleaned tabs from code. The ones in mainwindow.cpp are mine. The rest come from other contributors.
2014-02-26 15:23:42 +01:00
splashlibrarydialog.cpp
Cosmetics
2015-08-11 06:56:02 +02:00
splashlibrarydialog.h
Cosmetics
2015-08-11 06:56:02 +02:00
splashlibrarydialog.ui
Cosmetics
2015-08-11 06:56:02 +02:00
translations.qrc.in
Spanish translations by Jose Carlos Lorenzo Garcia, thanks!
2015-06-28 12:14:22 +02:00
version.h.in
VERSION_FAMILY dynamic string introduced
2015-11-14 19:17:34 +01:00
warnings.h
New warning
2014-04-16 11:18:06 +02:00
wizarddata.cpp
Fixes #2186
2015-05-05 20:02:02 +02:00
wizarddata.h
Fixes #1146
2014-06-04 11:53:04 +02:00
wizarddialog.cpp
Fix #2091
2015-08-15 11:14:37 -03:00
wizarddialog.h
Fix #2091
2015-08-15 11:14:37 -03:00
xmlinterface.cpp
Refactoring to have messages in Companion when opening eeprom.
2015-09-16 22:29:28 -03:00
xmlinterface.h
Companion build on Linux
2013-12-02 18:47:43 +01:00