Browse Source

Revert "AP_Math: add function to convert any base to any base"

This reverts commit 935cb39dff.
zr-v5.1
Tom Pittenger 4 years ago committed by Andrew Tridgell
parent
commit
787d7f5254
  1. 17
      libraries/AP_Math/AP_Math.cpp
  2. 3
      libraries/AP_Math/AP_Math.h

17
libraries/AP_Math/AP_Math.cpp

@ -128,23 +128,6 @@ float throttle_curve(float thr_mid, float alpha, float thr_in) @@ -128,23 +128,6 @@ float throttle_curve(float thr_mid, float alpha, float thr_in)
return thr_out;
}
/*
* Convert any base number to any base number. Example octal(8) to decimal(10)
* baseIn: base of input number
* baseOut: base of output number
* inputNumber: value currently in base "baseIn" to be converted to base "baseOut"
*/
uint32_t convertMathBase(const uint8_t baseIn, const uint8_t baseOut, uint32_t inputNumber)
{
uint32_t outputNumber = 0;
for (uint8_t i=0; inputNumber != 0; i++) {
outputNumber += (inputNumber % baseOut) * powf(float(baseIn), i);
inputNumber /= baseOut;
}
return outputNumber;
}
template <typename T>
T wrap_180(const T angle)
{

3
libraries/AP_Math/AP_Math.h

@ -265,9 +265,6 @@ constexpr float expo_curve(float alpha, float input); @@ -265,9 +265,6 @@ constexpr float expo_curve(float alpha, float input);
*/
float throttle_curve(float thr_mid, float alpha, float thr_in);
// Convert any base number to any base number. Example octal(8) to decimal(10)
uint32_t convertMathBase(const uint8_t baseIn, const uint8_t baseOut, uint32_t inputNumber);
/* simple 16 bit random number generator */
uint16_t get_random16(void);

Loading…
Cancel
Save