Merge remote-tracking branch 'upstream/next' into internalPPM_2306

Conflicts:
	radio/src/gui/Taranis/menu_model_setup.cpp
	radio/src/myeeprom.h
	radio/src/opentx.h
This commit is contained in:
Cedric Marzer
2015-05-26 22:09:12 +02:00
66 changed files with 1400 additions and 1507 deletions
+1 -1
View File
@@ -73,7 +73,7 @@ void setupPulses(unsigned int port)
default:
port = EXTERNAL_MODULE; // ensure it's external module only
switch (g_model.externalModule) {
switch (g_model.moduleData[EXTERNAL_MODULE].type) {
case MODULE_TYPE_PPM:
required_protocol = PROTO_PPM;
break;