Skip to content

Commit ad530a3

Browse files
committed
including_suggestions
1 parent 23f725b commit ad530a3

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

adafruit_si5351.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@ def configure_integer(self, multiplier):
172172
"""Configure the PLL with a simple integer multiplier for the most
173173
accurate (but more limited) PLL frequency generation.
174174
"""
175-
if multiplier > 91 or multiplier < 14:
176-
raise Exception("multiplier must be between 14 and 91")
175+
if multiplier >= 91 or multiplier <= 14:
176+
raise Exception("Multiplier must be in range 14 to 91.")
177177
multiplier = int(multiplier)
178178
# Compute register values and configure them.
179179
p1 = 128 * multiplier - 512
@@ -193,15 +193,15 @@ def configure_fractional(self, multiplier, numerator, denominator):
193193
multiplier and numerator/denominator. This is less accurate and
194194
susceptible to jitter but allows a larger range of PLL frequencies.
195195
"""
196-
if multiplier > 91 or multiplier < 14:
197-
raise Exception("multiplier must be between 14 and 91")
196+
if multiplier >= 91 or multiplier <= 14:
197+
raise Exception("Multiplier must be in range 14 to 91.")
198198
if denominator > 0xFFFFF or denominator <= 0: # Prevent divide by zero.
199199
raise Exception(
200-
"denominator must be greater than 0 and lower than 0xFFFFF"
200+
"Denominator must be in range 0 to 0xFFFFF."
201201
)
202-
if numerator > 0xFFFFF or numerator < 0:
202+
if numerator >= 0xFFFFF or numerator < 0:
203203
raise Exception(
204-
"numerator must be greater than 0 and lower than 0xFFFFF"
204+
"Numerator must be in range 0 to 0xFFFFF."
205205
)
206206
multiplier = int(multiplier)
207207
numerator = int(numerator)
@@ -288,7 +288,7 @@ def r_divider(self):
288288
@r_divider.setter
289289
def r_divider(self, divider):
290290
if divider > 7 or divider < 0:
291-
raise Exception("divider must be between 0 and 7")
291+
raise Exception("Divider must in range 0 to 7.")
292292
reg_value = self._si5351._read_u8(self._r)
293293
reg_value &= 0x0F
294294
divider &= 0x07
@@ -316,11 +316,11 @@ def configure_integer(self, pll, divider):
316316
frequency but supports less of a range of values.
317317
"""
318318
if divider >= 2049 or divider <= 3:
319-
raise Exception("divider must be between 3 and 2049")
319+
raise Exception("Divider must be in range 3 to 2049.")
320320
divider = int(divider)
321321
# Make sure the PLL is configured (has a frequency set).
322322
if pll.frequency is None:
323-
raise Exception("PLL must be configured")
323+
raise Exception("PLL must be configured.")
324324
# Compute MSx register values.
325325
p1 = 128 * divider - 512
326326
p2 = 0
@@ -343,21 +343,21 @@ def configure_fractional(self, pll, divider, numerator, denominator):
343343
accurate but has a wider range of output frequencies.
344344
"""
345345
if divider >= 2049 or divider <= 3:
346-
raise Exception("divider must be between 3 and 2049")
346+
raise Exception("Divider must be in range 3 to 2049.")
347347
if denominator > 0xFFFFF or denominator <= 0: # Prevent divide by zero.
348348
raise Exception(
349-
"denominator must be greater than 0 and lower than 0xFFFFF"
349+
"Denominator must be in range 0 to 0xFFFFF."
350350
)
351-
if numerator > 0xFFFFF or numerator < 0:
351+
if numerator >= 0xFFFFF or numerator < 0:
352352
raise Exception(
353-
"numerator must be greater than 0 and lower than 0xFFFFF"
353+
"Numerator must be in range 0 to 0xFFFFF."
354354
)
355355
divider = int(divider)
356356
numerator = int(numerator)
357357
denominator = int(denominator)
358358
# Make sure the PLL is configured (has a frequency set).
359359
if pll.frequency is None:
360-
raise Exception("PLL must be configured")
360+
raise Exception("PLL must be configured.")
361361
# Compute MSx register values.
362362
p1 = int(128 * divider + math.floor(128 * (numerator / denominator)) - 512)
363363
p2 = int(

0 commit comments

Comments
 (0)