Skip to content

Commit

Permalink
Merge pull request #8445 from JulioCesarMatias/FixBoolValues
Browse files Browse the repository at this point in the history 
Fix bool values
  • Loading branch information
@DzikuVx
DzikuVx committed Oct 4, 2022
2 parents fe37791 + 3905bf3 commit b372a0f
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 38 deletions.
12 changes: 6 additions & 6 deletions src/main/fc/fc_msp.c
View file
Expand Up @@ -2474,9 +2474,9 @@ static mspResult_e mspFcProcessInCommand(uint16_t cmdMSP, sbuf_t *src)
} else {
DISABLE_STATE(GPS_FIX);
}
gpsSol.flags.validVelNE = 0;
gpsSol.flags.validVelD = 0;
gpsSol.flags.validEPE = 0;
gpsSol.flags.validVelNE = false;
gpsSol.flags.validVelD = false;
gpsSol.flags.validEPE = false;
gpsSol.numSat = sbufReadU8(src);
gpsSol.llh.lat = sbufReadU32(src);
gpsSol.llh.lon = sbufReadU32(src);
Expand Down Expand Up @@ -3444,9 +3444,9 @@ bool mspFCProcessInOutCommand(uint16_t cmdMSP, sbuf_t *dst, sbuf_t *src, mspResu
gpsSol.numSat = sbufReadU8(src);

if (gpsSol.fixType != GPS_NO_FIX) {
gpsSol.flags.validVelNE = 1;
gpsSol.flags.validVelD = 1;
gpsSol.flags.validEPE = 1;
gpsSol.flags.validVelNE = true;
gpsSol.flags.validVelD = true;
gpsSol.flags.validEPE = true;

gpsSol.llh.lat = sbufReadU32(src);
gpsSol.llh.lon = sbufReadU32(src);
Expand Down
24 changes: 12 additions & 12 deletions src/main/io/gps.c
View file
Expand Up @@ -145,9 +145,9 @@ void gpsProcessNewSolutionData(void)
}
else {
/* When no fix available - reset flags as well */
gpsSol.flags.validVelNE = 0;
gpsSol.flags.validVelD = 0;
gpsSol.flags.validEPE = 0;
gpsSol.flags.validVelNE = false;
gpsSol.flags.validVelD = false;
gpsSol.flags.validEPE = false;
DISABLE_STATE(GPS_FIX);
}

Expand Down Expand Up @@ -180,11 +180,11 @@ static void gpsResetSolution(void)

gpsSol.fixType = GPS_NO_FIX;

gpsSol.flags.validVelNE = 0;
gpsSol.flags.validVelD = 0;
gpsSol.flags.validMag = 0;
gpsSol.flags.validEPE = 0;
gpsSol.flags.validTime = 0;
gpsSol.flags.validVelNE = false;
gpsSol.flags.validVelD = false;
gpsSol.flags.validMag = false;
gpsSol.flags.validEPE = false;
gpsSol.flags.validTime = false;
}

void gpsPreInit(void)
Expand Down Expand Up @@ -292,10 +292,10 @@ static bool gpsFakeGPSUpdate(void)
gpsSol.velNED[X] = speed * cos_approx(DECIDEGREES_TO_RADIANS(FAKE_GPS_GROUND_COURSE_DECIDEGREES));
gpsSol.velNED[Y] = speed * sin_approx(DECIDEGREES_TO_RADIANS(FAKE_GPS_GROUND_COURSE_DECIDEGREES));
gpsSol.velNED[Z] = 0;
gpsSol.flags.validVelNE = 1;
gpsSol.flags.validVelD = 1;
gpsSol.flags.validEPE = 1;
gpsSol.flags.validTime = 1;
gpsSol.flags.validVelNE = true;
gpsSol.flags.validVelD = true;
gpsSol.flags.validEPE = true;
gpsSol.flags.validTime = true;
gpsSol.eph = 100;
gpsSol.epv = 100;
gpsSol.time.year = 1983;
Expand Down
6 changes: 3 additions & 3 deletions src/main/io/gps_msp.c
View file
Expand Up @@ -94,9 +94,9 @@ void mspGPSReceiveNewData(const uint8_t * bufferPtr)
gpsSol.eph = gpsConstrainEPE(pkt->horizontalPosAccuracy / 10);
gpsSol.epv = gpsConstrainEPE(pkt->verticalPosAccuracy / 10);
gpsSol.hdop = gpsConstrainHDOP(pkt->hdop);
gpsSol.flags.validVelNE = 1;
gpsSol.flags.validVelD = 1;
gpsSol.flags.validEPE = 1;
gpsSol.flags.validVelNE = true;
gpsSol.flags.validVelD = true;
gpsSol.flags.validEPE = true;

