Fixes Fract Dividers for Clock Output and PLL Output, rolls version for release

Author: edspark

examples/Example3_int_and_frac_divider_calc/Example3_int_and_frac_divider_calc.ino

@@ -68,7 +68,7 @@ void setup(){
   Serial.println(fbVal);
 
   // Clock One -----------------------------------------------------
-  // To get 16MHz Output = (1600MHz/2)/22MHz = 36.3636
+  // To get 22MHz Output = (1600MHz/2)/22MHz = 36.3636
   // Integer portion = 36
   // Fractional portion = .36 -> Need to convert to a HEX value
   // 2^24 * .36 = 6039796.76

examples/Example7_external_clock/Example7_external_clock.ino

@@ -45,7 +45,7 @@ void setup(){
 
   clockGen.clockInControl(ENABLE);
   // Assuming 12MHz input: 
-  Serial.println("Setting Internal Clock Frequency to 1600MHz.");
+  Serial.println("Setting Internal Clock Frequency to 1200MHz.");
   clockGen.setVcoFrequency(1200.0); // Give float value in MHz.
 
   // Clock One -----------------------------------------------------
@@ -55,7 +55,7 @@ void setup(){
   // There are many OUTPUT modes available for each clock - this example uses
   // LVPECL (Low voltage Positive Emitter Coupled Logic) mode.
   clockGen.clockOneConfigMode(LVPECL_MODE);
-  Serial.println("Setting Clock One Frequency to 16MHz.");
+  Serial.println("Setting Clock One Frequency to 6MHz.");
   clockGen.setClockOneFreq(6.0); // Give float value in MHz, 6.0 = 6000000Hz or 6MHz
   // --------------------------------------------------------------
 

library.properties

@@ -1,5 +1,5 @@
 name=SparkFun Clock 5P49V60 Arduino Library
-version=1.0.0
+version=1.0.1
 author=SparkFun Electronics <techsupport@sparkfun.com>
 maintainer=SparkFun Electronics <sparkfun.com>
 sentence=Library that enables all functionality for the SparkFun Clock Generator 5P49V60.

src/SparkFun_5P49V60.cpp

@@ -29,12 +29,12 @@ bool SparkFun_5P49V60::begin(TwoWire &wirePort)
 void SparkFun_5P49V60::setVcoFrequency(float freq){
 
   //Convert to MHz
-  _vco_freq = static_cast<uint16_t>(freq);
+  _vco_freq = freq;
   float pll_divider = _vco_freq/_clock_freq;  
   // Seperate the divider into the whole number and decimal.
   uint16_t int_portion  = static_cast<uint8_t>(pll_divider);
   float decimal  = fmod(pll_divider, int_portion);
-  uint32_t fract_portion = static_cast<uint32_t>(fract_portion * pow(2,24));
+  uint32_t fract_portion = static_cast<uint32_t>(decimal * pow(2,24));
 
   setPllFeedbackIntDiv(int_portion);
   setPllFeedBackFractDiv(fract_portion);
@@ -47,9 +47,10 @@ void SparkFun_5P49V60::setVcoFrequency(float freq){
 void SparkFun_5P49V60::setClockOneFreq(float freq){
 
   float division = (_vco_freq/2)/freq; 
+  
   uint32_t int_portion = static_cast<uint32_t>(division);
   float decimal = fmod(division, int_portion);
-  uint32_t frac_portion = static_cast<uint32_t>(decimal/pow(2.0,24.0));
+  uint32_t frac_portion = static_cast<uint32_t>(pow(2.0,24.0) * decimal);
 
   setIntDivOutOne(int_portion);
   setFractDivFodOne(frac_portion);
@@ -63,7 +64,7 @@ void SparkFun_5P49V60::setClockTwoFreq(float freq){
   float division = (_vco_freq/2)/freq; 
   uint32_t int_portion = static_cast<uint32_t>(division);
   float decimal = fmod(division, int_portion);
-  uint32_t frac_portion = static_cast<uint32_t>(decimal/pow(2.0,24.0));
+  uint32_t frac_portion = static_cast<uint32_t>(decimal * pow(2.0,24.0));
 
   setIntDivOutTwo(int_portion);
   setFractDivFodTwo(frac_portion);
@@ -78,7 +79,7 @@ void SparkFun_5P49V60::setClockThrFreq(float freq){
   float division = (_vco_freq/2)/freq; 
   uint32_t int_portion = static_cast<uint32_t>(division);
   float decimal = fmod(division, int_portion);
-  uint32_t frac_portion = static_cast<uint32_t>(decimal/pow(2.0,24.0));
+  uint32_t frac_portion = static_cast<uint32_t>(decimal * pow(2.0,24.0));
 
   setIntDivOutThree(int_portion);
   setFractDivFodThr(frac_portion);
@@ -93,7 +94,7 @@ void SparkFun_5P49V60::setClockFourFreq(float freq){
   float division = (_vco_freq/2)/freq; 
   uint32_t int_portion = static_cast<uint32_t>(division);
   float decimal = fmod(division, int_portion);
-  uint32_t frac_portion = static_cast<uint32_t>(decimal/pow(2.0,24.0));
+  uint32_t frac_portion = static_cast<uint32_t>(decimal * pow(2.0,24.0));
 
   setIntDivOutFour(int_portion);
   setFractDivFodFour(frac_portion);

src/SparkFun_5P49V60.h

@@ -39,7 +39,7 @@
 
 //                            1 , 2   , 4   , 8    , 16   , 32
 static float _cap_arr[6] = {.43 , .43 , .86 , 1.73 , 3.46 , 6.92};
-static uint8_t DEF_CLOCK = 16; //16MHz
+static float DEF_CLOCK = 16.0; //16MHz
 
 enum REGISTER_INDEX {
 
@@ -465,8 +465,8 @@ class SparkFun_5P49V60
 
     // Private Variables
     uint8_t _address;
-    uint8_t _clock_freq;
-    uint16_t _vco_freq;
+    float _clock_freq;
+    float _vco_freq;
 
     float _calculate_skew_variables(uint8_t);