Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-26 09:45:33 +03:00
Code Issues Wiki Activity

rename args

Browse source
This commit is contained in:
Marcelo Bezerra 2024-06-26 13:54:02 +02:00
parent 8f7fe5bdff
commit 6de0900641
No known key found for this signature in database
GPG key ID: 718A5AC065848530
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/main/io/gps_ublox.c
View file

@ -1233,29 +1233,29 @@ const ubx_nav_sig_info *gpsGetUbloxSatelite(uint8_t index)
return NULL; return NULL;
} }
bool ubloxVersionLT(uint8_t mj2, uint8_t mn2) bool ubloxVersionLT(uint8_t mj, uint8_t mn)
{ {
return gpsState.swVersionMajor < mj2 || (gpsState.swVersionMajor == mj2 && gpsState.swVersionMinor < mn2); return gpsState.swVersionMajor < mj || (gpsState.swVersionMajor == mj && gpsState.swVersionMinor < mn);
} }
bool ubloxVersionGT(uint8_t mj2, uint8_t mn2) bool ubloxVersionGT(uint8_t mj, uint8_t mn)
{ {
return gpsState.swVersionMajor > mj2 || (gpsState.swVersionMajor == mj2 && gpsState.swVersionMinor > mn2); return gpsState.swVersionMajor > mj || (gpsState.swVersionMajor == mj && gpsState.swVersionMinor > mn);
} }
bool ubloxVersionGTE(uint8_t mj2, uint8_t mn2) bool ubloxVersionGTE(uint8_t mj, uint8_t mn)
{ {
return ubloxVersionGT(mj2, mn2) || ubloxVersionE(mj2, mn2); return ubloxVersionGT(mj, mn) || ubloxVersionE(mj, mn);
} }
bool ubloxVersionLTE(uint8_t mj2, uint8_t mn2) bool ubloxVersionLTE(uint8_t mj, uint8_t mn)
{ {
return ubloxVersionLT(mj2, mn2) || ubloxVersionE(mj2, mn2); return ubloxVersionLT(mj, mn) || ubloxVersionE(mj, mn);
} }
bool ubloxVersionE(uint8_t mj2, uint8_t mn2) bool ubloxVersionE(uint8_t mj, uint8_t mn)
{ {
return gpsState.swVersionMajor == mj2 && gpsState.swVersionMinor == mn2; return gpsState.swVersionMajor == mj && gpsState.swVersionMinor == mn;
} }
#endif #endif

10
src/main/io/gps_ublox.h
View file

@ -469,11 +469,11 @@ bool isGpsUblox(void);
const ubx_nav_sig_info *gpsGetUbloxSatelite(uint8_t index); const ubx_nav_sig_info *gpsGetUbloxSatelite(uint8_t index);
bool ubloxVersionLTE(uint8_t mj2, uint8_t mn2); bool ubloxVersionLTE(uint8_t mj, uint8_t mn);
bool ubloxVersionLT(uint8_t mj2, uint8_t mn2); bool ubloxVersionLT(uint8_t mj, uint8_t mn);
bool ubloxVersionGT(uint8_t mj2, uint8_t mn2); bool ubloxVersionGT(uint8_t mj, uint8_t mn);
bool ubloxVersionGTE(uint8_t mj2, uint8_t mn2); bool ubloxVersionGTE(uint8_t mj, uint8_t mn);
bool ubloxVersionE(uint8_t mj2, uint8_t mn2); bool ubloxVersionE(uint8_t mj, uint8_t mn);
#ifdef __cplusplus #ifdef __cplusplus
} }