Add rc522 i2c (#1432)

* split to spi and i2c

* fix binary_sensor

* i2c comms ready

* fix rc522_spi binary sensor compat

* lint

* lint

* add test and codeowners

* fix refactor

esphome/components/rc522_i2c/__init__.py

@@ -0,0 +1,22 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c, rc522
+from esphome.const import CONF_ID
+
+CODEOWNERS = ['@glmnet']
+DEPENDENCIES = ['i2c']
+AUTO_LOAD = ['rc522']
+
+
+rc522_i2c_ns = cg.esphome_ns.namespace('rc522_i2c')
+RC522I2C = rc522_i2c_ns.class_('RC522I2C', rc522.RC522, i2c.I2CDevice)
+
+CONFIG_SCHEMA = cv.All(rc522.RC522_SCHEMA.extend({
+    cv.GenerateID(): cv.declare_id(RC522I2C),
+}).extend(i2c.i2c_device_schema(0x2c)))
+
+
+def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    yield rc522.setup_rc522(var, config)
+    yield i2c.register_i2c_device(var, config)

esphome/components/rc522_i2c/rc522_i2c.cpp

@@ -0,0 +1,99 @@
+#include "rc522_i2c.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace rc522_i2c {
+
+static const char *TAG = "rc522_i2c";
+
+void RC522I2C::dump_config() {
+  RC522::dump_config();
+  LOG_I2C_DEVICE(this);
+}
+
+/**
+ * Reads a uint8_t from the specified register in the MFRC522 chip.
+ * The interface is described in the datasheet section 8.1.2.
+ */
+uint8_t RC522I2C::pcd_read_register(PcdRegister reg  ///< The register to read from. One of the PCD_Register enums.
+) {
+  uint8_t value;
+  read_byte(reg >> 1, &value);
+  ESP_LOGVV(TAG, "read_register_(%x) -> %x", reg, value);
+  return value;
+}
+
+/**
+ * Reads a number of uint8_ts from the specified register in the MFRC522 chip.
+ * The interface is described in the datasheet section 8.1.2.
+ */
+void RC522I2C::pcd_read_register(PcdRegister reg,  ///< The register to read from. One of the PCD_Register enums.
+                                 uint8_t count,    ///< The number of uint8_ts to read
+                                 uint8_t *values,  ///< uint8_t array to store the values in.
+                                 uint8_t rx_align  ///< Only bit positions rxAlign..7 in values[0] are updated.
+) {
+  if (count == 0) {
+    return;
+  }
+
+  std::string buf;
+  buf = "Rx";
+  char cstrb[20];
+
+  uint8_t b = values[0];
+  read_bytes(reg >> 1, values, count);
+
+  if (rx_align)  // Only update bit positions rxAlign..7 in values[0]
+  {
+    // Create bit mask for bit positions rxAlign..7
+    uint8_t mask = 0xFF << rx_align;
+    // Apply mask to both current value of values[0] and the new data in values array.
+    values[0] = (b & ~mask) | (values[0] & mask);
+  }
+}
+
+void RC522I2C::pcd_write_register(PcdRegister reg,  ///< The register to write to. One of the PCD_Register enums.
+                                  uint8_t value     ///< The value to write.
+) {
+  this->write_byte(reg >> 1, value);
+}
+
+/**
+ * Writes a number of uint8_ts to the specified register in the MFRC522 chip.
+ * The interface is described in the datasheet section 8.1.2.
+ */
+void RC522I2C::pcd_write_register(PcdRegister reg,  ///< The register to write to. One of the PCD_Register enums.
+                                  uint8_t count,    ///< The number of uint8_ts to write to the register
+                                  uint8_t *values   ///< The values to write. uint8_t array.
+) {
+  write_bytes(reg >> 1, values, count);
+}
+
+// bool RC522I2C::write_data(const std::vector<uint8_t> &data) {
+// return this->write_bytes_raw(data.data(), data.size()); }
+
+// bool RC522I2C::read_data(std::vector<uint8_t> &data, uint8_t len) {
+//   delay(5);
+
+//   std::vector<uint8_t> ready;
+//   ready.resize(1);
+//   uint32_t start_time = millis();
+//   while (true) {
+//     if (this->read_bytes_raw(ready.data(), 1)) {
+//       if (ready[0] == 0x01)
+//         break;
+//     }
+
+//     if (millis() - start_time > 100) {
+//       ESP_LOGV(TAG, "Timed out waiting for readiness from RC522!");
+//       return false;
+//     }
+//   }
+
+//   data.resize(len + 1);
+//   this->read_bytes_raw(data.data(), len + 1);
+//   return true;
+// }
+
+}  // namespace rc522_i2c
+}  // namespace esphome

esphome/components/rc522_i2c/rc522_i2c.h

@@ -0,0 +1,42 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/rc522/rc522.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace rc522_i2c {
+
+class RC522I2C : public rc522::RC522, public i2c::I2CDevice {
+ public:
+  void dump_config() override;
+
+ protected:
+  uint8_t pcd_read_register(PcdRegister reg  ///< The register to read from. One of the PCD_Register enums.
+                            ) override;
+
+  /**
+   * Reads a number of uint8_ts from the specified register in the MFRC522 chip.
+   * The interface is described in the datasheet section 8.1.2.
+   */
+  void pcd_read_register(PcdRegister reg,  ///< The register to read from. One of the PCD_Register enums.
+                         uint8_t count,    ///< The number of uint8_ts to read
+                         uint8_t *values,  ///< uint8_t array to store the values in.
+                         uint8_t rx_align  ///< Only bit positions rxAlign..7 in values[0] are updated.
+                         ) override;
+  void pcd_write_register(PcdRegister reg,  ///< The register to write to. One of the PCD_Register enums.
+                          uint8_t value     ///< The value to write.
+                          ) override;
+
+  /**
+   * Writes a number of uint8_ts to the specified register in the MFRC522 chip.
+   * The interface is described in the datasheet section 8.1.2.
+   */
+  void pcd_write_register(PcdRegister reg,  ///< The register to write to. One of the PCD_Register enums.
+                          uint8_t count,    ///< The number of uint8_ts to write to the register
+                          uint8_t *values   ///< The values to write. uint8_t array.
+                          ) override;
+};
+
+}  // namespace rc522_i2c
+}  // namespace esphome