Merge pull request #6202 from mikeller/fix_gps_on_smartport

Fixed GPS init on SmartPort.
This commit is contained in:
Michael Keller 2018-06-24 14:24:13 +12:00 committed by GitHub
commit e9494c8c60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions

View File

@ -361,7 +361,7 @@ static void initSmartPortSensors(void)
}
#ifdef USE_GPS
if (sensors(SENSOR_GPS)) {
if (feature(FEATURE_GPS)) {
ADD_SENSOR(FSSP_DATAID_SPEED);
ADD_SENSOR(FSSP_DATAID_LATLONG);
ADD_SENSOR(FSSP_DATAID_LATLONG); // twice (one for lat, one for long)
@ -703,16 +703,17 @@ void processSmartPortTelemetry(smartPortPayload_t *payload, volatile bool *clear
*clearToSend = false;
break;
case FSSP_DATAID_T2 :
if (sensors(SENSOR_GPS)) {
#ifdef USE_GPS
if (sensors(SENSOR_GPS)) {
// provide GPS lock status
smartPortSendPackage(id, (STATE(GPS_FIX) ? 1000 : 0) + (STATE(GPS_FIX_HOME) ? 2000 : 0) + gpsSol.numSat);
*clearToSend = false;
#endif
} else if (feature(FEATURE_GPS)) {
smartPortSendPackage(id, 0);
*clearToSend = false;
} else if (telemetryConfig()->pidValuesAsTelemetry) {
} else
#endif
if (telemetryConfig()->pidValuesAsTelemetry) {
switch (t2Cnt) {
case 0:
tmp2 = currentPidProfile->pid[PID_ROLL].P;