aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--klippy/mcu.py4
-rw-r--r--src/avr/gpio.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/klippy/mcu.py b/klippy/mcu.py
index b49c29cc..e50a6cb3 100644
--- a/klippy/mcu.py
+++ b/klippy/mcu.py
@@ -256,7 +256,6 @@ class MCU_pwm:
self._last_clock = clock
class MCU_adc:
- ADC_MAX = 1024 # 10bit adc
def __init__(self, mcu, pin):
self._mcu = mcu
self._oid = mcu.create_oid()
@@ -283,7 +282,8 @@ class MCU_adc:
minval = 0
if maxval is None:
maxval = 0xffff
- max_adc = sample_count * self.ADC_MAX
+ mcu_adc_max = float(self._mcu.serial.msgparser.config["ADC_MAX"])
+ max_adc = sample_count * mcu_adc_max
self._min_sample = int(minval * max_adc)
self._max_sample = min(0xffff, int(math.ceil(maxval * max_adc)))
self._inv_max_adc = 1.0 / max_adc
diff --git a/src/avr/gpio.c b/src/avr/gpio.c
index 3df6e9e8..69114f05 100644
--- a/src/avr/gpio.c
+++ b/src/avr/gpio.c
@@ -258,6 +258,8 @@ gpio_pwm_setup(uint8_t pin, uint32_t cycle_time, uint8_t val)
}
+DECL_CONSTANT(ADC_MAX, 1024);
+
struct gpio_adc
gpio_adc_setup(uint8_t pin)
{