mirror of
https://github.com/betaflight/betaflight.git
synced 2025-07-20 14:55:21 +03:00
Reverted change and added 32bit versions of gpsSol.llh.alt
This commit is contained in:
parent
b88fba225f
commit
84ee9c624c
1 changed files with 6 additions and 2 deletions
|
@ -1033,9 +1033,10 @@ static bool mspProcessOutCommand(uint8_t cmdMSP, sbuf_t *dst)
|
||||||
sbufWriteU8(dst, gpsSol.numSat);
|
sbufWriteU8(dst, gpsSol.numSat);
|
||||||
sbufWriteU32(dst, gpsSol.llh.lat);
|
sbufWriteU32(dst, gpsSol.llh.lat);
|
||||||
sbufWriteU32(dst, gpsSol.llh.lon);
|
sbufWriteU32(dst, gpsSol.llh.lon);
|
||||||
sbufWriteU16(dst, gpsSol.llh.alt);
|
sbufWriteU16(dst, MIN(gpsSol.llh.alt,65535));
|
||||||
sbufWriteU16(dst, gpsSol.groundSpeed);
|
sbufWriteU16(dst, gpsSol.groundSpeed);
|
||||||
sbufWriteU16(dst, gpsSol.groundCourse);
|
sbufWriteU16(dst, gpsSol.groundCourse);
|
||||||
|
sbufWriteU32(dst, gpsSol.llh.alt);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MSP_COMP_GPS:
|
case MSP_COMP_GPS:
|
||||||
|
@ -1899,8 +1900,11 @@ static mspResult_e mspProcessInCommand(uint8_t cmdMSP, sbuf_t *src)
|
||||||
gpsSol.numSat = sbufReadU8(src);
|
gpsSol.numSat = sbufReadU8(src);
|
||||||
gpsSol.llh.lat = sbufReadU32(src);
|
gpsSol.llh.lat = sbufReadU32(src);
|
||||||
gpsSol.llh.lon = sbufReadU32(src);
|
gpsSol.llh.lon = sbufReadU32(src);
|
||||||
gpsSol.llh.alt = sbufReadU32(src);
|
gpsSol.llh.alt = sbufReadU16(src);
|
||||||
gpsSol.groundSpeed = sbufReadU16(src);
|
gpsSol.groundSpeed = sbufReadU16(src);
|
||||||
|
if (sbufBytesRemaining(src) >= 4) {
|
||||||
|
gpsSol.llh.alt = sbufReadU32(src);
|
||||||
|
}
|
||||||
GPS_update |= 2; // New data signalisation to GPS functions // FIXME Magic Numbers
|
GPS_update |= 2; // New data signalisation to GPS functions // FIXME Magic Numbers
|
||||||
break;
|
break;
|
||||||
#endif // USE_GPS
|
#endif // USE_GPS
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue