Merge remote-tracking branch 'origin/next' into

bsongis/Issue524_SPORT_GPS

Conflicts:
	radio/src/telemetry/frsky_sport.cpp
	radio/src/translations/de.h.txt
This commit is contained in:
bsongis
2014-03-03 15:36:34 +01:00
32 changed files with 545 additions and 286 deletions
+3
View File
@@ -700,6 +700,9 @@ void telemetryInterrupt10ms()
voltage += frskyData.hub.cellVolts[i];
voltage /= 5;
frskyData.hub.cellsSum = voltage;
if (frskyData.hub.cellsSum < frskyData.hub.minCells) {
frskyData.hub.minCells = frskyData.hub.cellsSum;
}
#endif
if (TELEMETRY_STREAMING()) {