piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity
4,355 Commits 2 Branches 0 Tags
9716fb04d2d307fec6ed9d8627671a6e35f2d27c
Commit Graph
108 Commits
Author SHA1 Message Date
Kjell Kernen 9716fb04d2 Added Wizard option for flight timer. 2014-05-12 16:27:52 +02:00
bsongis 61224e7207 Merge remote-tracking branch 'origin/next' into bsongis/9XR-PRO_port 
Conflicts:
	companion/src/eeprominterface.cpp
	companion/src/eeprominterface.h
	companion/src/firmwares/opentx/opentxeeprom.cpp
	companion/src/firmwares/opentx/opentxinterface.cpp
	companion/src/firmwares/opentx/opentxinterface.h
	companion/src/mdichild.cpp
	radio/src/Makefile
 2014-05-11 22:48:48 +02:00
bsongis 220e9f3e97 Merge remote-tracking branch 'origin/next' into TaranisPlus 
Conflicts:
	companion/src/generaledit.cpp
	companion/src/generaledit.ui
	radio/src/gui/menu_general.cpp
 2014-05-11 14:41:03 +02:00
bsongis 41571d4a74 Fixes #1065 - Companion part 2014-05-09 17:11:31 +02:00
bsongis f178748090 Fixes #986 
Fixes #1058
 2014-05-05 16:07:07 +02:00
bsongis 573858552c Fixes #1052 2014-05-03 11:26:44 +02:00
Andre Bernet 1a43b6d353 Merge branch 'bsongis/Issue660' into next 
Conflicts:
	companion/src/firmwares/opentx/opentxinterface.cpp
 2014-05-02 14:44:24 +02:00
Andre Bernet 0ffd0c8e0b Merge branch 'next' of https://github.com/opentx/opentx into TaranisPlus 
Conflicts:
	companion/src/firmwares/opentx/opentxinterface.cpp
	radio/src/haptic.cpp
	radio/src/targets/gruvin9x/board_gruvin9x.h
	radio/src/targets/mega2560/board_mega2560.h
	radio/src/targets/sky9x/board_sky9x.h
	radio/src/targets/stock/board_stock.h
	radio/src/targets/taranis/board_taranis.h
	radio/src/targets/taranis/haptic_driver.cpp
 2014-04-29 15:13:05 +02:00
bsongis 08284a69e6 Switches constants properly defined in Companion 2014-04-29 08:55:19 +02:00
bsongis 866e321b1a Haptic, HapticMode and HapticStrength capabilities merged in Companion 2014-04-29 07:30:55 +02:00
Andre Bernet 57d541efc1 Backlight color support in companion 2014-04-23 15:31:12 +02:00
Andre Bernet 5ad4543d91 Taranis Plus support in companion - DON'T FORGET COMPILE SCRIPT 2014-04-23 14:43:57 +02:00
bsongis c5ac19a054 Refactoring FirmwareInterface / EepromInterface 2014-04-18 16:27:27 +02:00
Andre Bernet 3d2a030868 Support for backlight color (a slider from full A to full B?) and A3/A4 2014-04-17 11:21:48 +02:00
bsongis b805b147f3 Issue #660 - Firmware part done. I need to check the ASM because when 
compiled with the FRSKY_STICKS option enabled, the FW is lighter than
without the option!
 2014-04-16 20:04:31 +02:00
projectkk2glider 4ccbc13f6a Merge branch 'upstream/next' 2014-04-16 09:34:14 +02:00
bsongis f47cd81108 ExtraChannels Capacity removed 2014-04-16 07:27:39 +02:00
Damjan Adamic 4850541002 Fixes suggested by Bertrand 2014-04-15 18:47:47 +02:00
Damjan Adamic df954ae483 Fixed many memory leaks 2014-04-14 20:25:17 +02:00
bsongis ed3bc66ea1 Many little differences in logical switches (telemetry sources) between 
Companion and the FW (especially on 9x stock board)
 2014-04-10 12:35:58 +02:00
