Bertrand Songis de733579d5 Merge remote-tracking branch 'origin/next' into Horus ...

# Conflicts:
#	companion/src/CMakeLists.txt
#	companion/src/firmwares/opentx/opentxinterface.cpp
#	companion/src/firmwares/opentx/simulator/CMakeLists.txt
#	companion/src/firmwares/opentx/stamp-opentx.h.in
#	radio/src/Makefile
#	radio/src/cli.cpp
#	radio/src/gui/Taranis/helpers.cpp
#	radio/src/gui/Taranis/lcd.cpp
#	radio/src/gui/Taranis/menu_model_setup.cpp
#	radio/src/gui/Taranis/view_main.cpp
#	radio/src/lua_api.cpp
#	radio/src/main_avr.cpp
#	radio/src/myeeprom.h
#	radio/src/opentx.cpp
#	radio/src/pulses/pxx_arm.cpp
#	radio/src/storage/eeprom_conversions.cpp
#	radio/src/targets/Horus/adc_driver.cpp
#	radio/src/targets/Horus/board_horus.cpp
#	radio/src/targets/Horus/board_horus.h
#	radio/src/targets/Horus/diskio.cpp
#	radio/src/targets/Horus/hal.h
#	radio/src/targets/Horus/haptic_driver.cpp
#	radio/src/targets/Horus/i2c_driver.cpp
#	radio/src/targets/Horus/keys_driver.cpp
#	radio/src/targets/Horus/lcd_driver.cpp
#	radio/src/targets/Horus/led_driver.cpp
#	radio/src/targets/Horus/pulses_driver.cpp
#	radio/src/targets/Horus/pwr_driver.c
#	radio/src/targets/Horus/sdio_sd.c
#	radio/src/targets/Horus/sdio_sd.h
#	radio/src/targets/Horus/serial2_driver.cpp
#	radio/src/targets/Horus/telemetry_driver.cpp
#	radio/src/targets/Horus/usb_conf.h
#	radio/src/targets/Horus/usbd_desc.c
#	radio/src/targets/Horus/usbd_storage_msd.cpp

2015-11-15 23:08:34 +01:00

..

bitmaps

[Horus] UI continued

2015-11-14 17:19:20 +01:00

fonts

