Merge pull request #62 from etherkit/v2.1.2

V2.1.2
etherkit · Mar 30, 2018 · 4c9d1ed · 4c9d1ed
2 parents 8714316 + 5f432d3
commit 4c9d1ed
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -711,10 +711,14 @@ This library does not currently support the spread spectrum function of the Si53
 Changelog
 ---------
 
+* v2.1.2
+
+    * Correct error in si5351_calibration.ino sketch
+
 * v2.1.1
 
     * Add bool return value to _init()_ indicating whether a device is on the I2C bus
-    
+
 * v2.1.0
 
     * Add support for reference frequencies and corrections for both the XO and CLKIN

diff --git a/examples/si5351_calibration/si5351_calibration.ino b/examples/si5351_calibration/si5351_calibration.ino
@@ -2,7 +2,7 @@
  * si5351_calibration.ino - Simple calibration routine for the Si5351
  *                          breakout board.
  *
- * Copyright 2015 - 2017 Paul Warren <pwarren@pwarren.id.au>
+ * Copyright 2015 - 2018 Paul Warren <pwarren@pwarren.id.au>
  *                       Jason Milldrum <milldrum@gmail.com>
  *
  * Uses code from https://github.com/darksidelemm/open_radio_miniconf_2015
@@ -40,7 +40,7 @@ void setup()
   si5351.init(SI5351_CRYSTAL_LOAD_8PF, 0, 0);
 
   // Start on target frequency
-  si5351.set_correction(cal_factor);
+  si5351.set_correction(cal_factor, SI5351_PLL_INPUT_XO);
   si5351.set_pll(SI5351_PLL_FIXED, SI5351_PLLA);
   si5351.set_freq(target_freq, SI5351_CLK0);
 }
@@ -88,7 +88,7 @@ static void vfo_interface(void)
         Serial.print(F("Calibration factor is "));
         Serial.println(cal_factor);
         Serial.println(F("Setting calibration factor"));
-        si5351.set_correction(cal_factor);
+        si5351.set_correction(cal_factor, SI5351_PLL_INPUT_XO);
         si5351.set_pll(SI5351_PLL_FIXED, SI5351_PLLA);
         Serial.println(F("Resetting target frequency"));
         si5351.set_freq(target_freq, SI5351_CLK0);
@@ -114,7 +114,7 @@ static void vfo_interface(void)
     }
 
     cal_factor = (int32_t)(target_freq - rx_freq) + old_cal;
-    si5351.set_correction(cal_factor);
+    si5351.set_correction(cal_factor, SI5351_PLL_INPUT_XO);
     si5351.set_pll(SI5351_PLL_FIXED, SI5351_PLLA);
     si5351.pll_reset(SI5351_PLLA);
     si5351.set_freq(target_freq, SI5351_CLK0);

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=Etherkit Si5351
-version=2.1.1
+version=2.1.2
 author=Jason Milldrum <milldrum@gmail.com>
 maintainer=Jason Milldrum <milldrum@gmail.com>
 sentence=A full-featured library for the Si5351 series of clock generator ICs from Silicon Labs