Variometer sources now:

BaroV1: uses altitude before point only multiplied by 100
BaroV2: uses filtered altitude provided better than frsky hub source
A1/A2: uses winged shadow thermal scout connected to A1/A2 inputs on receiver
This commit is contained in:
maxim.karban@gmail.com
2012-05-08 20:07:57 +00:00
parent 176ee13455
commit fe61a4fe7f
6 changed files with 14 additions and 10 deletions
+4 -1
View File
@@ -273,12 +273,15 @@ void parseTelemHubByte(uint8_t byte)
// First received barometer altitude => Altitude offset
if (!frskyHubData.baroAltitudeOffset)
frskyHubData.baroAltitudeOffset = -frskyHubData.baroAltitude_bp;
if (g_model.varioSource == VARIO_SOURCE_BARO_V1) {
evalVario(frskyHubData.baroAltitude_bp*100, 0);
}
frskyHubData.baroAltitude_bp += frskyHubData.baroAltitudeOffset;
checkMinMaxAltitude();
break;
case offsetof(FrskyHubData, baroAltitude_ap):
if (g_model.varioSource == VARIO_SOURCE_BARO) {
if (g_model.varioSource == VARIO_SOURCE_BARO_V2) {
evalVario(frskyHubData.baroAltitude_bp-frskyHubData.baroAltitudeOffset, frskyHubData.baroAltitude_ap);
}
break;
+1 -1
View File
@@ -2327,7 +2327,7 @@ void menuProcTelemetry(uint8_t event)
case ITEM_TELEMETRY_VARIO_SOURCE:
lcd_puts(4, y, STR_SOURCE);
lcd_putsiAtt(TELEM_COL2, y, STR_VARIOSRC, g_model.varioSource, attr);
if (attr) CHECK_INCDEC_MODELVAR(event, g_model.varioSource, VARIO_SOURCE_NONE, VARIO_SOURCE_LAST-1);
if (attr) CHECK_INCDEC_MODELVAR(event, g_model.varioSource, VARIO_SOURCE_FIRST, VARIO_SOURCE_LAST-1);
break;
case ITEM_TELEMETRY_VARIO_SPEED:
+3 -2
View File
@@ -409,8 +409,9 @@ enum TelemetrySource {
};
enum VarioSource {
VARIO_SOURCE_NONE = 0,
VARIO_SOURCE_BARO,
VARIO_SOURCE_FIRST = 0,
VARIO_SOURCE_BARO_V1 = 0,
VARIO_SOURCE_BARO_V2,
VARIO_SOURCE_A1,
VARIO_SOURCE_A2,
VARIO_SOURCE_LAST
+2 -2
View File
@@ -158,8 +158,8 @@
#define TR_VTELPROTO ""
#endif
#define LEN_VARIOSRC "\004"
#define TR_VARIOSRC "None""Baro""A1 ""A2 "
#define LEN_VARIOSRC "\006"
#define TR_VARIOSRC "BaroV1""BaroV2""A1 ""A2 "
#define LEN_GPSFORMAT "\004"
#define TR_GPSFORMAT "HMS NMEA"
+2 -2
View File
@@ -158,8 +158,8 @@
#define TR_VTELPROTO ""
#endif
#define LEN_VARIOSRC "\004"
#define TR_VARIOSRC "None""Baro""A1 ""A2 "
#define LEN_VARIOSRC "\006"
#define TR_VARIOSRC "BaroV1""BaroV2""A1 ""A2 "
#define LEN_GPSFORMAT "\004"
#define TR_GPSFORMAT "HMS NMEA"
+2 -2
View File
@@ -158,8 +158,8 @@
#define TR_VTELPROTO ""
#endif
#define LEN_VARIOSRC "\004"
#define TR_VARIOSRC "None""Baro""A1 ""A2 "
#define LEN_VARIOSRC "\006"
#define TR_VARIOSRC "BaroV1""BaroV2""A1 ""A2 "
#define LEN_GPSFORMAT "\004"
#define TR_GPSFORMAT "HMS NMEA"