bsongis a4f378d726 ASpeed+ added to the telemetry sources list 2014-04-07 19:43:29 +02:00
bsongis e1df9df40f Custom Switches renamed to Logical Switches in comments 2014-04-07 17:02:24 +02:00
Andre Bernet d33d2b7ae6 Add trim keys to Taranis simu 2014-04-06 22:25:34 +02:00
bsongis 1751a1a06c Duplicated code removed 2014-04-05 08:28:06 +02:00
Kjell Kernen 63bacf04f8 This takes care of connection sources to the right channels. BUt I have a terribel feeling that I must be duplicating code. This code just has to exist somewhere. 2014-04-04 14:41:09 +02:00
bsongis a3344f399b Fixes #904 2014-04-02 14:21:36 +02:00
Kjell Kernen 8059daccaf Merge branch 'origin/next' 
Conflicts:
	companion/src/CMakeLists.txt
	companion/src/apppreferencesdialog.ui
	companion/src/companion.qrc
	companion/src/mdichild.cpp
 2014-03-31 10:22:23 +02:00
bsongis 7d5b876e27 ARM boards now allow 1 blade in Companion. Shift in Stock-9X EEPROM. 2014-03-31 09:58:28 +02:00
bsongis 59aa647c3d ModelData size on Sky9x was too big 2014-03-28 17:35:32 +01:00
bsongis 51d93b8bde Issue #857 - Better rounding also in Companion. Warning removed in 
simulator
 2014-03-26 13:00:51 +01:00
Andre Bernet 01912356bf A megaton of non-OpenTX UI elements and relations removed in general settings 2014-03-23 13:07:32 +01:00
bsongis 7f5d6ad7ad Issue #807 fixed 2014-03-19 11:42:27 +01:00
bsongis a082a9a53e A couple of bugs in telemetry bars fixed 2014-03-17 11:33:22 +01:00
bsongis 383475a6ed Now the wizard is able to configure a simple 4CH plane 2014-03-14 14:54:45 +01:00
bsongis e0582cd398 Some refactoring in the new Wizard 2014-03-14 14:54:45 +01:00
Kjell Kernen b133a990f1 New plce holder function in eeprominterface for importing wizard data. Need help from Bertrand since the format of the real mixes is mysterious. 2014-03-04 13:36:01 +01:00
bsongis a18953f6a2 Merge remote-tracking branch 'origin/next' into bsongis/9XR-PRO_port 
Conflicts:
	companion/src/avroutputdialog.cpp
	companion/src/burnconfigdialog.cpp
	companion/src/eeprominterface.cpp
	companion/src/eeprominterface.h
	companion/src/firmwares/opentx/opentxinterface.cpp
	companion/src/helpers.cpp
	radio/src/gui/menu_general.cpp
	radio/src/opentx.cpp
 2014-03-03 16:41:41 +01:00
bsongis adf08a59fb Issue #731 fixed - Default mixes/expos created on an empty model 2014-03-03 13:01:17 +01:00
bsongis bf7919bd8d Issue #731 - Conversion issues (Inputs) fixed 2014-03-03 12:24:42 +01:00
bsongis cac6314ce1 Issue #767 - Companion part 2014-03-01 22:18:43 +01:00
bsongis 3215346a1b Issue #767 - Extra Pot (S3) support 2014-03-01 18:54:08 +01:00
bsongis f250d381e5 Issue #764 fixed 2014-02-28 12:16:43 +01:00
bsongis c4bff418e3 Issue #762 fixed 2014-02-28 11:58:37 +01:00
Andre Bernet 572a9ed3ba Merge branch 'next' of https://github.com/opentx/opentx into bsongis/spare_values_in_telemetry_and_functions 2014-02-27 20:09:31 +01:00
bsongis 86c0678273 cppcheck experiment. A couple of memory leaks fixed 2014-02-26 16:10:12 +01:00
Andre Bernet 32bcb8b5d6 Merge pull request #738 from opentx/bsongis/vario_improvements 
Bsongis/vario improvements
 2014-02-26 10:18:41 +01:00
Andre Bernet c5edba2188 Merge pull request #744 from opentx/bsongis/Issue741_a_equals_x_in_logical_switches 
Issue #741 fixed - a==x added in logical switches functions
 2014-02-25 21:07:07 +01:00
Andre Bernet 94afb88f8b Merge branch 'next' of https://github.com/opentx/opentx into bsongis/vario_improvements 
Conflicts:
	radio/src/audio_arm.cpp
 2014-02-25 19:02:36 +01:00
Bertrand Songis c823ca69ce More spares to allow A3/A4/RSSI_Tx/Rx_Batt in Telemetry (ARM boards) 2014-02-24 18:22:39 +01:00
Bertrand Songis 2a8abd08da Issue #741 fixed - a==x added in logical switches functions 2014-02-24 07:30:59 +01:00