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
+4
View File
@@ -140,6 +140,7 @@ PACK(struct FrskySerialData {
uint16_t maxGpsSpeed;
uint16_t maxGpsDistance;
int16_t minCell;
int16_t minCells;
int16_t minVfas;
uint16_t maxCurrent;
uint16_t maxPower;
@@ -187,6 +188,9 @@ PACK(struct FrskySerialData {
struct FrskyData {
FrskyValueWithMinMax analog[2];
FrskyValueWithMin rssi[2];
#if defined(CPUARM)
FrskyValueWithMinMax swr;
#endif
FrskySerialData hub;
};