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
|
82146f7b7d
|
Merge branch 'next' of https://github.com/opentx/opentx into bsongis/Issue713_more_custom_functions
|
2014-02-25 18:17:15 +01:00 |
|
Bertrand Songis
|
2a8abd08da
|
Issue #741 fixed - a==x added in logical switches functions
|
2014-02-24 07:30:59 +01:00 |
|
Bertrand Songis
|
82e74a72e6
|
Shift in sources when 7 Lua scripts allowed
|
2014-02-22 11:13:42 +01:00 |
|
Bertrand Songis
|
7ebd371ab6
|
Issue #731 fixed (companion Inputs import bug)
|
2014-02-22 10:37:07 +01:00 |
|
Bertrand Songis
|
9ade773618
|
Merge remote-tracking branch 'origin/next' into
bsongis/Issue713_more_custom_functions
Conflicts:
radio/src/.gitignore
radio/src/opentx.cpp
|
2014-02-21 14:26:11 +01:00 |
|
Kjell Kernen
|
5842bc8473
|
First merge problem fixed (there are more)
|
2014-02-20 22:33:41 +01:00 |
|
Kjell Kernen
|
58d8a99511
|
Merge branch 'origin/next'
Conflicts:
companion/src/eeprominterface.cpp
companion/src/firmwares/opentx/opentxinterface.cpp
companion/src/mainwindow.cpp
companion/src/simulatordialog.cpp
companion/src/xsimulatordialog.cpp
|
2014-02-20 21:37:51 +01:00 |
|
Bertrand Songis
|
82348f7e05
|
Import/Export broken in Companion (7scripts instead of 3)
|
2014-02-19 21:39:39 +01:00 |
|
Kjell Kernen
|
80ef2b8d38
|
All function names changed to a consistent standard.
Cleaned up indentation of appdata.h
|
2014-02-19 14:01:34 +01:00 |
|
Kjell Kernen
|
da68c593cf
|
Changed every single QSetting in Companion.
Next step: Function renaming
|
2014-02-18 23:48:57 +01:00 |
|
Bertrand Songis
|
fbd0744431
|
Issue #713 - 64 custom functions instead of 32. 8chars only filenames in
PlayTrack function
|
2014-02-18 22:46:30 +01:00 |
|
Bertrand Songis
|
0d76f2461a
|
Issue #515 fixed. Standalone Qt based simu added. xsimulatordialog and
simulatordialog merged
|
2014-02-14 18:34:01 +01:00 |
|
Bertrand Songis
|
a918f293cf
|
Merge branch 'next' of https://github.com/opentx/opentx into next
|
2014-02-13 17:37:04 +01:00 |
|
Bertrand Songis
|
7d3642e16f
|
Issue #89 fixed - ASpd, dTE, Cel-, Vfas- added to Telemetry. All
telemetry values available in logical switches
|
2014-02-13 17:33:51 +01:00 |
|
Andre Bernet
|
e505efc9f5
|
Merge pull request #681 from opentx/bsongis/Lua_interpreter_171
Bsongis/lua interpreter #171
|
2014-02-13 15:57:57 +01:00 |
|
Bertrand Songis
|
491f4e12c2
|
Logical Switches import issue (Telemetry)
|
2014-02-12 15:57:53 +01:00 |
|
Bertrand Songis
|
7eddd64e3a
|
Merge remote-tracking branch 'origin/next' into
bsongis/Lua_interpreter_171
Conflicts:
companion/src/firmwares/opentx/opentxeeprom.cpp
|
2014-02-10 17:57:40 +01:00 |
|
Andre Bernet
|
f635a1e762
|
Solve merge conflict
|
2014-02-10 15:25:18 +01:00 |
|
Bertrand Songis
|
ce6e9fa4a9
|
Lua EEPROM support in Companion added
|
2014-02-10 14:47:33 +01:00 |
|
Andre Bernet
|
2a83cffc53
|
Merge branch 'next' of https://github.com/opentx/opentx into kilrah/Switch_and_pot_warnings
Conflicts:
companion/src/eeprominterface.h
companion/src/firmwares/opentx/opentxeeprom.cpp
radio/src/opentx.cpp
radio/src/translations/es.h.txt
radio/src/translations/fr.h.txt
|
2014-02-10 14:47:32 +01:00 |
|
Andre Bernet
|
b39dd034c6
|
Switch warnings before 21 March 2013 imported OK
|
2014-02-10 13:08:56 +01:00 |
|
Andre Bernet
|
160cf07110
|
Switch states now imported correctly after 21 March 2013, need to check the case of before that
|
2014-02-10 12:34:52 +01:00 |
|
Andre Bernet
|
da5359af87
|
Missing rename
|
2014-02-10 11:58:24 +01:00 |
|
Andre Bernet
|
2f6c8cb200
|
Rename AFTER release xxx
|
2014-02-10 11:45:08 +01:00 |
|
Bertrand Songis
|
330234df01
|
Lua interpreter now running inside companion!
|
2014-02-10 10:31:14 +01:00 |
|
Bertrand Songis
|
12997bd169
|
Bug on ID2 fixed
|
2014-02-10 10:22:12 +01:00 |
|
Andre Bernet
|
dc660d4ade
|
Switch/pot warnings were duplicated in companion structure for Taranis
nPotsToWarn relocated out of MODELDATA_EXTRA
Only bug left is ID2 on stock appearing as RUD in the states
|
2014-02-09 23:45:31 +01:00 |
|
Bertrand Songis
|
d146966a18
|
Issue #594 (SetTimer) - Companion part done
|
2014-02-08 17:12:26 +01:00 |
|
Bertrand Songis
|
9052f8824e
|
Issue #594 - Two timers can be set ...
|
2014-02-08 16:58:12 +01:00 |
|
Bertrand Songis
|
a9ed6485fd
|
Issue #594 (Set Timer Function) - Still missing UI in Companion
|
2014-02-08 13:44:42 +01:00 |
|
Bertrand Songis
|
08a37b77e7
|
Renaming started ... who wants to continue?
|
2014-02-08 08:38:06 +01:00 |
|
Andre Bernet
|
17823786e4
|
Merge branch 'bsongis/Issue592_sticky_switches' into next
Conflicts:
radio/src/gui/menu_model.cpp
|
2014-02-07 23:39:28 +01:00 |
|
Bertrand Songis
|
55f600a63c
|
Stay function added in Companion
|
2014-02-07 18:24:25 +01:00 |
|
Bertrand Songis
|
9894fda194
|
Issue #592 - Stay logical switches function added. Range also prepared
to avoid another EEPROM change in a future release.
|
2014-02-07 17:50:29 +01:00 |
|
Andre Bernet
|
b12f76bc39
|
Merge pull request #621 from opentx/bsongis/Issue554_trims_relative_default
All good!
|
2014-02-07 11:35:58 +01:00 |
|
Bertrand Songis
|
86bd251f74
|
Simulator always asked for calibration
|
2014-02-07 07:34:40 +01:00 |
|
Bertrand Songis
|
eb80d75ee1
|
Timer modes support in Companion
|
2014-02-06 22:44:11 +01:00 |
|
Bertrand Songis
|
46fe25fd24
|
Companion typos
|
2014-02-05 22:32:54 +01:00 |
|
Bertrand Songis
|
c473b8e105
|
Issue #592 - Support for Sticky Switches in Companion
|
2014-02-05 22:31:43 +01:00 |
|
Bertrand Songis
|
873d2c4377
|
Merge remote-tracking branch 'origin/next' into
bsongis/Issue592_sticky_switches
Conflicts:
radio/src/gui/menu_model.cpp
|
2014-02-05 08:01:40 +01:00 |
|
Andre Bernet
|
10dc3503c2
|
Pot warning UI in companion
|
2014-02-03 21:32:19 +01:00 |
|
Andre Bernet
|
59ad4f79fc
|
Merge branch 'next' of https://github.com/opentx/opentx into kilrah/Switch_and_pot_warnings
Conflicts:
radio/src/translations/es.h.txt
radio/src/translations/fr.h.txt
radio/src/translations/pl.h.txt
radio/src/translations/se.h.txt
|
2014-02-03 17:15:08 +01:00 |
|
Bertrand Songis
|
f4784e61b1
|
Companion didn't compile properly!
|
2014-02-02 21:57:12 +01:00 |
|
Bertrand Songis
|
53c670deee
|
Merge remote-tracking branch 'origin/next' into
bsongis/Issue554_trims_relative_default
Conflicts:
radio/src/gui/menu_model.cpp
|
2014-02-01 19:56:31 +01:00 |
|
 Andre BernetandBertrand Songis
