From 97eac2dea2a569db7e9fe7ad4f45c4b2f454c60c Mon Sep 17 00:00:00 2001
From: Mitch Bradley <wmb@firmworks.com>
Date: Thu, 10 Jun 2021 12:03:41 -1000
Subject: [PATCH] Removed cs pin from SDCard class

.. in favor of the one in the SPIBus class.
Per trello ticket
---
 Grbl_Esp32/src/MachineConfig.cpp | 8 ++++++++
 Grbl_Esp32/src/SDCard.cpp        | 3 +--
 Grbl_Esp32/src/SDCard.h          | 8 +-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Grbl_Esp32/src/MachineConfig.cpp b/Grbl_Esp32/src/MachineConfig.cpp
index 56b92473..df1ab658 100644
--- a/Grbl_Esp32/src/MachineConfig.cpp
+++ b/Grbl_Esp32/src/MachineConfig.cpp
@@ -436,6 +436,14 @@ void MachineConfig::afterParse() {
         _sdCard = new SDCard();
     }
 
+    if (_spi == nullptr) {
+        _spi = new SPIBus();
+    }
+
+    if (_i2so == nullptr) {
+        _i2so = new I2SOBus();
+    }
+
     if (_control == nullptr) {
         log_info("Control config missing; building default");
         _control = new Control();
diff --git a/Grbl_Esp32/src/SDCard.cpp b/Grbl_Esp32/src/SDCard.cpp
index a87342b3..548cfcc4 100644
--- a/Grbl_Esp32/src/SDCard.cpp
+++ b/Grbl_Esp32/src/SDCard.cpp
@@ -141,7 +141,7 @@ SDCard::State SDCard::get_state(bool refresh) {
     auto spiConfig = config->_spi;
 
     if (spiConfig != nullptr) {
-        auto ssPin   = _cs_pin.getNative(Pin::Capabilities::Output | Pin::Capabilities::Native);
+        auto ssPin   = spiConfig->_ss.getNative(Pin::Capabilities::Output | Pin::Capabilities::Native);
         auto mosiPin = spiConfig->_mosi.getNative(Pin::Capabilities::Output | Pin::Capabilities::Native);
         auto sckPin  = spiConfig->_sck.getNative(Pin::Capabilities::Output | Pin::Capabilities::Native);
         auto misoPin = spiConfig->_miso.getNative(Pin::Capabilities::Input | Pin::Capabilities::Native);
@@ -196,7 +196,6 @@ void SDCard::init() {
 
     if (init_message) {
         _cardDetect.report("SD Card Detect");
-        _cs_pin.report("SD SPI Chip Select");
         init_message = false;
     }
 
diff --git a/Grbl_Esp32/src/SDCard.h b/Grbl_Esp32/src/SDCard.h
index 87ab9661..5d9c171e 100644
--- a/Grbl_Esp32/src/SDCard.h
+++ b/Grbl_Esp32/src/SDCard.h
@@ -47,7 +47,6 @@ private:
 
     State _state;
     Pin   _cardDetect;
-    Pin   _cs_pin;
 
 public:
     bool                       _readyNext;
@@ -76,12 +75,7 @@ public:
     void init();
 
     // Configuration handlers.
-    void validate() const override { Assert(!_cs_pin.undefined(), "spi_cs pin should be configured."); }
-
-    void group(Configuration::HandlerBase& handler) override {
-        handler.item("card_detect", _cardDetect);
-        handler.item("spi_cs", _cs_pin);
-    }
+    void group(Configuration::HandlerBase& handler) override { handler.item("card_detect", _cardDetect); }
 
     ~SDCard();
 };