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
openfsguruh
c909590091
updated from branch "next"
...
Merge branch 'next'
2014-02-12 21:13:59 +01:00
Bertrand Songis
491f4e12c2
Logical Switches import issue (Telemetry)
2014-02-12 15:57:53 +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
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
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
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
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
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
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
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
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
Bertrand Songis
d374453c8f
Lua now uses our fake FatFS when running in simu
2014-02-10 12:15:24 +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
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
Jacek Drewniak
ee2e46f3cb
Fixes
2014-02-09 15:27:30 +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
Bertrand Songis
afc3b61232
Merge pull request #661 from opentx/dvogonen/simplify_companion_preferences_dialog_632
...
Dvogonen/simplify companion preferences dialog 632
2014-02-08 07:48:37 +01:00
Andre Bernet
2f437ccad5
French translations
2014-02-08 01:06:07 +01:00
Andre Bernet
5f75e5851e
Rename "Stay" to "Edge"
2014-02-08 01:05:54 +01:00
Andre Bernet
1ce67a62c2
Sync translations
2014-02-08 00:50:03 +01:00
Andre Bernet
ca9d53dbdd
CS->LS
2014-02-08 00:30:35 +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
4c5ac47507
Problem with AdjustGVAR modes on ARM boards (mode has > 2bits, allowing
...
more modes if needed later)
2014-02-07 22:58:12 +01:00
Bertrand Songis
f686934430
Delay not applicable on Stay logical switches
2014-02-07 22:17:32 +01:00
Bertrand Songis
2e35e095c6
AUTOSWITCH enabled with Stay function
2014-02-07 22:10:06 +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
Kjell Kernen
23a61cc60e
Merge branch 'origin/next'
...
Conflicts:
companion/src/translations/companion_pl.ts
2014-02-07 17:10:40 +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
mhotar
1006496795
CFN-param alignments
2014-02-06 23:58:01 +01:00
Bertrand Songis
01242e2b78
Issue #592 - AND switch bug on 9x stock
2014-02-06 16:23:48 +01:00
Andre Bernet