Allen-Synthesis · awonak · Dec 1, 2022 · Oct 1, 2022 · Oct 2, 2022 · Oct 12, 2022
diff --git a/software/contrib/bernoulli_gates.py b/software/contrib/bernoulli_gates.py
@@ -154,9 +154,6 @@ def regular_maneuver(self):
 
 class BernoulliGates(EuroPiScript):
     def __init__(self):
-        # Overclock the Pico for improved performance.
-        machine.freq(250_000_000)
-
         self.toss_flg = 0
         self.first_gate = SingleBernoulliGate(control_knob =  k1,
                                               control_port = ain,

diff --git a/software/contrib/coin_toss.py b/software/contrib/coin_toss.py
@@ -20,11 +20,6 @@ def __init__(self):
         self._tempo = 0
         self._deadline = 0
 
-        # Overclock the Pico for improved performance.
-        machine.freq(250_000_000)
-        # machine.freq(125_000_000)  # Default clock speed.
-
-
         @b1.handler
         def toggle_clock():
             """Toggle between internal clock and external clock from digital in."""

diff --git a/software/contrib/consequencer.py b/software/contrib/consequencer.py
@@ -38,9 +38,6 @@
 
 class Consequencer(EuroPiScript):
     def __init__(self):
-        # Overclock the Pico for improved performance.
-        machine.freq(250_000_000)
-
         # Initialize sequencer pattern arrays   
         p = pattern()     
         self.BD=p.BD

diff --git a/software/contrib/cvecorder.py b/software/contrib/cvecorder.py
@@ -40,9 +40,6 @@ def __init__(self):
         # Needed if using europi_script
         super().__init__()
 
-        # Overclock the Pico for improved performance.
-        machine.freq(250_000_000)
-
         # Micropython heap fragmentation notes:
         # - The pico has very limited memory and in some cases needs to be managed carefully
         # - In some cases you can get a MemoryError even if there is enough free memory, this is because micropython could not find enough contiguous memory because the heap has become fragmented

diff --git a/software/contrib/hamlet.py b/software/contrib/hamlet.py
@@ -42,9 +42,6 @@ def __init__(self):
         self.gate_2 = cv4
         self.cv_2 = cv5
 
-        # Overclock the Pico for improved performance.
-        machine.freq(250_000_000)
-
         # Initialize sequencer pattern arrays   
         p = pattern()     
         self.BD=p.BD

diff --git a/software/contrib/harmonic_lfos.py b/software/contrib/harmonic_lfos.py
@@ -15,9 +15,6 @@ def __init__(self):
         #Retreive saved state information from file
         state = self.load_state_json()
 
-        #Overclock the Pico for improved performance
-        freq(250_000_000)
-
         #Use the saved values for the LFO divisions and mode if found in the save state file, using defaults if not
         self.divisions = state.get("divisions", [1, 3, 5, 7, 11, 13])
         self.modes = state.get("modes", [0, 0, 0, 0, 0, 0])

diff --git a/software/contrib/noddy_holder.py b/software/contrib/noddy_holder.py
@@ -46,9 +46,6 @@
 
 class NoddyHolder(EuroPiScript):
     def __init__(self):
-        # Overclock the Pico for improved performance.
-        machine.freq(250_000_000)
-
         self.gate = False
         # Keep track of values for display, S&H and T&H for each
         # channel

diff --git a/software/contrib/poly_square.py b/software/contrib/poly_square.py
@@ -102,8 +102,6 @@ def __init__(self, k1, k2):
 
 class PolySquare(EuroPiScript):
     def __init__(self):
-        # Settings for improved performance
-        machine.freq(250_000_000)
         k1.set_samples(256)
         k2.set_samples(256)        
         # PIO settings

diff --git a/software/contrib/polyrhythmic_sequencer.py b/software/contrib/polyrhythmic_sequencer.py
@@ -139,8 +139,6 @@ class PolyrhythmSeq(EuroPiScript):
 
     def __init__(self):
         super().__init__()
-        # Overclock the Pico for improved performance.
-        machine.freq(250000000)
 
         # Configure EuroPi options to improve performance.
         b2.debounce_delay = 200

diff --git a/software/contrib/probapoly.py b/software/contrib/probapoly.py
@@ -37,9 +37,6 @@ def __init__(self):
         # Needed if using europi_script
         super().__init__()
 
-        # Overclock the Pico for improved performance.
-        machine.freq(250_000_000)
-
         # Variables
         self.step = 1
         self.clockStep = 0

diff --git a/software/contrib/strange_attractor.py b/software/contrib/strange_attractor.py
@@ -236,9 +236,6 @@ def get_attractors():
 class StrangeAttractor(EuroPiScript):
     def __init__(self):
 
-        # Overclock the Pico for improved performance.
-        machine.freq(250_000_000)
-
         # Initialise and calculate ranges.
         # This will take around 30 seconds per unsaved attractor.
         self.attractors = get_attractors()

diff --git a/software/firmware/calibrate.py b/software/firmware/calibrate.py
@@ -11,9 +11,6 @@ def display_name(cls):
         return "~Calibrate"
 
     def main(self):
-        # Overclock for faster calibration
-        freq(250_000_000)
-
         ain = ADC(Pin(26, Pin.IN, Pin.PULL_DOWN))
         cv1 = PWM(Pin(21))
         usb = Pin(24, Pin.IN)

diff --git a/software/firmware/europi.py b/software/firmware/europi.py
@@ -21,6 +21,12 @@
 from machine import PWM
 from machine import Pin
 
+# Overclock the Pico for improved performance.
+from machine import freq
+
+freq(250_000_000)
+# freq(125_000_000)  # Default clock speed.
+
 from ssd1306 import SSD1306_I2C
 
 from version import __version__
@@ -68,6 +74,9 @@
 MIN_OUTPUT_VOLTAGE = 0
 MAX_OUTPUT_VOLTAGE = 10
 
+# PWM Frequency
+PWM_FREQ = 2_500_000
+
 # Default font is 8x8 pixel monospaced font.
 CHAR_WIDTH = 8
 CHAR_HEIGHT = 8
@@ -470,7 +479,7 @@ class Output:
     def __init__(self, pin, min_voltage=MIN_OUTPUT_VOLTAGE, max_voltage=MAX_OUTPUT_VOLTAGE):
         self.pin = PWM(Pin(pin))
         # Set freq to 1kHz as the default is too low and creates audible PWM 'hum'.
-        self.pin.freq(100_000)
+        self.pin.freq(PWM_FREQ)
         self._duty = 0
         self.MIN_VOLTAGE = min_voltage
         self.MAX_VOLTAGE = max_voltage