Commit Graph
65 Commits
Author SHA1 Message Date
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 6868b69aad Compiler options to reduce flash usage on sky9x and Taranis 2014-05-05 08:24:24 +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
Andre Bernet 5c0b8fcb2d Haptic support 2014-04-23 21:58:05 +02:00
Andre Bernet 31196c626b Long-standing typo 2014-04-23 13:37:56 +02:00
Andre Bernet c1cd268c00 Taranis default options 2014-04-23 13:36:21 +02:00
Andre Bernet 699707fba4 REVPLUS default options 2014-04-23 13:35:46 +02:00
Andre Bernet faa6cd7a3c Haptic support 2014-04-23 13:18:17 +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
bsongis d1f45951fc Whole EEPROM Backup 2014-04-09 17:30:29 +02:00
bsongis ff7a4599e9 Bootloader can now be flashed from the SD Manager 2014-04-08 21:19:35 +02:00
openfsguruh 30099dc5cd changed rounding for gModelMax.
This should prevent counting THROTTLE faster than 100%, if
ACCURAT_THROTTLE_STATS is set to NO and ATMEL based Transmitters are used.
2014-04-02 21:29:00 +02:00
openfsguruh 7ec8392c81 This should solve issue #888;
You have to specify the compile option if you are on a Atmel based CPU like Turnigy9x:

ACCURAT_THROTTLE_STATS=YES

The reason why this fix is not always activated:
- It costs about 18bytes additional flash
- There are rare cases you will notice the rounding issue at all.

Don't bother on Taranis, the fix is activated on this automatically.
2014-04-02 13:13:22 +02:00
Andre Bernet e58e07502a Last references to obsolete BOOTLOADER definition removed 2014-03-22 14:28:55 +01:00
Andre Bernet d69e8d9993 Bootloader removed from Makefile following the decision not to support building without bootlaoder on Taranis. 2014-03-22 00:09:59 +01:00
Damjan Adamic 86f136c733 * USB Joystick implemented
* USB Mass storage mode removed from openTX (this is now supported by Bootloader)
2014-03-21 20:58:41 +01:00
bsongis 25a94e637d Side readded in Companion. Templates removed. 2014-03-19 10:30:51 +01:00
Andre Bernet de073a25ea Merge branch 'next' of https://github.com/opentx/opentx into kilrah/Bootloader 2014-03-17 20:32:11 +01:00
bsongis f907abb730 Checks bootloader size not greater than 32k. Bug fixes. 2014-03-17 17:32:14 +01:00
bsongis 1c3ced7222 Cosmetics on the bootloader 2014-03-15 15:36:02 +01:00
bsongis 68c270760c Now bootloader OK on Taranis 2014-03-12 16:06:13 +01:00
bsongis b6982a310f Version changed to 1.99 for nightly builds 2014-03-06 09:40:41 +01:00
bsongis 5e6cd0ee76 Compilation error fixed 2014-03-05 15:42:51 +01:00
bsongis 197708c967 Last files removed, only the minimum left and moved to another directory 2014-03-05 15:16:13 +01:00
bsongis 5b0835cecb translations.h/.cpp files splitted into translations.h/.ccp and
fonts.h/.cpp
2014-03-05 10:59:52 +01:00
bsongis b7e079a0d9 2 files removed 2014-03-04 15:33:26 +01:00
bsongis 7435416422 More cleaning in bootloader 2014-03-03 21:31:34 +01:00
bsongis b6b2569190 Merge remote-tracking branch 'origin/next' into kilrah/Bootloader
Conflicts:
	radio/src/Makefile
2014-03-03 17:14:12 +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
Andre Bernet 3c8fd3a51d Delta character now requires en.h to go through translate.py 2014-02-27 21:19:33 +01:00
Bertrand Songis 40579a0d75 Makefile cosmetics 2014-02-21 11:15:19 +01:00
Bertrand Songis f857d5454e Cosmetics 2014-02-21 10:15:12 +01:00
openfsguruh 76bda4f89a Revert "Revert "Merge branch 'next'""
This reverts commit a9f4d2185c.
2014-02-17 21:06:46 +01:00
openfsguruh a9f4d2185c Revert "Merge branch 'next'"
This reverts commit a2ecdaa484, reversing
changes made to c909590091.
2014-02-17 20:59:11 +01:00
openfsguruh a2ecdaa484 Merge branch 'next'
Conflicts:
	companion/src/customizesplashdialog.cpp
	companion/src/mainwindow.cpp
	companion/src/translations/companion_pl.ts
2014-02-17 20:56:50 +01:00
Kjell Kernen 3d542a0ded Full support for Finnish language in OpenTX 2014-02-14 17:18:23 +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
Bertrand Songis cde4fea817 getVersion added to Lua functions 2014-02-10 16:05:32 +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
mhotar 40edf9f88a Merge remote-tracking branch 'origin/next' into mhotar/layout_alignments_Issue #584
Conflicts:
	radio/src/translations/es.h.txt
	radio/src/translations/fr.h.txt
	radio/src/translations/pl.h.txt
Manually resolved.
2014-02-04 13:41:39 +01:00
Bertrand Songis c3417a0d88 UART3 Debug/SPORT modes 2014-02-01 19:50:49 +01:00
Bertrand Songis 30b8a7e14b Makefile cosmetics 2014-01-27 17:33:50 +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
Bertrand Songis 96318e0c02 Merge pull request #571 from opentx/mhotar/proportional_fonts
Mhotar/proportional fonts
2014-01-23 08:36:16 -08:00
Bertrand Songis 932553e403 Merge branch 'next' into kilrah/FAS_Offset_compensation
Conflicts:
	companion/src/modeledit/telemetry.cpp
2014-01-23 16:31:09 +01:00
Bertrand Songis c1453cc6cb Google tests re-enabled 2014-01-23 14:49:19 +01:00
mhotar 676491412d lbm files back to git repo 2014-01-20 22:12:32 +01:00