Commit Graph
6 Commits
Author SHA1 Message Date
bsongis fb20b21151 Compilation failure on Taranis (not plus) 2014-05-11 16:00:51 +02:00
bsongis 72a36b065e PWM Haptic 2014-05-11 15:49:18 +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
bsongis 667dd5fe9e Haptic / Taranis fix 2014-04-29 10:08:54 +02:00
Andre Bernet 5c0b8fcb2d Haptic support 2014-04-23 21:58:05 +02:00
Andre Bernet faa6cd7a3c Haptic support 2014-04-23 13:18:17 +02:00