3djc 70d24506da Merge branch '2.3' into 2.4 ...

# Conflicts:
#	radio/src/fonts/480x272/font_dblsize.png
#	radio/src/fonts/480x272/font_xxlsize.png
#	radio/src/gui/128x64/model_setup.cpp
#	radio/src/gui/128x64/radio_setup.cpp
#	radio/src/gui/480x272/model_receiver_options.cpp
#	radio/src/gui/480x272/model_setup.cpp
#	radio/src/gui/480x272/radio_calibration.cpp
#	radio/src/gui/480x272/radio_hardware.cpp
#	radio/src/gui/common/stdlcd/draw_functions.cpp
#	radio/src/gui/gui_common.cpp
#	radio/src/keys.h
#	radio/src/lua/interface.cpp
#	radio/src/pulses/afhds3.h
#	radio/src/rtos.h
#	radio/src/switches.cpp
#	radio/src/targets/common/arm/stm32/aux_serial_driver.cpp
#	radio/src/targets/horus/CMakeLists.txt
#	radio/src/targets/horus/lcd_driver.cpp
#	radio/src/targets/horus/startup_stm32f42_43xxx.s
#	radio/src/targets/taranis/CMakeLists.txt
#	radio/src/telemetry/crossfire.h
#	radio/src/telemetry/multi.cpp
#	radio/src/translations.cpp
#	radio/src/translations/it.h.txt
#	radio/src/translations/untranslated.h
#	radio/util/font2png.py
#	tools/commit-tests.sh

2021-04-08 11:42:28 +02:00

..

usb

USB joystick support for 9xrpro (#5776)

2019-08-26 23:55:48 +02:00

adc_driver.cpp

Bsongis/remove cpu temperature (#6541)

2019-07-03 17:17:42 +02:00

AT91SAM3S2.h

Review line ending handling (#4820)

2017-04-19 10:54:43 +02:00

AT91SAM3S4.h

Review line ending handling (#4820)

2017-04-19 10:54:43 +02:00

audio_driver.cpp

SKY9X-REVA removed as it doesn't even build since 2.2

2019-05-19 17:33:14 +02:00

audio_driver.h

Merge with latest 2.3

2020-10-07 21:01:45 +02:00

aux_serial_driver.cpp

Compilation fix (attempt N+5)

2019-08-22 23:21:48 +02:00

bluetooth.cpp

RTOS refactoring + more AVR removal

2018-08-05 12:06:48 +02:00

board_lowlevel.c

Review line ending handling (#4820)

2017-04-19 10:54:43 +02:00

board_lowlevel.h

Compilation fix

2019-07-04 17:04:36 +02:00

board.cpp

Fix ar9x compile/boot (#7102)

2019-11-20 11:56:22 +01:00

board.h

Merge with latest 2.3

2021-01-12 17:16:15 +01:00

buzzer_driver.cpp

SKY9X-REVA removed as it doesn't even build since 2.2

2019-05-19 17:33:14 +02:00

chip.h

Review line ending handling (#4820)

2017-04-19 10:54:43 +02:00

CMakeLists.txt

Merge branch '2.3' into 2.4

2021-04-08 11:42:28 +02:00

coproc_driver.cpp

Compilation fix (attempt N+3)

2019-08-22 18:48:55 +02:00

core_cm3.c

Review line ending handling (#4820)

2017-04-19 10:54:43 +02:00

core_cm3.h

Review line ending handling (#4820)

2017-04-19 10:54:43 +02:00

crt.c

Review line ending handling (#4820)

2017-04-19 10:54:43 +02:00

diskio.cpp

Compilation fixes

2019-10-03 00:16:13 +02:00

eeprom_driver.cpp

Review line ending handling (#4820)

2017-04-19 10:54:43 +02:00

flash_driver.cpp

MAGIC value for powerReason should be stored in RTC backup on Horus (#7096)

2019-11-21 11:50:33 +01:00

haptic_driver.cpp

Review line ending handling (#4820)

2017-04-19 10:54:43 +02:00

i2c_driver.cpp

Schwabe/silence register warnings clang (#3940)

2016-10-21 00:09:54 +02:00

i2c_driver.h

VC++ compilation

2016-12-10 11:24:50 +01:00

joystick.cpp

USB joystick support for 9xrpro (#5776)

2019-08-26 23:55:48 +02:00

keys_driver.cpp

C function backlightOn() renamed to resetBacklightTimeout()

2020-03-27 10:43:06 +01:00

lcd_driver.cpp

MAGIC value for powerReason should be stored in RTC backup on Horus (#7096)

2019-11-21 11:50:33 +01:00

massstorage.cpp

Replace NULL by nullptr

2019-08-28 10:28:11 +02:00

Media.h

Review line ending handling (#4820)

2017-04-19 10:54:43 +02:00

MEDSdcard.c

Review line ending handling (#4820)

2017-04-19 10:54:43 +02:00

pulses_driver.cpp

Pulses refactoring (another one!) (#6510)

2019-06-17 12:02:42 +02:00

pwr_driver.cpp

Compilation fix

2019-08-16 17:48:46 +02:00

rotary_encoder_driver.cpp

[X7] Bootloader fix

2019-05-13 14:20:44 +02:00

rtc_driver.cpp

Review line ending handling (#4820)

2017-04-19 10:54:43 +02:00

rtc_ds3231_driver.cpp

Fix DS3231 RTC read/write on AR9X (#4819)

2017-04-19 10:55:48 +02:00

sam3s4c_flash.ld

SKY9X-REVA removed as it doesn't even build since 2.2

2019-05-19 17:33:14 +02:00

sam3s8c_flash.ld

SKY9X-REVA removed as it doesn't even build since 2.2

2019-05-19 17:33:14 +02:00

sdcard_driver.cpp

Review line ending handling (#4820)

2017-04-19 10:54:43 +02:00

telemetry_driver.cpp

Telemetry driver stubs (#8196)

2021-01-04 21:25:42 +01:00

trainer_driver.cpp

Bsongis/x9lite pwr fix (#6501)

2019-06-14 21:19:26 +02:00

usb_driver.cpp

USB joystick support for 9xrpro (#5776)

2019-08-26 23:55:48 +02:00

vectors_sam3s.c

Review line ending handling (#4820)

2017-04-19 10:54:43 +02:00