remove all <cmath> usage

* the NuttX c++ library is incomplete, let's avoid including it until we have a real standard library in place
This commit is contained in:
Daniel Agar
2019-11-25 10:04:04 -05:00
committed by GitHub
parent 4a28c8180b
commit a8ea55d9b6
17 changed files with 21 additions and 21 deletions
@@ -43,7 +43,7 @@
#include <px4_platform_common/defines.h> #include <px4_platform_common/defines.h>
#include <systemlib/px4_macros.h> #include <systemlib/px4_macros.h>
#include <cmath> #include <math.h>
#define CAT3_(A, B, C) A##B##C #define CAT3_(A, B, C) A##B##C
#define CAT3(A, B, C) CAT3_(A, B, C) #define CAT3(A, B, C) CAT3_(A, B, C)
@@ -166,7 +166,7 @@ void start_note(unsigned frequency)
float signal_period = (1.0f / frequency) * 0.5f; float signal_period = (1.0f / frequency) * 0.5f;
// Calculate the hardware clock divisor rounded to the nearest integer. // Calculate the hardware clock divisor rounded to the nearest integer.
unsigned int divisor = std::round(signal_period * TONE_ALARM_CLOCK); unsigned int divisor = roundf(signal_period * TONE_ALARM_CLOCK);
rCNT = 0; rCNT = 0;
rMOD = divisor; // Load new signal switching period. rMOD = divisor; // Load new signal switching period.
@@ -34,7 +34,7 @@
#include <drivers/device/device.h> #include <drivers/device/device.h>
#include <drivers/drv_tone_alarm.h> #include <drivers/drv_tone_alarm.h>
#include <px4_platform_common/defines.h> #include <px4_platform_common/defines.h>
#include <cmath> #include <math.h>
/* Check that tone alarm and HRT timers are different */ /* Check that tone alarm and HRT timers are different */
#if defined(TONE_ALARM_TIMER) && defined(HRT_TIMER) #if defined(TONE_ALARM_TIMER) && defined(HRT_TIMER)
@@ -288,7 +288,7 @@ void start_note(unsigned frequency)
float signal_period = (1.0f / frequency) * 0.5f; float signal_period = (1.0f / frequency) * 0.5f;
// Calculate the hardware clock divisor rounded to the nearest integer. // Calculate the hardware clock divisor rounded to the nearest integer.
unsigned int divisor = std::round(signal_period * TONE_ALARM_CLOCK); unsigned int divisor = roundf(signal_period * TONE_ALARM_CLOCK);
// Pick the lowest prescaler value that we can use. // Pick the lowest prescaler value that we can use.
// (Note that the effective prescale value is 1 greater.) // (Note that the effective prescale value is 1 greater.)
+1 -1
View File
@@ -36,7 +36,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <cmath> #include <math.h>
#include <px4_platform_common/tasks.h> #include <px4_platform_common/tasks.h>
#include <px4_platform_common/getopt.h> #include <px4_platform_common/getopt.h>
@@ -37,7 +37,7 @@
#include <px4_platform_common/getopt.h> #include <px4_platform_common/getopt.h>
#include <px4_platform_common/posix.h> #include <px4_platform_common/posix.h>
#include <errno.h> #include <errno.h>
#include <cmath> // NAN #include <math.h> // NAN
#include <string.h> #include <string.h>
#include <uORB/Subscription.hpp> #include <uORB/Subscription.hpp>
+1 -1
View File
@@ -40,7 +40,7 @@
#include <px4_platform_common/posix.h> #include <px4_platform_common/posix.h>
#include <errno.h> #include <errno.h>
#include <cmath> // NAN #include <math.h> // NAN
#include <cstring> #include <cstring>
#include <lib/mathlib/mathlib.h> #include <lib/mathlib/mathlib.h>
+1 -1
View File
@@ -37,7 +37,7 @@
#include <drivers/drv_hrt.h> #include <drivers/drv_hrt.h>
#include "baro.hpp" #include "baro.hpp"
#include <cmath> #include <math.h>
const char *const UavcanBarometerBridge::NAME = "baro"; const char *const UavcanBarometerBridge::NAME = "baro";
@@ -9,7 +9,7 @@
#if UAVCAN_KINETIS_TIMER_NUMBER #if UAVCAN_KINETIS_TIMER_NUMBER
# include <cassert> # include <cassert>
# include <cmath> # include <math.h>
/* /*
* Timer instance * Timer instance
@@ -9,7 +9,7 @@
#if UAVCAN_STM32_TIMER_NUMBER #if UAVCAN_STM32_TIMER_NUMBER
#include <cassert> #include <cassert>
#include <cmath> #include <math.h>
/* /*
* Timer instance * Timer instance
@@ -35,7 +35,7 @@
#include <px4_platform_common/defines.h> #include <px4_platform_common/defines.h>
#include <cmath> #include <math.h>
namespace math namespace math
{ {
@@ -35,7 +35,7 @@
#include <px4_platform_common/defines.h> #include <px4_platform_common/defines.h>
#include <cmath> #include <math.h>
namespace math namespace math
{ {
@@ -39,7 +39,7 @@
#include "MultirotorMixer.hpp" #include "MultirotorMixer.hpp"
#include <cstdio> #include <cstdio>
#include <cmath> #include <math.h>
static const unsigned output_max = 16; static const unsigned output_max = 16;
static float actuator_controls[output_max] {}; static float actuator_controls[output_max] {};
+2 -2
View File
@@ -76,7 +76,7 @@
#include <circuit_breaker/circuit_breaker.h> #include <circuit_breaker/circuit_breaker.h>
#include <systemlib/mavlink_log.h> #include <systemlib/mavlink_log.h>
#include <cmath> #include <math.h>
#include <float.h> #include <float.h>
#include <cstring> #include <cstring>
@@ -768,7 +768,7 @@ Commander::handle_command(vehicle_status_s *status_local, const vehicle_command_
bool cmd_arms = (static_cast<int>(cmd.param1 + 0.5f) == 1); bool cmd_arms = (static_cast<int>(cmd.param1 + 0.5f) == 1);
// Arm/disarm is enforced when param2 is set to a magic number. // Arm/disarm is enforced when param2 is set to a magic number.
const bool enforce = (static_cast<int>(std::round(cmd.param2)) == 21196); const bool enforce = (static_cast<int>(roundf(cmd.param2)) == 21196);
if (!enforce) { if (!enforce) {
if (!land_detector.landed && !is_ground_rover(&status)) { if (!land_detector.landed && !is_ground_rover(&status)) {
@@ -48,7 +48,7 @@
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <poll.h> #include <poll.h>
#include <cmath> #include <math.h>
#include <drivers/drv_hrt.h> #include <drivers/drv_hrt.h>
#include <drivers/drv_airspeed.h> #include <drivers/drv_airspeed.h>
#include <uORB/topics/differential_pressure.h> #include <uORB/topics/differential_pressure.h>
+1 -1
View File
@@ -50,7 +50,7 @@
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <poll.h> #include <poll.h>
#include <cmath> #include <math.h>
#include <string.h> #include <string.h>
#include <drivers/drv_hrt.h> #include <drivers/drv_hrt.h>
#include <uORB/topics/sensor_combined.h> #include <uORB/topics/sensor_combined.h>
+1 -1
View File
@@ -50,7 +50,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <poll.h> #include <poll.h>
#include <cmath> #include <math.h>
#include <fcntl.h> #include <fcntl.h>
#include <drivers/drv_hrt.h> #include <drivers/drv_hrt.h>
#include <drivers/drv_accel.h> #include <drivers/drv_accel.h>
@@ -61,7 +61,7 @@
* @author Julian Oes <julian@oes.ch> * @author Julian Oes <julian@oes.ch>
*/ */
#include <cmath> #include <math.h>
#include <mathlib/mathlib.h> #include <mathlib/mathlib.h>
#include <matrix/math.hpp> #include <matrix/math.hpp>
+2 -2
View File
@@ -1546,8 +1546,8 @@ MavlinkMissionManager::format_mavlink_mission_item(const struct mission_item_s *
mavlink_mission_item_int_t *item_int = mavlink_mission_item_int_t *item_int =
reinterpret_cast<mavlink_mission_item_int_t *>(mavlink_mission_item); reinterpret_cast<mavlink_mission_item_int_t *>(mavlink_mission_item);
item_int->x = std::round(mission_item->lat * 1e7); item_int->x = round(mission_item->lat * 1e7);
item_int->y = std::round(mission_item->lon * 1e7); item_int->y = round(mission_item->lon * 1e7);
} else { } else {
mavlink_mission_item->x = (float)mission_item->lat; mavlink_mission_item->x = (float)mission_item->lat;