From b07a038bc8f17afe9aa6bdde6b8ec929b1120945 Mon Sep 17 00:00:00 2001
From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com>
Date: Fri, 22 Sep 2023 14:15:50 +1000
Subject: [PATCH] Fix SPI inverted clock on ESP8266 (#5416)

---
 esphome/components/spi/spi.h           | 6 ++----
 esphome/components/spi/spi_arduino.cpp | 5 +++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/esphome/components/spi/spi.h b/esphome/components/spi/spi.h
index 2761c2d604..56aa746fc9 100644
--- a/esphome/components/spi/spi.h
+++ b/esphome/components/spi/spi.h
@@ -351,6 +351,7 @@ class SPIClient {
       : bit_order_(bit_order), mode_(mode), data_rate_(data_rate) {}
 
   virtual void spi_setup() {
+    esph_log_d("spi_device", "mode %u, data_rate %ukHz", (unsigned) this->mode_, (unsigned) (this->data_rate_ / 1000));
     this->delegate_ = this->parent_->register_device(this, this->mode_, this->bit_order_, this->data_rate_, this->cs_);
   }
 
@@ -398,10 +399,7 @@ class SPIDevice : public SPIClient {
 
   void set_data_rate(uint32_t data_rate) { this->data_rate_ = data_rate; }
 
-  void set_bit_order(SPIBitOrder order) {
-    this->bit_order_ = order;
-    esph_log_d("spi.h", "bit order set to %d", order);
-  }
+  void set_bit_order(SPIBitOrder order) { this->bit_order_ = order; }
 
   void set_mode(SPIMode mode) { this->mode_ = mode; }
 
diff --git a/esphome/components/spi/spi_arduino.cpp b/esphome/components/spi/spi_arduino.cpp
index 40ed9e6062..2e6b2d6064 100644
--- a/esphome/components/spi/spi_arduino.cpp
+++ b/esphome/components/spi/spi_arduino.cpp
@@ -15,6 +15,11 @@ class SPIDelegateHw : public SPIDelegate {
   void begin_transaction() override {
 #ifdef USE_RP2040
     SPISettings const settings(this->data_rate_, static_cast<BitOrder>(this->bit_order_), this->mode_);
+#elif defined(ESP8266)
+    // Arduino ESP8266 library has mangled values for SPI modes :-(
+    auto mode = (this->mode_ & 0x01) + ((this->mode_ & 0x02) << 3);
+    ESP_LOGV(TAG, "8266 mangled SPI mode 0x%X", mode);
+    SPISettings const settings(this->data_rate_, this->bit_order_, mode);
 #else
     SPISettings const settings(this->data_rate_, this->bit_order_, this->mode_);
 #endif