Damjan Adamic eca81904d2 Merge branch 'next' into projectkk2glider/9xe_adc3_driver ...

Conflicts:
	radio/src/myeeprom.h

2014-12-27 16:20:14 +01:00

..

bitmaps

Horus bitmaps

2014-12-17 22:37:33 +01:00

bootloader

Merge branch 'next' into projectkk2glider/9xe_adc3_driver

2014-12-27 16:20:14 +01:00

CoOS

Fixes #1874: Wrong clock configuration for CoOS on Taranis

2014-11-26 17:33:27 +01:00

FatFs

A lot of warnings removed

2014-12-09 07:22:30 +01:00

fonts

Some more chars in 3x5 font added

2014-11-30 18:40:27 +01:00

GCS_MAVLink

Directory transmitter renamed to radio

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

gui

Working ADC3 driver for 9XE additional analog inputs (driver source based on Michael Blandford's code)

2014-12-19 20:16:23 +01:00

lua

Fixes #1839: Companion simulator Lua crash on Mac

2014-11-09 10:39:48 +01:00

pulses

MEGA2560 update (all commits merged in only one)

2014-12-09 18:57:43 +01:00

targets

Merge branch 'next' into projectkk2glider/9xe_adc3_driver

2014-12-27 16:20:14 +01:00

telemetry

A lot of warnings removed

2014-12-09 07:22:30 +01:00

tests

Re #1926: SMLSIZE last line drawn, gtests expanded with LCD character overlapped test

2014-12-14 09:08:17 +01:00

translations

Merge branch 'next' into projectkk2glider/9xe_adc3_driver

2014-12-27 16:20:14 +01:00

.gitignore

Telemetry refactoring - Fixes #1634

2014-11-08 12:06:42 +01:00

audio_arm.cpp

Fixes #1791: Port Lua Bin Allocator to next:

2014-10-26 09:14:45 +01:00

audio_arm.h

Cosmetics

2014-11-20 23:22:43 +01:00

audio_avr.cpp

MEGA2560 didn't compile correctly

2014-12-08 20:20:13 +01:00

audio_avr.h

MEGA2560 didn't compile correctly

2014-12-08 20:20:13 +01:00

bin_allocator.cpp

Fixes #1791: Port Lua Bin Allocator to next:

2014-10-26 09:14:45 +01:00

bin_allocator.h

Fixes #1791: Port Lua Bin Allocator to next:

2014-10-26 09:14:45 +01:00

bmp.cpp

Fixed bmpLoad():

2014-11-16 19:56:04 +01:00

buzzer.cpp

Directory transmitter renamed to radio

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

buzzer.h

MEGA2560 didn't compile correctly

2014-12-08 20:20:13 +01:00

curves.cpp

permissions: Remove execute bit from src files

2014-11-19 09:52:44 -08:00

debug.cpp

Fixes #1791: Port Lua Bin Allocator to next:

2014-10-26 09:14:45 +01:00

debug.h

Fixes #1791: Port Lua Bin Allocator to next:

2014-10-26 09:14:45 +01:00

eeprom_common.cpp

Directory transmitter renamed to radio

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

eeprom_common.h

Separated perMain() for ARM and other platforms

2014-12-06 12:44:30 +01:00

eeprom_conversions.cpp

Fixes #1872

2014-12-01 18:56:03 +01:00

eeprom_raw.cpp

Fixes #1791: Port Lua Bin Allocator to next:

2014-10-26 09:14:45 +01:00

eeprom_raw.h

EEPROM conversions on sky9x

2014-03-29 10:07:22 +01:00

eeprom_rlc.cpp

Telemetry refactoring - Fixes #1634

2014-11-08 12:06:42 +01:00

eeprom_rlc.h

ersky9x EEPROM format allowed in Bootloader Restore

2014-04-10 12:50:45 +02:00

fifo.h

Fixes #1791: Port Lua Bin Allocator to next:

2014-10-26 09:14:45 +01:00

fonts.cpp

permissions: Remove execute bit from src files

2014-11-19 09:52:44 -08:00

fonts.h

permissions: Remove execute bit from src files

2014-11-19 09:52:44 -08:00

functions.cpp

#1761 - Radio part done

2014-12-08 19:39:54 +01:00

haptic.cpp

Haptic strength will be selectable with a slider, with a default

2014-05-14 11:15:07 +02:00

haptic.h

Directory transmitter renamed to radio

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

keys.cpp

Re #1017: key stuck removed for AVR platforms, fixed bug in wait

2014-12-07 10:47:26 +01:00

keys.h

Re #1017: key stuck removed for AVR platforms, fixed bug in wait

2014-12-07 10:47:26 +01:00

lcd_common.cpp

Re #1926: SMLSIZE last line drawn, gtests expanded with LCD character overlapped test

2014-12-14 09:08:17 +01:00

lcd_default.cpp

Do lcdWaitDmaEnd() in perMain()

2014-12-07 10:24:27 +01:00

lcd_taranis.cpp

Do lcdWaitDmaEnd() in perMain()

2014-12-07 10:24:27 +01:00

lcd.h

Lua task timing done in perMain()

2014-12-07 17:23:44 +01:00

loadboot.cpp

The check on the BL size was wrong as it didn't take care of the

2014-07-01 15:59:45 +02:00

logs.cpp

Telemetry refactoring - Fixes #1634

2014-11-08 12:06:42 +01:00

lua_api.cpp

luaDoOneRunPermanentScript() param optimization, todo for luaLcdLock() removal

2014-12-08 17:51:53 +01:00

lua_api.h

Lua task timing done in perMain()

2014-12-07 17:23:44 +01:00

main_arm.cpp

Lua task timing done in perMain()

2014-12-07 17:23:44 +01:00

main_avr.cpp

perMain() moved into main_avr.cpp and main_arm.cpp

2014-12-07 09:58:46 +01:00

Makefile

Merge branch 'next' into projectkk2glider/9xe_adc3_driver

2014-12-27 16:20:14 +01:00

maths.cpp

Telemetry refactoring - Fixes #1634

2014-11-08 12:06:42 +01:00

mixer.cpp

Merge branch 'next' into projectkk2glider/9xe_adc3_driver

2014-12-27 16:20:14 +01:00

myeeprom.h

Merge branch 'next' into projectkk2glider/9xe_adc3_driver

2014-12-27 16:20:14 +01:00

opentx.cpp

Merge branch 'next' into projectkk2glider/9xe_adc3_driver

2014-12-27 16:20:14 +01:00

opentx.h

Merge branch 'next' into projectkk2glider/9xe_adc3_driver

2014-12-27 16:20:14 +01:00

pgmtypes.h

Directory transmitter renamed to radio

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

pwr.h

permissions: Remove execute bit from src files

2014-11-19 09:52:44 -08: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

permissions: Remove execute bit from src files

2014-11-19 09:52:44 -08:00

sdcard.h

Telemetry refactoring - Fixes #1634

2014-11-08 12:06:42 +01:00

serial.cpp

Directory transmitter renamed to radio

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

serial.h

Directory transmitter renamed to radio

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

simu.cpp

Fixed simu build

2014-12-04 22:17:06 +01:00

stamp.cpp

Issue #782 fixed

2014-03-20 17:11:14 +01:00

strhelpers.cpp

permissions: Remove execute bit from src files

2014-11-19 09:52:44 -08:00

switches.cpp

Merge branch 'next' into projectkk2glider/9xe_adc3_driver

2014-12-27 16:20:14 +01:00

tasks_arm.cpp

perMainArm() renamed to perMain()

2014-12-07 10:12:26 +01:00

templates.cpp

Confirmation page added - not as nice as others ;) - Engine settings

2014-05-26 16:35:47 +02:00

templates.h

Indentation fixed so that cpplint is ok

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

translations.cpp

Fixes #1017: Startup key stuck display

2014-12-05 20:45:54 +01:00

translations.h

Fixes #1017: Startup key stuck display

2014-12-05 20:45:54 +01:00

vario.cpp

permissions: Remove execute bit from src files

2014-11-19 09:52:44 -08:00