This commit is contained in:
bsongis
2014-07-07 12:19:28 +02:00
parent ad7da779c7
commit 39a0feae3b
10 changed files with 66 additions and 46 deletions
+3 -2
View File
@@ -277,8 +277,9 @@ enum AlarmsCheckSteps {
void telemetryWakeup()
{
#if defined(CPUARM)
if (telemetryProtocol != g_model.telemetryProtocol) {
telemetryProtocol = g_model.telemetryProtocol;
uint8_t requiredTelemetryProtocol = MODEL_TELEMETRY_PROTOCOL;
if (telemetryProtocol != requiredTelemetryProtocol) {
telemetryProtocol = requiredTelemetryProtocol;
telemetryInit();
}
#endif
+6
View File
@@ -470,4 +470,10 @@ void telemetryInterrupt10ms(void);
void frskySetCellVoltage(uint8_t battnumber, frskyCellVoltage_t cellVolts);
void frskyUpdateCells(void);
#if defined(PCBTARANIS)
#define MODEL_TELEMETRY_PROTOCOL ((g_model.moduleData[INTERNAL_MODULE].rfProtocol == RF_PROTO_OFF && g_model.externalModule == MODULE_TYPE_PPM) ? g_model.telemetryProtocol : PROTOCOL_FRSKY_SPORT)
#elif defined(CPUARM)
#define MODEL_TELEMETRY_PROTOCOL g_model.telemetryProtocol
#endif
#endif