@@ -180,7 +180,7 @@ def configure_integer(self, multiplier: int) -> None:
180
180
accurate (but more limited) PLL frequency generation.
181
181
"""
182
182
if multiplier >= 91 or multiplier <= 14 :
183
- raise Exception ("Multiplier must be in range 14 to 91." )
183
+ raise ValueError ("Multiplier must be in range 14 to 91." )
184
184
multiplier = int (multiplier )
185
185
# Compute register values and configure them.
186
186
p1 = 128 * multiplier - 512
@@ -203,13 +203,13 @@ def configure_fractional(
203
203
susceptible to jitter but allows a larger range of PLL frequencies.
204
204
"""
205
205
if multiplier >= 91 or multiplier <= 14 :
206
- raise Exception ("Multiplier must be in range 14 to 91." )
206
+ raise ValueError ("Multiplier must be in range 14 to 91." )
207
207
if denominator > 0xFFFFF or denominator <= 0 : # Prevent divide by zero.
208
- raise Exception (
208
+ raise ValueError (
209
209
"Denominator must be greater than 0 and less than 0xFFFFF."
210
210
)
211
211
if numerator >= 0xFFFFF or numerator < 0 :
212
- raise Exception ("Numerator must be in range 0 to 0xFFFFF." )
212
+ raise ValueError ("Numerator must be in range 0 to 0xFFFFF." )
213
213
multiplier = int (multiplier )
214
214
numerator = int (numerator )
215
215
denominator = int (denominator )
@@ -301,7 +301,7 @@ def r_divider(self) -> int:
301
301
@r_divider .setter
302
302
def r_divider (self , divider : int ) -> None :
303
303
if divider > 7 or divider < 0 :
304
- raise Exception ("Divider must in range 0 to 7." )
304
+ raise ValueError ("Divider must in range 0 to 7." )
305
305
reg_value = self ._si5351 ._read_u8 (self ._r )
306
306
reg_value &= 0x0F
307
307
divider &= 0x07
@@ -331,11 +331,11 @@ def configure_integer(
331
331
frequency but supports less of a range of values.
332
332
"""
333
333
if divider >= 2049 or divider <= 3 :
334
- raise Exception ("Divider must be in range 3 to 2049." )
334
+ raise ValueError ("Divider must be in range 3 to 2049." )
335
335
divider = int (divider )
336
336
# Make sure the PLL is configured (has a frequency set).
337
337
if pll .frequency is None :
338
- raise Exception ("PLL must be configured." )
338
+ raise RuntimeError ("PLL must be configured." )
339
339
# Compute MSx register values.
340
340
p1 = 128 * divider - 512
341
341
p2 = 0
@@ -370,19 +370,19 @@ def configure_fractional(
370
370
"""
371
371
# pylint: disable=too-many-arguments
372
372
if divider >= 2049 or divider <= 3 :
373
- raise Exception ("Divider must be in range 3 to 2049." )
373
+ raise ValueError ("Divider must be in range 3 to 2049." )
374
374
if denominator > 0xFFFFF or denominator <= 0 : # Prevent divide by zero.
375
- raise Exception (
375
+ raise ValueError (
376
376
"Denominator must be greater than 0 and less than 0xFFFFF."
377
377
)
378
378
if numerator >= 0xFFFFF or numerator < 0 :
379
- raise Exception ("Numerator must be in range 0 to 0xFFFFF." )
379
+ raise ValueError ("Numerator must be in range 0 to 0xFFFFF." )
380
380
divider = int (divider )
381
381
numerator = int (numerator )
382
382
denominator = int (denominator )
383
383
# Make sure the PLL is configured (has a frequency set).
384
384
if pll .frequency is None :
385
- raise Exception ("PLL must be configured." )
385
+ raise RuntimeError ("PLL must be configured." )
386
386
# Compute MSx register values.
387
387
p1 = int (128 * divider + math .floor (128 * (numerator / denominator )) - 512 )
388
388
p2 = int (
0 commit comments