Solved store/load bug

master
erikkaashoek 5 years ago
parent 0e022889e0
commit 0ccc1b1526

@ -809,10 +809,9 @@ typedef struct setting
float normalize_level; // Level to set normalize to, zero if not doing anything
int modulation_frequency;
int trigger_mode;
uint32_t checksum;
int slider_position;
int32_t slider_span;
uint32_t checksum; // must be last
}setting_t;
extern setting_t setting;

@ -565,11 +565,11 @@ to_dBm(const float v)
{
case U_DBMV:
// return v - 30.0 - 20.0*log10f(sqrt(50));
return v - 30.0 - 20.0*LOG_10_SQRT_50;
return v - LOG_10_SQRT_50_x20_plus30; // (30.0 + 20.0*LOG_10_SQRT_50);
break;
case U_DBUV:
// return v - 90.0 - 20.0*log10f(sqrt(50.0)); //TODO convert constants to single float number as GCC compiler does runtime calculation
return v - 90.0 - 20.0*LOG_10_SQRT_50;
return v - LOG_10_SQRT_50_x20_plus90; // (90.0 + 20.0*LOG_10_SQRT_50);
break;
case U_VOLT:
// return log10f( v / (sqrt(50.0))) * 20.0 + 30.0 ;

Loading…
Cancel
Save

Powered by TurnKey Linux.