Merge remote-tracking branch 'upstream/master'

LynxCrew · Jul 2, 2024 · 7e6d2d4 · 7e6d2d4
2 parents dfc9c27 + 03a46ea
commit 7e6d2d4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/simulator/simulator/klippermock.py b/simulator/simulator/klippermock.py
@@ -64,7 +64,7 @@ def set_stepper_pos(self, pos):
         self.led_effect.handler.stepperPositions=[pos,pos,pos]
     def setup_pin(self, name, pin):
         return self
-    def setup_minmax(self, min, max):
+    def setup_adc_sample(self, min, max):
         pass
     def setup_adc_callback(self, time, adcCallback):
         pass

diff --git a/src/led_effect.py b/src/led_effect.py
@@ -388,9 +388,8 @@ def __init__(self, config):
         if self.analogPin:
             ppins = self.printer.lookup_object('pins')
             self.mcu_adc = ppins.setup_pin('adc', self.analogPin)
-            self.mcu_adc.setup_minmax(ANALOG_SAMPLE_TIME, ANALOG_SAMPLE_COUNT)
-            self.mcu_adc.setup_adc_callback(ANALOG_REPORT_TIME,
-                                            self.adcCallback)
+            self.mcu_adc.setup_adc_sample(ANALOG_SAMPLE_TIME, ANALOG_SAMPLE_COUNT)
+            self.mcu_adc.setup_adc_callback(ANALOG_REPORT_TIME, self.adcCallback)
             query_adc = self.printer.load_object(self.config, 'query_adc')
             query_adc.register_adc(self.name, self.mcu_adc)