Skip to content

Commit

Permalink
Deprecate lowercase lwgps_speed_xxx macros
Browse files Browse the repository at this point in the history
  • Loading branch information
@MaJerle
MaJerle committed Jun 11, 2023
1 parent f55d220 commit be23dc1
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 33 deletions.
46 changes: 31 additions & 15 deletions lwgps/src/include/lwgps/lwgps.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,29 +230,45 @@ typedef struct {
*/
typedef enum {
/* Metric values */
lwgps_speed_kps, /*!< Kilometers per second */
lwgps_speed_kph, /*!< Kilometers per hour */
lwgps_speed_mps, /*!< Meters per second */
lwgps_speed_mpm, /*!< Meters per minute */
LWGPS_SPEED_KPS, /*!< Kilometers per second */
LWGPS_SPEED_KPH, /*!< Kilometers per hour */
LWGPS_SPEED_MPS, /*!< Meters per second */
LWGPS_SPEED_MPM, /*!< Meters per minute */

/* Imperial values */
lwgps_speed_mips, /*!< Miles per second */
lwgps_speed_mph, /*!< Miles per hour */
lwgps_speed_fps, /*!< Foots per second */
lwgps_speed_fpm, /*!< Foots per minute */
LWGPS_SPEED_MIPS, /*!< Miles per second */
LWGPS_SPEED_MPH, /*!< Miles per hour */
LWGPS_SPEED_FPS, /*!< Foots per second */
LWGPS_SPEED_FPM, /*!< Foots per minute */

/* Optimized for runners/joggers */
lwgps_speed_mpk, /*!< Minutes per kilometer */
lwgps_speed_spk, /*!< Seconds per kilometer */
lwgps_speed_sp100m, /*!< Seconds per 100 meters */
lwgps_speed_mipm, /*!< Minutes per mile */
lwgps_speed_spm, /*!< Seconds per mile */
lwgps_speed_sp100y, /*!< Seconds per 100 yards */
LWGPS_SPEED_MPK, /*!< Minutes per kilometer */
LWGPS_SPEED_SPK, /*!< Seconds per kilometer */
LWGPS_SPEED_SP100M, /*!< Seconds per 100 meters */
LWGPS_SPEED_MIPM, /*!< Minutes per mile */
LWGPS_SPEED_SPM, /*!< Seconds per mile */
LWGPS_SPEED_SP100Y, /*!< Seconds per 100 yards */

/* Nautical values */
lwgps_speed_smph, /*!< Sea miles per hour */
LWGPS_SPEED_SMPH, /*!< Sea miles per hour */
} lwgps_speed_t;

#define lwgps_speed_kps LWGPS_SPEED_KPS /*!< Backward compatibility. \deprecated Use \ref lwgps_speed_t instead */
#define lwgps_speed_kph LWGPS_SPEED_KPH /*!< Backward compatibility. \deprecated Use \ref lwgps_speed_t instead */
#define lwgps_speed_mps LWGPS_SPEED_MPS /*!< Backward compatibility. \deprecated Use \ref lwgps_speed_t instead */
#define lwgps_speed_mpm LWGPS_SPEED_MPM /*!< Backward compatibility. \deprecated Use \ref lwgps_speed_t instead */
#define lwgps_speed_mips LWGPS_SPEED_MIPS /*!< Backward compatibility. \deprecated Use \ref lwgps_speed_t instead */
#define lwgps_speed_mph LWGPS_SPEED_MPH /*!< Backward compatibility. \deprecated Use \ref lwgps_speed_t instead */
#define lwgps_speed_fps LWGPS_SPEED_FPS /*!< Backward compatibility. \deprecated Use \ref lwgps_speed_t instead */
#define lwgps_speed_fpm LWGPS_SPEED_FPM /*!< Backward compatibility. \deprecated Use \ref lwgps_speed_t instead */
#define lwgps_speed_mpk LWGPS_SPEED_MPK /*!< Backward compatibility. \deprecated Use \ref lwgps_speed_t instead */
#define lwgps_speed_spk LWGPS_SPEED_SPK /*!< Backward compatibility. \deprecated Use \ref lwgps_speed_t instead */
#define lwgps_speed_sp100m LWGPS_SPEED_SP100M /*!< Backward compatibility. \deprecated Use \ref lwgps_speed_t instead */
#define lwgps_speed_mipm LWGPS_SPEED_MIPM /*!< Backward compatibility. \deprecated Use \ref lwgps_speed_t instead */
#define lwgps_speed_spm LWGPS_SPEED_SPM /*!< Backward compatibility. \deprecated Use \ref lwgps_speed_t instead */
#define lwgps_speed_sp100y LWGPS_SPEED_SP100Y /*!< Backward compatibility. \deprecated Use \ref lwgps_speed_t instead */
#define lwgps_speed_smph LWGPS_SPEED_SMPH /*!< Backward compatibility. \deprecated Use \ref lwgps_speed_t instead */

/**
* \brief Signature for caller-suplied callback function from gps_process
* \param[in] res: statement type of recently parsed statement
Expand Down
33 changes: 15 additions & 18 deletions lwgps/src/lwgps/lwgps.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -556,24 +556,21 @@ lwgps_distance_bearing(lwgps_float_t las, lwgps_float_t los, lwgps_float_t lae,
lwgps_float_t
lwgps_to_speed(lwgps_float_t sik, lwgps_speed_t ts) {
switch (ts) {
case lwgps_speed_kps: return FLT(sik * FLT(0.000514));
case lwgps_speed_kph: return FLT(sik * FLT(1.852));
case lwgps_speed_mps: return FLT(sik * FLT(0.5144));
case lwgps_speed_mpm: return FLT(sik * FLT(30.87));

case lwgps_speed_mips: return FLT(sik * FLT(0.0003197));
case lwgps_speed_mph: return FLT(sik * FLT(1.151));
case lwgps_speed_fps: return FLT(sik * FLT(1.688));
case lwgps_speed_fpm: return FLT(sik * FLT(101.3));

case lwgps_speed_mpk: return FLT(sik * FLT(32.4));
case lwgps_speed_spk: return FLT(sik * FLT(1944.0));
case lwgps_speed_sp100m: return FLT(sik * FLT(194.4));
case lwgps_speed_mipm: return FLT(sik * FLT(52.14));
case lwgps_speed_spm: return FLT(sik * FLT(3128.0));
case lwgps_speed_sp100y: return FLT(sik * FLT(177.7));

case lwgps_speed_smph: return FLT(sik * FLT(1.0));
case LWGPS_SPEED_KPS: return FLT(sik * FLT(0.000514));
case LWGPS_SPEED_KPH: return FLT(sik * FLT(1.852));
case LWGPS_SPEED_MPS: return FLT(sik * FLT(0.5144));
case LWGPS_SPEED_MPM: return FLT(sik * FLT(30.87));
case LWGPS_SPEED_MIPS: return FLT(sik * FLT(0.0003197));
case LWGPS_SPEED_MPH: return FLT(sik * FLT(1.151));
case LWGPS_SPEED_FPS: return FLT(sik * FLT(1.688));
case LWGPS_SPEED_FPM: return FLT(sik * FLT(101.3));
case LWGPS_SPEED_MPK: return FLT(sik * FLT(32.4));
case LWGPS_SPEED_SPK: return FLT(sik * FLT(1944.0));
case LWGPS_SPEED_SP100M: return FLT(sik * FLT(194.4));
case LWGPS_SPEED_MIPM: return FLT(sik * FLT(52.14));
case LWGPS_SPEED_SPM: return FLT(sik * FLT(3128.0));
case LWGPS_SPEED_SP100Y: return FLT(sik * FLT(177.7));
case LWGPS_SPEED_SMPH: return FLT(sik * FLT(1.0));
default: return 0;
}
}

0 comments on commit be23dc1

Please sign in to comment.