Merge pull request #48 from etherkit/v2.0.5

NT7S · web-flow · commit 6dc44cf19976 · 2017-06-17T11:53:57.000-07:00
V2.0.5
diff --git a/README.md b/README.md
@@ -665,6 +665,10 @@ This library does not currently support the spread spectrum function of the Si53
 
 Changelog
 
+* v2.0.5
+
+    * Remove PLL reset from set_freq() when not necessary
+
 * v2.0.4
 
     * Fix error in VCXO algorithm
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=Etherkit Si5351
-version=2.0.4
+version=2.0.5
 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
diff --git a/src/si5351.cpp b/src/si5351.cpp
@@ -304,7 +304,7 @@ uint8_t Si5351::set_freq(uint64_t freq, enum si5351_clock clk)
 			set_ms(clk, ms_reg, int_mode, r_div, div_by_4);
 
 			// Reset the PLL
-			pll_reset(pll_assignment[clk]);
+			//pll_reset(pll_assignment[clk]);
 		}
 
 		return 0;

-Original file line number
+Diff line change
@@ @@ -1,5 +1,5 @@ @@
 name=Etherkit Si5351
 -version=2.0.4
 +version=2.0.5
 author=Jason Milldrum <[email protected]>
 maintainer=Jason Milldrum <[email protected]>
 sentence=A full-featured library for the Si5351 series of clock generator ICs from Silicon Labs
Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ uint8_t Si5351::set_freq(uint64_t freq, enum si5351_clock clk)`
`304`	`304`	`set_ms(clk, ms_reg, int_mode, r_div, div_by_4);`
`305`	`305`
`306`	`306`	`// Reset the PLL`
`307`		`- pll_reset(pll_assignment[clk]);`
	`307`	`+ //pll_reset(pll_assignment[clk]);`
`308`	`308`	`}`
`309`	`309`
`310`	`310`	`return 0;`