|
0b77d9921d
|
VC doesn't like binary constants
|
2014-02-01 19:42:57 +01:00 |
|
Andre Bernet
|
856ffd4ed7
|
Merge branch 'next' of https://github.com/opentx/opentx into kilrah/Switch_and_pot_warnings
Conflicts:
companion/src/firmwares/opentx/opentxeeprom.cpp
radio/src/gui/menu_model.cpp
radio/src/opentx.cpp
radio/src/telemetry/frsky.cpp
radio/src/translations.cpp
radio/src/translations.h
radio/src/translations/cz.h.txt
radio/src/translations/de.h.txt
radio/src/translations/en.h
radio/src/translations/es.h.txt
radio/src/translations/fr.h.txt
radio/src/translations/it.h.txt
radio/src/translations/pl.h.txt
radio/src/translations/pt.h.txt
radio/src/translations/se.h.txt
|
2014-02-01 13:19:27 +01:00 |
|
Bertrand Songis
|
582b14e919
|
Merge remote-tracking branch 'origin/next' into
bsongis/Issue554_trims_relative_default
Conflicts:
companion/src/eeprominterface.h
companion/src/firmwares/er9x/er9xinterface.cpp
companion/src/firmwares/ersky9x/ersky9xinterface.cpp
|
2014-01-31 22:15:23 +01:00 |
|
Bertrand Songis
|
8ef1456fe9
|
EEPROM support in Companion for the 6pos pots on Taranis
|
2014-01-31 17:19:21 +01:00 |
|
Bertrand Songis
|
ce2b033ccb
|
Issue #469 fixed (Telemetry tab in Companion rewritten - 20% code
removed). More tests needed!
|
2014-01-31 09:40:34 +01:00 |
|