From 23f725b8939f84727cee7ca5e09bc5824af29afe Mon Sep 17 00:00:00 2001 From: jposada202020 Date: Sat, 24 Apr 2021 22:18:51 -0400 Subject: [PATCH 1/5] removing assert statements --- adafruit_si5351.py | 43 +++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/adafruit_si5351.py b/adafruit_si5351.py index 3133488..91c85ad 100644 --- a/adafruit_si5351.py +++ b/adafruit_si5351.py @@ -169,10 +169,11 @@ def _configure_registers(self, p1, p2, p3): self._si5351._write_u8(_SI5351_REGISTER_177_PLL_RESET, (1 << 7) | (1 << 5)) def configure_integer(self, multiplier): - """Configure the PLL with a simple integer mulitplier for the most + """Configure the PLL with a simple integer multiplier for the most accurate (but more limited) PLL frequency generation. """ - assert 14 < multiplier < 91 + if multiplier > 91 or multiplier < 14: + raise Exception("multiplier must be between 14 and 91") multiplier = int(multiplier) # Compute register values and configure them. p1 = 128 * multiplier - 512 @@ -192,9 +193,16 @@ def configure_fractional(self, multiplier, numerator, denominator): multiplier and numerator/denominator. This is less accurate and susceptible to jitter but allows a larger range of PLL frequencies. """ - assert 14 < multiplier < 91 - assert 0 < denominator <= 0xFFFFF # Prevent divide by zero. - assert 0 <= numerator < 0xFFFFF + if multiplier > 91 or multiplier < 14: + raise Exception("multiplier must be between 14 and 91") + if denominator > 0xFFFFF or denominator <= 0: # Prevent divide by zero. + raise Exception( + "denominator must be greater than 0 and lower than 0xFFFFF" + ) + if numerator > 0xFFFFF or numerator < 0: + raise Exception( + "numerator must be greater than 0 and lower than 0xFFFFF" + ) multiplier = int(multiplier) numerator = int(numerator) denominator = int(denominator) @@ -279,7 +287,8 @@ def r_divider(self): @r_divider.setter def r_divider(self, divider): - assert 0 <= divider <= 7 + if divider > 7 or divider < 0: + raise Exception("divider must be between 0 and 7") reg_value = self._si5351._read_u8(self._r) reg_value &= 0x0F divider &= 0x07 @@ -306,10 +315,12 @@ def configure_integer(self, pll, divider): divider. This is the most accurate way to set the clock output frequency but supports less of a range of values. """ - assert 3 < divider < 2049 + if divider >= 2049 or divider <= 3: + raise Exception("divider must be between 3 and 2049") divider = int(divider) # Make sure the PLL is configured (has a frequency set). - assert pll.frequency is not None + if pll.frequency is None: + raise Exception("PLL must be configured") # Compute MSx register values. p1 = 128 * divider - 512 p2 = 0 @@ -331,14 +342,22 @@ def configure_fractional(self, pll, divider, numerator, denominator): fractional divider with numerator/denominator. Again this is less accurate but has a wider range of output frequencies. """ - assert 3 < divider < 2049 - assert 0 < denominator <= 0xFFFFF # Prevent divide by zero. - assert 0 <= numerator < 0xFFFFF + if divider >= 2049 or divider <= 3: + raise Exception("divider must be between 3 and 2049") + if denominator > 0xFFFFF or denominator <= 0: # Prevent divide by zero. + raise Exception( + "denominator must be greater than 0 and lower than 0xFFFFF" + ) + if numerator > 0xFFFFF or numerator < 0: + raise Exception( + "numerator must be greater than 0 and lower than 0xFFFFF" + ) divider = int(divider) numerator = int(numerator) denominator = int(denominator) # Make sure the PLL is configured (has a frequency set). - assert pll.frequency is not None + if pll.frequency is None: + raise Exception("PLL must be configured") # Compute MSx register values. p1 = int(128 * divider + math.floor(128 * (numerator / denominator)) - 512) p2 = int( From ad530a39642b04810407cc6af042ace504c38c83 Mon Sep 17 00:00:00 2001 From: jposada202020 Date: Sun, 23 May 2021 19:42:08 -0400 Subject: [PATCH 2/5] including_suggestions --- adafruit_si5351.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/adafruit_si5351.py b/adafruit_si5351.py index 91c85ad..6d7763c 100644 --- a/adafruit_si5351.py +++ b/adafruit_si5351.py @@ -172,8 +172,8 @@ def configure_integer(self, multiplier): """Configure the PLL with a simple integer multiplier for the most accurate (but more limited) PLL frequency generation. """ - if multiplier > 91 or multiplier < 14: - raise Exception("multiplier must be between 14 and 91") + if multiplier >= 91 or multiplier <= 14: + raise Exception("Multiplier must be in range 14 to 91.") multiplier = int(multiplier) # Compute register values and configure them. p1 = 128 * multiplier - 512 @@ -193,15 +193,15 @@ def configure_fractional(self, multiplier, numerator, denominator): multiplier and numerator/denominator. This is less accurate and susceptible to jitter but allows a larger range of PLL frequencies. """ - if multiplier > 91 or multiplier < 14: - raise Exception("multiplier must be between 14 and 91") + if multiplier >= 91 or multiplier <= 14: + raise Exception("Multiplier must be in range 14 to 91.") if denominator > 0xFFFFF or denominator <= 0: # Prevent divide by zero. raise Exception( - "denominator must be greater than 0 and lower than 0xFFFFF" + "Denominator must be in range 0 to 0xFFFFF." ) - if numerator > 0xFFFFF or numerator < 0: + if numerator >= 0xFFFFF or numerator < 0: raise Exception( - "numerator must be greater than 0 and lower than 0xFFFFF" + "Numerator must be in range 0 to 0xFFFFF." ) multiplier = int(multiplier) numerator = int(numerator) @@ -288,7 +288,7 @@ def r_divider(self): @r_divider.setter def r_divider(self, divider): if divider > 7 or divider < 0: - raise Exception("divider must be between 0 and 7") + raise Exception("Divider must in range 0 to 7.") reg_value = self._si5351._read_u8(self._r) reg_value &= 0x0F divider &= 0x07 @@ -316,11 +316,11 @@ def configure_integer(self, pll, divider): frequency but supports less of a range of values. """ if divider >= 2049 or divider <= 3: - raise Exception("divider must be between 3 and 2049") + raise Exception("Divider must be in range 3 to 2049.") divider = int(divider) # Make sure the PLL is configured (has a frequency set). if pll.frequency is None: - raise Exception("PLL must be configured") + raise Exception("PLL must be configured.") # Compute MSx register values. p1 = 128 * divider - 512 p2 = 0 @@ -343,21 +343,21 @@ def configure_fractional(self, pll, divider, numerator, denominator): accurate but has a wider range of output frequencies. """ if divider >= 2049 or divider <= 3: - raise Exception("divider must be between 3 and 2049") + raise Exception("Divider must be in range 3 to 2049.") if denominator > 0xFFFFF or denominator <= 0: # Prevent divide by zero. raise Exception( - "denominator must be greater than 0 and lower than 0xFFFFF" + "Denominator must be in range 0 to 0xFFFFF." ) - if numerator > 0xFFFFF or numerator < 0: + if numerator >= 0xFFFFF or numerator < 0: raise Exception( - "numerator must be greater than 0 and lower than 0xFFFFF" + "Numerator must be in range 0 to 0xFFFFF." ) divider = int(divider) numerator = int(numerator) denominator = int(denominator) # Make sure the PLL is configured (has a frequency set). if pll.frequency is None: - raise Exception("PLL must be configured") + raise Exception("PLL must be configured.") # Compute MSx register values. p1 = int(128 * divider + math.floor(128 * (numerator / denominator)) - 512) p2 = int( From fb9fe62e1e9a467af24fa3b3d5ac2381d2f28871 Mon Sep 17 00:00:00 2001 From: jposada202020 Date: Sun, 23 May 2021 19:46:11 -0400 Subject: [PATCH 3/5] applying_black --- adafruit_si5351.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/adafruit_si5351.py b/adafruit_si5351.py index 6d7763c..cb8e5b9 100644 --- a/adafruit_si5351.py +++ b/adafruit_si5351.py @@ -196,13 +196,9 @@ def configure_fractional(self, multiplier, numerator, denominator): if multiplier >= 91 or multiplier <= 14: raise Exception("Multiplier must be in range 14 to 91.") if denominator > 0xFFFFF or denominator <= 0: # Prevent divide by zero. - raise Exception( - "Denominator must be in range 0 to 0xFFFFF." - ) + raise Exception("Denominator must be in range 0 to 0xFFFFF.") if numerator >= 0xFFFFF or numerator < 0: - raise Exception( - "Numerator must be in range 0 to 0xFFFFF." - ) + raise Exception("Numerator must be in range 0 to 0xFFFFF.") multiplier = int(multiplier) numerator = int(numerator) denominator = int(denominator) @@ -345,13 +341,9 @@ def configure_fractional(self, pll, divider, numerator, denominator): if divider >= 2049 or divider <= 3: raise Exception("Divider must be in range 3 to 2049.") if denominator > 0xFFFFF or denominator <= 0: # Prevent divide by zero. - raise Exception( - "Denominator must be in range 0 to 0xFFFFF." - ) + raise Exception("Denominator must be in range 0 to 0xFFFFF.") if numerator >= 0xFFFFF or numerator < 0: - raise Exception( - "Numerator must be in range 0 to 0xFFFFF." - ) + raise Exception("Numerator must be in range 0 to 0xFFFFF.") divider = int(divider) numerator = int(numerator) denominator = int(denominator) From 0a248349c7fb14d41e4a8995a7dc25f062a55e3a Mon Sep 17 00:00:00 2001 From: jposada202020 Date: Tue, 25 May 2021 12:24:20 -0400 Subject: [PATCH 4/5] improving, raise message --- adafruit_si5351.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adafruit_si5351.py b/adafruit_si5351.py index cb8e5b9..76a857a 100644 --- a/adafruit_si5351.py +++ b/adafruit_si5351.py @@ -196,7 +196,7 @@ def configure_fractional(self, multiplier, numerator, denominator): if multiplier >= 91 or multiplier <= 14: raise Exception("Multiplier must be in range 14 to 91.") if denominator > 0xFFFFF or denominator <= 0: # Prevent divide by zero. - raise Exception("Denominator must be in range 0 to 0xFFFFF.") + raise Exception("Denominator must be greater than 0 and less than 0xFFFFF.") if numerator >= 0xFFFFF or numerator < 0: raise Exception("Numerator must be in range 0 to 0xFFFFF.") multiplier = int(multiplier) @@ -341,7 +341,7 @@ def configure_fractional(self, pll, divider, numerator, denominator): if divider >= 2049 or divider <= 3: raise Exception("Divider must be in range 3 to 2049.") if denominator > 0xFFFFF or denominator <= 0: # Prevent divide by zero. - raise Exception("Denominator must be in range 0 to 0xFFFFF.") + raise Exception("Denominator must be greater than 0 and less than 0xFFFFF.") if numerator >= 0xFFFFF or numerator < 0: raise Exception("Numerator must be in range 0 to 0xFFFFF.") divider = int(divider) From dcf6fc774a8e0edcc5281cb9918f5d529f51fa33 Mon Sep 17 00:00:00 2001 From: jposada202020 Date: Tue, 25 May 2021 12:27:27 -0400 Subject: [PATCH 5/5] running_black --- adafruit_si5351.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/adafruit_si5351.py b/adafruit_si5351.py index 76a857a..79cd7b6 100644 --- a/adafruit_si5351.py +++ b/adafruit_si5351.py @@ -196,7 +196,9 @@ def configure_fractional(self, multiplier, numerator, denominator): if multiplier >= 91 or multiplier <= 14: raise Exception("Multiplier must be in range 14 to 91.") if denominator > 0xFFFFF or denominator <= 0: # Prevent divide by zero. - raise Exception("Denominator must be greater than 0 and less than 0xFFFFF.") + raise Exception( + "Denominator must be greater than 0 and less than 0xFFFFF." + ) if numerator >= 0xFFFFF or numerator < 0: raise Exception("Numerator must be in range 0 to 0xFFFFF.") multiplier = int(multiplier) @@ -341,7 +343,9 @@ def configure_fractional(self, pll, divider, numerator, denominator): if divider >= 2049 or divider <= 3: raise Exception("Divider must be in range 3 to 2049.") if denominator > 0xFFFFF or denominator <= 0: # Prevent divide by zero. - raise Exception("Denominator must be greater than 0 and less than 0xFFFFF.") + raise Exception( + "Denominator must be greater than 0 and less than 0xFFFFF." + ) if numerator >= 0xFFFFF or numerator < 0: raise Exception("Numerator must be in range 0 to 0xFFFFF.") divider = int(divider)