Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-12-18 04:04:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove constexpr use of std::log2, std::log10.

Browse Source 
GCC 4.9 doesn't care for it.
This commit is contained in:
Jared Boone 2016-02-19 10:30:26 -08:00
parent d6d1f6b8af
commit daeb542086
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/common/utility.cpp
View File

@ -22,7 +22,6 @@
#include "utility.hpp" #include "utility.hpp"
#include <cstdint> #include <cstdint>
#include <cmath>
#if 0 #if 0
uint32_t gcd(const uint32_t u, const uint32_t v) { uint32_t gcd(const uint32_t u, const uint32_t v) {
@ -84,10 +83,9 @@ float fast_pow2(const float val) {
} }
float mag2_to_dbv_norm(const float mag2) { float mag2_to_dbv_norm(const float mag2) {
constexpr float mag2_max = 1.0f; constexpr float mag2_log2_max = 0.0f; //std::log2(1.0f);
constexpr float mag2_log2_max = std::log2(mag2_max);
constexpr float log_mag2_mag_factor = 0.5f; constexpr float log_mag2_mag_factor = 0.5f;
constexpr float log2_log10_factor = std::log10(2.0f); constexpr float log2_log10_factor = 0.3010299956639812f; //std::log10(2.0f);
constexpr float log10_dbv_factor = 20.0f; constexpr float log10_dbv_factor = 20.0f;
constexpr float mag2_to_db_factor = log_mag2_mag_factor * log2_log10_factor * log10_dbv_factor; constexpr float mag2_to_db_factor = log_mag2_mag_factor * log2_log10_factor * log10_dbv_factor;
return (fast_log2(mag2) - mag2_log2_max) * mag2_to_db_factor; return (fast_log2(mag2) - mag2_log2_max) * mag2_to_db_factor;