 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 |
|