[Horus] For the moment no better solution for Windows :(

2015-11-15 12:52:36 +01:00

gui

Merge remote-tracking branch 'origin/next' into Horus

2015-11-15 23:08:34 +01:00

lua

Merge remote-tracking branch 'origin/next' into Horus

2015-11-15 23:08:34 +01:00

pulses

Merge remote-tracking branch 'origin/next' into Horus

2015-11-15 23:08:34 +01:00

storage

Merge remote-tracking branch 'origin/next' into Horus

2015-11-15 23:08:34 +01:00

targets

Merge remote-tracking branch 'origin/next' into Horus

2015-11-15 23:08:34 +01:00

telemetry

Merge remote-tracking branch 'origin/next' into Horus

2015-11-15 23:08:34 +01:00

tests

Merge remote-tracking branch 'origin/next' into Horus

2015-11-15 23:08:34 +01:00

thirdparty

Merge remote-tracking branch 'origin/next' into Horus

2015-11-15 23:08:34 +01:00

translations

Merge remote-tracking branch 'origin/next' into Horus

2015-11-15 23:08:34 +01:00

.gitignore

[Horus] SD Storage started. UI continued.

2015-10-22 07:10:19 +02:00

audio_arm.cpp

[Horus] Next round of screen changes + refactoring

2015-11-03 19:53:55 +01:00

audio_arm.h

Fix for ARM boards without Haptic (Taranis non plus)

2015-08-27 10:34:01 +02:00

audio_avr.cpp

tmrtmrt/Fixes#2825_MEGA_2560_audio_output_not_working

2015-09-03 20:50:38 +02:00

audio_avr.h

Re #2404: better definition of PLAY_MODEL_NAME() for various platforms

2015-07-19 12:44:40 +02:00

bin_allocator.cpp

Compilation fixes for Bin Allocator

2015-08-15 12:39:27 +02:00

bin_allocator.h

Compilation fixes for Bin Allocator

2015-08-15 12:39:27 +02:00

bmp.cpp

[Horus] DMA2D more used. Some graphics are really faster.

2015-11-10 21:57:41 +01:00

buzzer.cpp

Directory transmitter renamed to radio

2013-12-02 12:11:38 +01:00

buzzer.h

Horus simulator should now be OK

2015-10-14 23:47:51 +02:00

cli.cpp

Merge remote-tracking branch 'origin/next' into Horus

2015-11-15 23:08:34 +01:00

cli.h

Horus simulator should now be OK

2015-10-14 23:47:51 +02:00

curves.cpp

Cosmetics

2015-03-14 10:26:05 +01:00

debug.cpp

Compilation fix for Visual Studio

2015-09-01 07:29:07 +02:00

debug.h

[Horus] Simulator graphics

2015-11-11 10:02:12 +01:00

dump.cpp

Fixes #2595 - Cli added

2015-08-10 22:52:26 +02:00

dump.h

Fixes #2595 - Cli added

2015-08-10 22:52:26 +02:00

fifo.h

Horus simulator should now be OK

2015-10-14 23:47:51 +02:00

fonts.h

Horus simulator should now be OK

2015-10-14 23:47:51 +02:00

functions.cpp

Merge remote-tracking branch 'origin/next' into Horus

2015-11-15 23:08:34 +01:00

haptic.cpp

Horus simulator should now be OK

2015-10-14 23:47:51 +02:00

haptic.h

Directory transmitter renamed to radio

2013-12-02 12:11:38 +01:00

keys.cpp

Horus simulator should now be OK

2015-10-14 23:47:51 +02:00

keys.h

[Horus] Next round of screen changes + refactoring

2015-11-03 19:53:55 +01:00

loadboot.cpp

[Horus] SD Storage started. UI continued.

2015-10-22 07:10:19 +02:00

logs.cpp

[Horus] SD Storage started. UI continued.

2015-10-22 07:10:19 +02:00

main_arm.cpp

[Horus] DMA2D more used. Some graphics are really faster.

2015-11-10 21:57:41 +01:00

main_avr.cpp

Merge remote-tracking branch 'origin/next' into Horus

2015-11-15 23:08:34 +01:00

Makefile

Merge remote-tracking branch 'origin/next' into Horus

2015-11-15 23:08:34 +01:00

maths.cpp

Ported from master to next:

2015-01-04 20:07:39 +01:00

mixer.cpp

Merge remote-tracking branch 'origin/next' into Horus

2015-11-15 23:08:34 +01:00

myeeprom.h

Merge remote-tracking branch 'origin/next' into Horus

2015-11-15 23:08:34 +01:00

opentx.cpp

Removed unnecessary FILINFO

2015-11-15 16:20:32 +01:00

opentx.h

Merge remote-tracking branch 'origin/next' into Horus

2015-11-15 23:08:34 +01:00

pgmtypes.h

Directory transmitter renamed to radio

2013-12-02 12:11:38 +01:00

pwr.h

[Taranis X9E] Shutdown procedure modified (popup with confirmation

2015-07-10 17:34:55 +02:00

rtc.cpp

Optimization: removed usage of gettime() where possible

2014-08-08 20:33:35 +02:00

rtc.h

Taranis X9E Simulator - with rotary encoder

2014-12-01 22:08:19 +01:00

sbus.cpp

Fix SBUS trainer failsafe detection

2015-08-01 17:48:02 +02:00

sdcard.cpp

Merge remote-tracking branch 'origin/next' into Horus

2015-11-15 23:08:34 +01:00

sdcard.h

[Horus] Next round of screen changes + refactoring

2015-11-03 19:53:55 +01:00

serial.cpp

[Horus] Next round of screen changes + refactoring

2015-11-03 19:53:55 +01:00

serial.h

Fixes #2595 - Cli added

2015-08-10 22:52:26 +02:00

simu.cpp

[Horus] Next round of screen changes + refactoring

2015-11-03 19:53:55 +01:00

stamp.cpp

[Horus] A lot of GUI fixes

2015-10-16 17:26:42 +02:00

strhelpers.cpp

[Horus] UI continued

2015-11-14 17:19:20 +01:00

strhelpers.h

[Horus] Next round of screen changes + refactoring

2015-11-03 19:53:55 +01:00

switches.cpp

[Horus] Refactoring continued

2015-10-24 11:27:34 +02:00

syscalls.c

[Taranis X9E] Variables moved to CCM Memory. Around 45k RAM saved.

2015-06-29 18:25:25 +02:00

tasks_arm.cpp

[Horus] Next round of screen changes + refactoring

2015-11-03 19:53:55 +01:00

tasks_arm.h

Compilation fix

2015-09-05 11:37:09 +02:00

templates.cpp

[Horus] SD Storage started. UI continued.

2015-10-22 07:10:19 +02:00

templates.h

Indentation fixed so that cpplint is ok

2014-02-26 15:22:27 +01:00

timers.cpp

[Horus] SD Storage started. UI continued.

2015-10-22 07:10:19 +02:00

timers.h

Inversion between TIMER_MIN and TIMER_MAX!!!

2015-09-08 20:34:10 +02:00

trainer_input.cpp

Cosmetics

2015-09-24 18:31:30 +02:00

trainer_input.h

renamed g_ppmInXXX into ppmInputXXX

2015-07-30 22:43:56 +02:00

translations.cpp

[Horus] Next round of screen changes + refactoring

2015-11-03 19:53:55 +01:00

translations.h

[Horus] Next round of screen changes + refactoring

2015-11-03 19:53:55 +01:00

vario.cpp

Out of bounds protection for telemetryItems[] array access and some code refactoring for telemetry value precision

2015-10-18 12:06:25 +02:00