SPI component improvements for Zephyr

natelust · Dec 15, 2022 · 25d355c · 25d355c
1 parent a2f8e88
commit 25d355c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/esphome/components/spi/__init__.py b/esphome/components/spi/__init__.py
@@ -48,14 +48,15 @@ async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
-    clk = await cg.gpio_pin_expression(config[CONF_CLK_PIN])
-    cg.add(var.set_clk(clk))
-    if CONF_MISO_PIN in config:
-        miso = await cg.gpio_pin_expression(config[CONF_MISO_PIN])
-        cg.add(var.set_miso(miso))
-    if CONF_MOSI_PIN in config:
-        mosi = await cg.gpio_pin_expression(config[CONF_MOSI_PIN])
-        cg.add(var.set_mosi(mosi))
+    if not CORE.is_zephyr:
+        clk = await cg.gpio_pin_expression(config[CONF_CLK_PIN])
+        cg.add(var.set_clk(clk))
+        if CONF_MISO_PIN in config:
+            miso = await cg.gpio_pin_expression(config[CONF_MISO_PIN])
+            cg.add(var.set_miso(miso))
+        if CONF_MOSI_PIN in config:
+            mosi = await cg.gpio_pin_expression(config[CONF_MOSI_PIN])
+            cg.add(var.set_mosi(mosi))
 
     if CORE.is_esp32:
         cg.add_library("SPI", None)

diff --git a/esphome/components/spi/spi_zephyr.cpp b/esphome/components/spi/spi_zephyr.cpp
@@ -29,7 +29,7 @@ void SPIComponent::enable(GPIOPin *cs) {
         return;
     }
     this->config = new spi_config {
-        .frequency=DATA_RATE,
+        .frequency = DATA_RATE,
         .operation = SPI_OP_MODE_MASTER | SPI_WORD_SET(8) | SPI_LOCK_ON
     };
 
@@ -48,7 +48,6 @@ void SPIComponent::enable(GPIOPin *cs) {
 
 
     if (cs != nullptr) {
-        ESP_LOGI(TAG, "ENABLING GPIO");
         this->active_cs_ = cs;
         this->active_cs_->digital_write(false);
     }
@@ -111,7 +110,7 @@ void SPIComponent::transceive_(uint8_t * data, size_t length) {
             };
             name = "transfer";
             result = spi_transceive(device, config, &buffer, &read_buff);
-            if (result != 0) {
+            if (result == 0) {
                 memcpy(data, read_arr, length);
             }
             delete read_arr;