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
38145a02f4
Merge remote-tracking branch 'origin/next' into
...
bsongis/Taranis_6Positions_Pot
Conflicts:
radio/src/myeeprom.h
2014-01-31 11:28:34 +01:00
openfsguruh
c86123632c
bugfix switch warning for stock
...
switch warnings in menu didn't tie up with the warning screen.
Now inside firmware the settings fit and working properly for stock.
2014-01-30 21:01:12 +01:00
Bertrand Songis
7d88ff506e
Issue #541 fixed
2014-01-28 17:51:35 +01:00
Bertrand Songis
b44fa1432e
[Taranis] Issue #554 - Constant used instead of hardcoded value
2014-01-27 17:30:50 +01:00
Bertrand Songis
16c1bd01c6
[Taranis] Issue #554 - Default is now :0 (all trims linked to the
...
default phase)
2014-01-27 11:28:14 +01:00
Bertrand Songis
046a4d253d
[Taranis] Issue #554 Radio part done. We have now modes on trims.
...
Let's say we are configuring the Rudder Trim on phase 1:
- R:0 => Rudder trim = Rudder trim(phase 0)
- R+0 => Rudder trim = Rudder trim(phase 0) + Rudder trim(phase 1)
- R-- => Rudder trim is OFF
Still needs to be done:
- The result on screen is awful. I need ideas. Martin?
- Companion conversions / UI for this feature
- R+1 when configuring Rudder Trim on phase 1 should be impossible
2014-01-27 11:28:10 +01:00
mhotar
f676589989
Flash savings 24B
...
I am learning code optimisations, can someone check this comit please?
This have not to change anything, only save flash.
2014-01-26 12:32:09 +01:00
Andre Bernet
a9e8450578
Merge pull request #578 from opentx/bsongis/Issue552_checkbox_for_reset_custom_function
...
Issue #552 fixed
2014-01-23 11:25:01 -08:00
Andre Bernet
4764cc889c
Merge pull request #577 from opentx/bsongis/Issue488_change_default_trim_mode_to_fine
...
Bsongis/issue488 change default trim mode to fine
2014-01-23 10:52:26 -08:00
Bertrand Songis
d3b66c849b
[9x stock] Some bytes saved with trims usage
2014-01-23 16:08:49 +01:00
Bertrand Songis
f6ba7e26b7
[9x stock] Issue #542 - 8 bytes here
2014-01-23 15:00:09 +01:00
Bertrand Songis
8a32e769dc
[9x stock] Issue #542 - 12 bytes here
2014-01-23 11:49:13 +01:00
Bertrand Songis
93646983b5
[9x stock] Issue #542 - 2 bytes here
2014-01-23 10:27:00 +01:00
Bertrand Songis
bff28a6c28
[9x stock] Issue #542 - 8 bytes here
2014-01-23 07:57:55 +01:00
Bertrand Songis
b66fd75b50
Issue #552 Radio part done
2014-01-22 22:04:16 +01:00
Bertrand Songis
fc716b3a2a
Issue #488 . Firmware part done
2014-01-22 17:31:21 +01:00
Andre Bernet
0b2b9ea1c3
Merge branch 'next' into kilrah/Switch_and_pot_warnings
...
Conflicts:
radio/src/myeeprom.h
radio/src/translations/cz.h
radio/src/translations/de.h
radio/src/translations/es.h
radio/src/translations/fr.h
radio/src/translations/fr.h.txt
radio/src/translations/it.h
radio/src/translations/pl.h
radio/src/translations/pt.h
radio/src/translations/se.h
2014-01-15 22:16:16 +01:00
Bertrand Songis
b4c6d123c8
Better implementation for the automatic detection of a 6pos switch
2014-01-15 21:15:28 +01:00
Bertrand Songis
d945052c82
Removes the core in companion simu, compiled on VC++. A compiler bug? I
...
don't get it...
2014-01-14 20:06:01 +01:00
Bertrand Songis
a292fabb02
[Taranis] 6Pos switch support is now ok. Calibration is automatic. More
...
tests needed
2014-01-12 12:57:14 +01:00
Bertrand Songis
e4b3b3af85
[Taranis] Automatic detection of the 6pos switch within the calibration
...
process
2014-01-06 11:52:05 +01:00
Andre Bernet
ca61fe4298
Switch Warnings disabled by default on ARM
2014-01-04 22:12:41 +01:00
Andre Bernet
fce51a6945
A2 was also disabled in custom switches in D16 mode
2014-01-04 20:41:19 +01:00
Bertrand Songis
1c8b865d89
[Taranis] Support for the 6POS Pots
2013-12-31 13:02:53 +01:00
Bertrand Songis
445899b58b
[9XR-PRO] USB Bootloader fix
2013-12-31 11:05:55 +01:00
Bertrand Songis
57c6738ab7
Merge branch 'next' into bsongis/9XR-PRO_port
2013-12-23 16:12:41 +01:00
Bertrand Songis
20ef6984ee
Now the FW compiles on 9XR-PRO. Still fighting with the drivers on my Windows machine...
2013-12-22 22:33:42 +01:00
openfsguruh
8c6bfb208b
reverted throttle change for TARANIS
...
fixed compile issue for PCBTARANIS, because rawAnas didn't exist anymore
for PCBTARANIS.
2013-12-21 10:57:33 +01:00
openfsguruh
0395dbef0a
Throttle counter takes trainer input into account
...
Now uses combined input from calibratedSticks and trainer port into
account for throttle calculation.
2013-12-16 11:02:11 +01:00
Andre Bernet
7c9b0960ea
mAh and pot positions weren't saved on model change
2013-12-05 11:27:21 +01:00
Bertrand Songis
d396e85fe0
9XR-PRO support. Still not finished.
2013-12-05 11:06:58 +01:00
Andre Bernet
9c5e8881fc
Reorder pot warning modes to simplify potential stock board implementation
...
Might be good to make an enum too.
2013-12-04 12:04:52 +01:00
Andre Bernet
05fca48115
[Taranis] Option to display checklist at startup if present - done here to avoid merge conflicts
2013-12-03 23:04:45 +01:00
Andre Bernet
7f6591edad
Pot warning finished on Taranis, ready to merge once tested by more people :)
2013-12-03 14:56:55 +01:00
Andre Bernet
43b0c00e11
More pot checking - still need to find how to read the pot's position on the warning screen, the current solution only works the first time.
2013-12-02 15:51:12 +01:00
Andre Bernet
452e987fca
checkSwitches() hopefully more sane
2013-12-02 14:54:02 +01:00
Andre Bernet
74918e4d12
Pot warning beta - needs testing, and checkSwitches() needs reviewing!
2013-12-02 14:11:35 +01:00
Bertrand Songis and Andre Bernet
9a57ec0acc
Directory transmitter renamed to radio
2013-12-02 12:10:47 +01:00
Bertrand Songis
942e658c8e
Directory transmitter renamed to radio
2013-12-02 07:13:57 +01:00