expand frequency range on FOC from 500-2000 to 300-2000

Author: diglet48

device/focstim/fourphase_algorithm.py

@@ -9,9 +9,6 @@
 from device.focstim.constants_pb2 import AxisType
 from stim_math import limits
 
-FOC_MIN_FREQUENCY = 500
-FOC_MAX_FREQUENCY = 2000
-
 
 class FOCStimFourphaseAlgorithm(RemoteGenerationAlgorithm):
     def __init__(self, media: AbstractMediaSync, params: FourphaseFOCStimParams, safety_limits: SafetyParamsFOC):
@@ -42,10 +39,10 @@ def remap(value, min_value, max_value):
             np.clip(self.params.volume.inactivity.last_value(), 0, 1) * \
             np.clip(self.params.volume.external.last_value(), 0, 1)
 
-        maximum_frequency = np.clip(FOC_MAX_FREQUENCY,
+        maximum_frequency = np.clip(limits.CarrierFrequencyFOC.max,
                                     self.safety_limits.minimum_carrier_frequency,
                                     self.safety_limits.maximum_carrier_frequency)
-        minimum_frequency = np.clip(FOC_MIN_FREQUENCY,
+        minimum_frequency = np.clip(limits.CarrierFrequencyFOC.min,
                                     self.safety_limits.minimum_carrier_frequency,
                                     self.safety_limits.maximum_carrier_frequency)
         tau = self.params.tau.last_value() * 1e-6
@@ -65,7 +62,7 @@ def remap(value, min_value, max_value):
             AxisType.AXIS_POSITION_BETA: beta,
             AxisType.AXIS_POSITION_GAMMA: gamma,
             AxisType.AXIS_WAVEFORM_AMPLITUDE_AMPS: volume * volume * self.safety_limits.waveform_amplitude_amps,
-            AxisType.AXIS_CARRIER_FREQUENCY_HZ: self.params.carrier_frequency.interpolate(t),
+            AxisType.AXIS_CARRIER_FREQUENCY_HZ: carrier_frequency,
             AxisType.AXIS_PULSE_FREQUENCY_HZ: self.params.pulse_frequency.interpolate(t),
             AxisType.AXIS_PULSE_WIDTH_IN_CYCLES: self.params.pulse_width.interpolate(t),
             AxisType.AXIS_PULSE_RISE_TIME_CYCLES: self.params.pulse_rise_time.interpolate(t),

device/focstim/threephase_algorithm.py

@@ -9,9 +9,6 @@
 from device.focstim.constants_pb2 import AxisType
 from stim_math import limits
 
-FOC_MIN_FREQUENCY = 500
-FOC_MAX_FREQUENCY = 2000
-
 
 class FOCStimThreephaseAlgorithm(RemoteGenerationAlgorithm):
     def __init__(self, media: AbstractMediaSync, params: FOCStimParams, safety_limits: SafetyParamsFOC):
@@ -41,10 +38,10 @@ def remap(value, min_value, max_value):
             np.clip(self.params.volume.inactivity.last_value(), 0, 1) * \
             np.clip(self.params.volume.external.last_value(), 0, 1)
 
-        maximum_frequency = np.clip(FOC_MAX_FREQUENCY,
+        maximum_frequency = np.clip(limits.CarrierFrequencyFOC.max,
                                     self.safety_limits.minimum_carrier_frequency,
                                     self.safety_limits.maximum_carrier_frequency)
-        minimum_frequency = np.clip(FOC_MIN_FREQUENCY,
+        minimum_frequency = np.clip(limits.CarrierFrequencyFOC.min,
                                     self.safety_limits.minimum_carrier_frequency,
                                     self.safety_limits.maximum_carrier_frequency)
         tau = self.params.tau.last_value() * 1e-6
@@ -63,7 +60,7 @@ def remap(value, min_value, max_value):
             AxisType.AXIS_POSITION_ALPHA: alpha,
             AxisType.AXIS_POSITION_BETA: beta,
             AxisType.AXIS_WAVEFORM_AMPLITUDE_AMPS: volume * self.safety_limits.waveform_amplitude_amps,
-            AxisType.AXIS_CARRIER_FREQUENCY_HZ: self.params.carrier_frequency.interpolate(t),
+            AxisType.AXIS_CARRIER_FREQUENCY_HZ: carrier_frequency,
             AxisType.AXIS_PULSE_FREQUENCY_HZ: self.params.pulse_frequency.interpolate(t),
             AxisType.AXIS_PULSE_WIDTH_IN_CYCLES: self.params.pulse_width.interpolate(t),
             AxisType.AXIS_PULSE_RISE_TIME_CYCLES: self.params.pulse_rise_time.interpolate(t),

stim_math/limits.py

@@ -28,7 +28,7 @@ class PulseRiseTime:
 
 
 class CarrierFrequencyFOC:
-    min = 500   # Hz
+    min = 300   # Hz
     max = 2000
 
 class WaveformAmpltiudeFOC:

version.py

@@ -1 +1 @@
-VERSION = "v1.49"
+VERSION = "v1.50"