i2ccmds: Pass the i2c address as a 7-bit number (0-127)

The sam3 i2c code and the linux code use a 7-bit i2c address, while
the avr, lpc176x, and samd21 i2c code uses an 8-bit address with the
least significant bit always zero.  A similar issue occurred in the
host code (sx1509.py and replicape.py use 7-bit addresses while
uc1701.py and mcp4451.py use 8-bit addresses).

Consistently use 7-bit addresses in all the code.  This breaks
compatibility between host and mcu software, so make a change to the
config_i2c command to force users to synchronize software updates.
This also breaks common Smoothieboard configs, so update the mcp4451
code to validate the i2c_address.

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

4 files changed, 16 insertions, 8 deletions

diff --git a/klippy/extras/bus.py b/klippy/extras/bus.py
index 6df95ee5..2808d6fe 100644
--- a/klippy/extras/bus.py
+++ b/klippy/extras/bus.py
@@ -83,9 +83,11 @@ def MCU_SPI_from_config(config, mode, pin_option="cs_pin",
 class MCU_I2C:
     def __init__(self, mcu, bus, addr, speed):
         self.mcu = mcu
+        self.i2c_address = addr
         self.oid = self.mcu.create_oid()
-        self.mcu.add_config_cmd("config_i2c oid=%d bus=%d rate=%d addr=%d" % (
-            self.oid, bus, speed, addr))
+        self.mcu.add_config_cmd(
+            "config_i2c oid=%d bus=%d rate=%d address=%d" % (
+                self.oid, bus, speed, addr))
         self.cmd_queue = self.mcu.alloc_command_queue()
         self.mcu.register_config_callback(self.build_config)
         self.i2c_write_cmd = self.i2c_read_cmd = self.i2c_modify_bits_cmd = None
@@ -93,6 +95,8 @@ class MCU_I2C:
         return self.oid
     def get_mcu(self):
         return self.mcu
+    def get_i2c_address(self):
+        return self.i2c_address
     def get_command_queue(self):
         return self.cmd_queue
     def build_config(self):
@@ -136,8 +140,8 @@ def MCU_I2C_from_config(config, default_addr=None, default_speed=100000):
     speed = config.getint('i2c_speed', default_speed, minval=100000)
     bus = config.getint('i2c_bus', 0, minval=0)
     if default_addr is None:
-        addr = config.getint('i2c_address')
+        addr = config.getint('i2c_address', minval=0, maxval=127)
     else:
-        addr = config.getint('i2c_address', default_addr)
+        addr = config.getint('i2c_address', default_addr, minval=0, maxval=127)
     # Create MCU_I2C object
     return MCU_I2C(i2c_mcu, bus, addr, speed)
diff --git a/klippy/extras/display/uc1701.py b/klippy/extras/display/uc1701.py
index 86366b4f..4f98896b 100644
--- a/klippy/extras/display/uc1701.py
+++ b/klippy/extras/display/uc1701.py
@@ -177,11 +177,11 @@ class UC1701(DisplayBase):
         logging.info("uc1701 initialized")
 
 # The SSD1306 supports both i2c and "4-wire" spi
-class SSD1306(UC1701):
+class SSD1306(DisplayBase):
     def __init__(self, config):
         cs_pin = config.get("cs_pin", None)
         if cs_pin is None:
-            io = I2C(config, 120)
+            io = I2C(config, 60)
         else:
             io = SPI4wire(config, "dc_pin")
         DisplayBase.__init__(self, io)
diff --git a/klippy/extras/mcp4451.py b/klippy/extras/mcp4451.py
index ddf322b1..d8b798e4 100644
--- a/klippy/extras/mcp4451.py
+++ b/klippy/extras/mcp4451.py
@@ -10,6 +10,9 @@ WiperRegisters = [0x00, 0x01, 0x06, 0x07]
 class mcp4451:
     def __init__(self, config):
         self.i2c = bus.MCU_I2C_from_config(config)
+        i2c_addr = self.i2c.get_i2c_address()
+        if i2c_addr < 44 or i2c_addr > 47:
+            raise config.error("mcp4451 address must be between 44 and 47")
         scale = config.getfloat('scale', 1., above=0.)
         # Configure registers
         self.set_register(0x04, 0xff)
diff --git a/klippy/extras/sx1509.py b/klippy/extras/sx1509.py
index 0fe44ce0..40ec2dd9 100644
--- a/klippy/extras/sx1509.py
+++ b/klippy/extras/sx1509.py
@@ -41,8 +41,9 @@ class SX1509(object):
                          REG_INPUT_DISABLE : 0, REG_ANALOG_DRIVER_ENABLE : 0}
         self.reg_i_on_dict = {reg : 0 for reg in REG_I_ON}
     def _build_config(self):
-        self._mcu.add_config_cmd("config_i2c oid=%d bus=%d rate=%d addr=%d" % (
-            self._oid, self._bus, self._freq, self._chip_address))
+        self._mcu.add_config_cmd(
+            "config_i2c oid=%d bus=%d rate=%d address=%d" % (
+                self._oid, self._bus, self._freq, self._chip_address))
         # Reset the chip
         self._mcu.add_config_cmd("i2c_write oid=%d data=%02x%02x" % (
             self._oid, REG_RESET, 0x12))