mcp4451: Use bus.py helper code for i2c

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

1 files changed, 10 insertions, 22 deletions

diff --git a/klippy/extras/mcp4451.py b/klippy/extras/mcp4451.py
index 9a79671b..2fe82494 100644
--- a/klippy/extras/mcp4451.py
+++ b/klippy/extras/mcp4451.py
@@ -3,37 +3,25 @@
 # Copyright (C) 2018  Kevin O'Connor <kevin@koconnor.net>
 #
 # This file may be distributed under the terms of the GNU GPLv3 license.
-import mcu
+import mcu, bus
 
 WiperRegisters = [0x00, 0x01, 0x06, 0x07]
 
 class mcp4451:
     def __init__(self, config):
-        printer = config.get_printer()
-        # Read config parameters
-        self.mcu = mcu.get_printer_mcu(printer, config.get('mcu', 'mcu'))
-        i2c_addr = config.getint('i2c_address')
+        self.i2c = bus.MCU_I2C_from_config(config)
         scale = config.getfloat('scale', 1., above=0.)
-        wipers = [None]*4
-        for i in range(len(wipers)):
+        # Configure registers
+        self.set_register(0x04, 0xff)
+        self.set_register(0x0a, 0xff)
+        for i in range(4):
             val = config.getfloat('wiper_%d' % (i,), None,
                                   minval=0., maxval=scale)
             if val is not None:
-                wipers[i] = int(val * 255. / scale + .5)
-        # Setup i2c
-        self.oid = self.mcu.create_oid()
-        self.mcu.add_config_cmd(
-            "config_i2c oid=%d bus=0 rate=100000 addr=%d" % (
-                self.oid, i2c_addr))
-        # Configure registers
-        self.add_config_cmd(0x04, 0xff)
-        self.add_config_cmd(0x0a, 0xff)
-        for reg, val in zip(WiperRegisters, wipers):
-            if val is not None:
-                self.add_config_cmd(reg, val)
-    def add_config_cmd(self, reg, val):
-        self.mcu.add_config_cmd("i2c_write oid=%d data=%02x%02x" % (
-            self.oid, (reg << 4) | ((val >> 8) & 0x03), val), is_init=True)
+                val = int(val * 255. / scale + .5)
+                self.set_register(WiperRegisters[i], val)
+    def set_register(self, reg, value):
+        self.i2c.i2c_write([(reg << 4) | ((value >> 8) & 0x03), value])
 
 def load_config_prefix(config):
     return mcp4451(config)