Kjell Kernen
64573dd571
Merge branch 'origin/next'
2014-02-12 01:21:59 +01:00
Kjell Kernen
94720b0c4e
Fixes width bug for 212 wide images.
2014-02-12 01:11:30 +01:00
Bertrand Songis
c034abdb4e
Merge pull request #689 from opentx/driver33/PL_Translation
...
Fixes
2014-02-11 21:37:06 +01:00
Jacek Drewniak
60b4fb1126
Fixes
2014-02-11 21:04:39 +01:00
Andre Bernet
a76484a7eb
Merge branch 'next' into bsongis/Lua_interpreter_171
2014-02-11 18:21:18 +01:00
Andre Bernet
973475d01e
Telemetry comparison value conversions weren't being run
2014-02-11 18:17:31 +01:00
Kjell Kernen
48af7aefd0
Made the Splash editor respect the 9x/Taranis LCD widths in a consistent way. Previously everything was displayed as a Taranis bitmap.
...
Pictures larger than 9x width will get scaled to Taranis width (212 pix).
2014-02-11 18:08:54 +01:00
openfsguruh
a4f4999546
bugfix: Throttle warning shown wrong in companion
...
Actually Throttle warning was not ticked by default in companion, and if
ticked, it was disabled, and when not ticked it was enabled.
Now it fits to the real firmware settings.
2014-02-11 17:40:05 +01:00
Andre Bernet
9caa0f1e3b
AND switch wasn't converted
2014-02-11 17:24:03 +01:00
openfsguruh
45ba06c7b9
Merge remote-tracking branch 'origin/next' into andreas/Issue020_ThrWarnPotsAndTransmitterFix_Merged
2014-02-11 17:10:18 +01:00
Bertrand Songis
83727726aa
Merge pull request #686 from opentx/dvogonen/companion_interface_bugfixes
...
A few bug fixes and an updated Swedish translation.
2014-02-11 14:07:38 +01:00
Kjell Kernen
18a2af7291
A few bug fixes and an updated Swedish translation.
2014-02-11 14:03:03 +01:00
Bertrand Songis
448a3c1b6b
Code cleaning around vario
2014-02-11 12:32:16 +01:00
Bertrand Songis
7a9105dccb
Switches for 9X didn't longer works for Mixers as input
2014-02-11 11:47:03 +01:00
Bertrand Songis
2c60b84258
Conversions errors (negative switches)
2014-02-11 11:29:10 +01:00
Bertrand Songis
f5797b2b3a
Merge pull request #684 from opentx/dvogonen/tabbed_preferences
...
Dvogonen/tabbed preferences
2014-02-11 08:47:19 +01:00
Kjell Kernen
eedc5ea68f
Profiles can now be added and removed in a proper way.
2014-02-11 08:37:07 +01:00
Kjell Kernen
58e213f578
Merge branch 'origin/next'
2014-02-11 04:38:03 +01:00
Bertrand Songis
2794bb8070
Wrap around in Logical Switches sources
2014-02-10 22:06:19 +01:00
Bertrand Songis
72898b0d3a
Merge branch 'next' of https://github.com/opentx/opentx into next
2014-02-10 21:43:36 +01:00
Bertrand Songis
dcaed635f0
Code factorisation in EEPROM conversions
2014-02-10 21:45:13 +01:00
openfsguruh
da23a624dc
merged changes from Issue020_ThrottleWarning
...
based on current next branch, includes all changes from old
ThrottleWarning branch.
Solves issue 020: Throttle warning if P1-P3 is selected as Thr source.
Adds Turnigy TransmitterFix option
code savings:
120 bytes without Transmitter fix
4 bytes but 1 more data if Transmitter Fix is activated.
Added make option TURNIGY_TRANSMITTER_FIX for this purpose
TURNIGY_TRANSMITTER_FIX = NO is default
set to YES for new Turnigy9x transmitter which transmits even no pulses
are generated.
2014-02-10 20:51:25 +01:00
Kjell Kernen
70ddd2911a
Merge pull request #676 from opentx/driver33/PL_Translation
...
Fixes (reverted from commit 1a6832c83a
2014-02-10 20:41:29 +01:00
Andre Bernet
bb4fc32b00
Fix conversion of timer source and CFs
2014-02-10 20:16:18 +01:00
Bertrand Songis
1a6832c83a
Merge pull request #676 from opentx/driver33/PL_Translation
...
Fixes
2014-02-10 18:01:47 +01:00
Kjell Kernen
b74d7f0f32
Added code for creating new profiles.
2014-02-10 18:01:43 +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
Bertrand Songis
9337fa861f
EEPROM v216 conversions fixes
2014-02-10 17:52:53 +01:00
Kjell Kernen
d5e22111e1
App Preferences dialog tabs fully functional, except for adding profiles.
...
Splash Editor fully functional. Improved handling of image formats remain.
Merged branch 'origin/next'
2014-02-10 16:59:49 +01:00
Bertrand Songis
51a6c3c0ab
Merge pull request #679 from opentx/kilrah/Switch_and_pot_warnings
...
Kilrah/switch and pot warnings
2014-02-10 16:21:25 +01:00
Bertrand Songis
c205336fa6
mAh was store two times on Tx shutdown
2014-02-10 16:17:47 +01:00
Bertrand Songis
cde4fea817
getVersion added to Lua functions
2014-02-10 16:05:32 +01:00
Andre Bernet
9ac30369e0
Solve merge conflict
2014-02-10 15:27:53 +01:00
Andre Bernet
f635a1e762
Solve merge conflict
2014-02-10 15:25:18 +01:00
Andre Bernet
a43caca219
Translations
2014-02-10 15:17:24 +01:00
Andre Bernet
041bf5aa04
Try to get rid of character mess
2014-02-10 15:14:35 +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
Bertrand Songis
d374453c8f
Lua now uses our fake FatFS when running in simu
2014-02-10 12:15:24 +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
e15eb9ff79
Lua branch updated to 'next'
2014-02-10 11:26:50 +01:00
Bertrand Songis
7e65fe82c3
Companion compilation error on VC++
2014-02-10 10:31:15 +01:00
Bertrand Songis
330234df01
Lua interpreter now running inside companion!
2014-02-10 10:31:14 +01:00
Bertrand Songis
8f08a61d12
Lua interpreter introduced
2014-02-10 10:29:31 +01:00
Bertrand Songis
12997bd169
Bug on ID2 fixed
2014-02-10 10:22:12 +01:00
Kjell Kernen
c48e1781fd
The profile tab is now functional
2014-02-10 07:54:42 +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
