Simplify expression used in frequency accumulation

This commit is contained in:
Miroslav Lichvar 2014-01-09 18:17:57 +01:00
parent 60d0fa2993
commit d34ebdb431
2 changed files with 3 additions and 3 deletions

View file

@ -411,7 +411,7 @@ LCL_AccumulateDeltaFrequency(double dfreq)
are handled in units of ppm, whereas the 'dfreq' argument is in are handled in units of ppm, whereas the 'dfreq' argument is in
terms of the gradient of the (offset) v (local time) function. */ terms of the gradient of the (offset) v (local time) function. */
current_freq_ppm = (1.0 - dfreq) * current_freq_ppm + 1.0e6 * dfreq; current_freq_ppm += dfreq * (1.0e6 - current_freq_ppm);
/* Call the system-specific driver for setting the frequency */ /* Call the system-specific driver for setting the frequency */
current_freq_ppm = (*drv_set_freq)(current_freq_ppm); current_freq_ppm = (*drv_set_freq)(current_freq_ppm);
@ -508,7 +508,7 @@ LCL_AccumulateFrequencyAndOffset(double dfreq, double doffset, double corr_rate)
/* Work out new absolute frequency. Note that absolute frequencies /* Work out new absolute frequency. Note that absolute frequencies
are handled in units of ppm, whereas the 'dfreq' argument is in are handled in units of ppm, whereas the 'dfreq' argument is in
terms of the gradient of the (offset) v (local time) function. */ terms of the gradient of the (offset) v (local time) function. */
current_freq_ppm = (1.0 - dfreq) * old_freq_ppm + 1.0e6 * dfreq; current_freq_ppm += dfreq * (1.0e6 - current_freq_ppm);
DEBUG_LOG(LOGF_Local, "old_freq=%.3fppm new_freq=%.3fppm offset=%.6fsec", DEBUG_LOG(LOGF_Local, "old_freq=%.3fppm new_freq=%.3fppm offset=%.6fsec",
old_freq_ppm, current_freq_ppm, doffset); old_freq_ppm, current_freq_ppm, doffset);

View file

@ -282,7 +282,7 @@ slew_samples
if (coefs_valid) { if (coefs_valid) {
coef_seconds_fast += doffset; coef_seconds_fast += doffset;
coef_gain_rate = (1.0 - dfreq) * coef_gain_rate + dfreq; coef_gain_rate += dfreq * (1.0 - coef_gain_rate);
} }
DEBUG_LOG(LOGF_RtcLinux, "dfreq=%.8f doffset=%.6f old_fast=%.6f old_rate=%.3f new_fast=%.6f new_rate=%.3f", DEBUG_LOG(LOGF_RtcLinux, "dfreq=%.8f doffset=%.6f old_fast=%.6f old_rate=%.3f new_fast=%.6f new_rate=%.3f",