adxl345: Fix read_axes_map() for non-adxl345 accelerometers

Commit 3f845019 unified the reading of the axes_map configuration
variable, but broke the per-sensor scaling capabilities.  Pass the
scale parameters to read_axes_map() so that it can be implemented
per-sensor.

Reported by @Neko-vecter.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

1 files changed, 4 insertions, 4 deletions

diff --git a/klippy/extras/adxl345.py b/klippy/extras/adxl345.py
index 5323be79..bbc9e32b 100644
--- a/klippy/extras/adxl345.py
+++ b/klippy/extras/adxl345.py
@@ -176,9 +176,9 @@ class AccelCommandHelper:
         self.chip.set_reg(reg, val)
 
 # Helper to read the axes_map parameter from the config
-def read_axes_map(config):
-    am = {'x': (0, SCALE_XY), 'y': (1, SCALE_XY), 'z': (2, SCALE_Z),
-          '-x': (0, -SCALE_XY), '-y': (1, -SCALE_XY), '-z': (2, -SCALE_Z)}
+def read_axes_map(config, scale_x, scale_y, scale_z):
+    am = {'x': (0, scale_x), 'y': (1, scale_y), 'z': (2, scale_z),
+          '-x': (0, -scale_x), '-y': (1, -scale_y), '-z': (2, -scale_z)}
     axes_map = config.getlist('axes_map', ('x','y','z'), count=3)
     if any([a not in am for a in axes_map]):
         raise config.error("Invalid axes_map parameter")
@@ -191,7 +191,7 @@ class ADXL345:
     def __init__(self, config):
         self.printer = config.get_printer()
         AccelCommandHelper(config, self)
-        self.axes_map = read_axes_map(config)
+        self.axes_map = read_axes_map(config, SCALE_XY, SCALE_XY, SCALE_Z)
         self.data_rate = config.getint('rate', 3200)
         if self.data_rate not in QUERY_RATES:
             raise config.error("Invalid rate parameter: %d" % (self.data_rate,))