gpsSol.time.year = pkt->year;
gpsSol.time.month = pkt->month;
Expand Down
14 changes: 7 additions & 7 deletions src/main/io/gps_nmea.c
View file
Expand Up @@ -212,15 +212,15 @@ static bool gpsNewFrameNMEA(char c)
gpsSol.hdop = gpsConstrainHDOP(gps_Msg.hdop);
gpsSol.eph = gpsConstrainEPE(gps_Msg.hdop * GPS_HDOP_TO_EPH_MULTIPLIER);
gpsSol.epv = gpsConstrainEPE(gps_Msg.hdop * GPS_HDOP_TO_EPH_MULTIPLIER);
gpsSol.flags.validEPE = 0;
gpsSol.flags.validEPE = false;
}
else {
gpsSol.fixType = GPS_NO_FIX;
}

// NMEA does not report VELNED
gpsSol.flags.validVelNE = 0;
gpsSol.flags.validVelD = 0;
gpsSol.flags.validVelNE = false;
gpsSol.flags.validVelD = false;
break;
case FRAME_RMC:
gpsSol.groundSpeed = gps_Msg.speed;
Expand All @@ -235,10 +235,10 @@ static bool gpsNewFrameNMEA(char c)
gpsSol.time.minutes = (gps_Msg.time / 10000) % 100;
gpsSol.time.seconds = (gps_Msg.time / 100) % 100;
gpsSol.time.millis = (gps_Msg.time & 100) * 10;
gpsSol.flags.validTime = 1;
gpsSol.flags.validTime = true;
}
else {
gpsSol.flags.validTime = 0;
gpsSol.flags.validTime = false;
}

break;
Expand Down Expand Up @@ -276,8 +276,8 @@ STATIC_PROTOTHREAD(gpsProtocolReceiverThread)
while (serialRxBytesWaiting(gpsState.gpsPort)) {
uint8_t newChar = serialRead(gpsState.gpsPort);
if (gpsNewFrameNMEA(newChar)) {
gpsSol.flags.validVelNE = 0;
gpsSol.flags.validVelD = 0;
gpsSol.flags.validVelNE = false;
gpsSol.flags.validVelD = false;
ptSemaphoreSignal(semNewDataReady);
break;
}
Expand Down
20 changes: 10 additions & 10 deletions src/main/io/gps_ublox.c
View file
Expand Up @@ -609,7 +609,7 @@ static bool gpsParceFrameUBLOX(void)
gpsSol.llh.alt = _buffer.posllh.altitude_msl / 10; //alt in cm
gpsSol.eph = gpsConstrainEPE(_buffer.posllh.horizontal_accuracy / 10);
gpsSol.epv = gpsConstrainEPE(_buffer.posllh.vertical_accuracy / 10);
gpsSol.flags.validEPE = 1;
gpsSol.flags.validEPE = true;
if (next_fix_type != GPS_NO_FIX)
gpsSol.fixType = next_fix_type;
_new_position = true;
Expand All @@ -632,8 +632,8 @@ static bool gpsParceFrameUBLOX(void)
gpsSol.velNED[X] = _buffer.velned.ned_north;
gpsSol.velNED[Y] = _buffer.velned.ned_east;
gpsSol.velNED[Z] = _buffer.velned.ned_down;
gpsSol.flags.validVelNE = 1;
gpsSol.flags.validVelD = 1;
gpsSol.flags.validVelNE = true;
gpsSol.flags.validVelD = true;
_new_speed = true;
break;
case MSG_TIMEUTC:
Expand All @@ -646,9 +646,9 @@ static bool gpsParceFrameUBLOX(void)
gpsSol.time.seconds = _buffer.timeutc.sec;
gpsSol.time.millis = _buffer.timeutc.nano / (1000*1000);

gpsSol.flags.validTime = 1;
gpsSol.flags.validTime = true;
} else {
gpsSol.flags.validTime = 0;
gpsSol.flags.validTime = false;
}
break;
case MSG_PVT:
Expand All @@ -666,9 +666,9 @@ static bool gpsParceFrameUBLOX(void)
gpsSol.eph = gpsConstrainEPE(_buffer.pvt.horizontal_accuracy / 10);
gpsSol.epv = gpsConstrainEPE(_buffer.pvt.vertical_accuracy / 10);
gpsSol.hdop = gpsConstrainHDOP(_buffer.pvt.position_DOP);
gpsSol.flags.validVelNE = 1;
gpsSol.flags.validVelD = 1;
gpsSol.flags.validEPE = 1;
gpsSol.flags.validVelNE = true;
gpsSol.flags.validVelD = true;
gpsSol.flags.validEPE = true;

if (UBX_VALID_GPS_DATE_TIME(_buffer.pvt.valid)) {
gpsSol.time.year = _buffer.pvt.year;
Expand All @@ -679,9 +679,9 @@ static bool gpsParceFrameUBLOX(void)
gpsSol.time.seconds = _buffer.pvt.sec;
gpsSol.time.millis = _buffer.pvt.nano / (1000*1000);

gpsSol.flags.validTime = 1;
gpsSol.flags.validTime = true;
} else {
gpsSol.flags.validTime = 0;
gpsSol.flags.validTime = false;
}

_new_position = true;
Expand Down

0 comments on commit b372a0f

Please sign in to comment.