Add Support for W5500 SPI Ethernet Controller

include/ETHSPI.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#include <Arduino.h>
+#include <esp_netif.h>
+
+class ETHSPIClass
+{
+private:
+    esp_eth_handle_t eth_handle;
+    esp_netif_t *eth_netif;
+
+public:
+    ETHSPIClass();
+
+    void begin(int8_t pin_sclk, int8_t pin_mosi, int8_t pin_miso, int8_t pin_cs, int8_t pin_int, int8_t pin_rst);
+    String macAddress();
+};
+
+extern ETHSPIClass ETHSPI;

include/NetworkSettings.h

@@ -83,6 +83,7 @@ class NetworkSettingsClass {
     bool _ethConnected = false;
     std::vector<NetworkEventCbList_t> _cbEventList;
     bool _lastMdnsEnabled = false;
+    bool _spiEth = false;
 };
 
-extern NetworkSettingsClass NetworkSettings;
+extern NetworkSettingsClass NetworkSettings;

include/PinMapping.h

@@ -26,6 +26,13 @@ struct PinMapping_t {
     int8_t cmt_gpio3;
     int8_t cmt_sdio;
 
+    int8_t w5500_sclk;
+    int8_t w5500_mosi;
+    int8_t w5500_miso;
+    int8_t w5500_cs;
+    int8_t w5500_int;
+    int8_t w5500_rst;
+
     int8_t eth_phy_addr;
     bool eth_enabled;
     int eth_power;
@@ -49,10 +56,11 @@ class PinMappingClass {
 
     bool isValidNrf24Config() const;
     bool isValidCmt2300Config() const;
+    bool isValidW5500Config() const;
     bool isValidEthConfig() const;
 
 private:
     PinMapping_t _pinMapping;
 };
 
-extern PinMappingClass PinMapping;
+extern PinMappingClass PinMapping;

lib/CMT2300a/cmt2300a_hal.c → lib/CMT2300a/cmt2300a_hal.cpp

@@ -1,76 +1,82 @@
-/*
- * THE FOLLOWING FIRMWARE IS PROVIDED: (1) "AS IS" WITH NO WARRANTY; AND
- * (2)TO ENABLE ACCESS TO CODING INFORMATION TO GUIDE AND FACILITATE CUSTOMER.
- * CONSEQUENTLY, CMOSTEK SHALL NOT BE HELD LIABLE FOR ANY DIRECT, INDIRECT OR
- * CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE CONTENT
- * OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING INFORMATION
- * CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
- *
- * Copyright (C) CMOSTEK SZ.
- */
-
-/*!
- * @file    cmt2300a_hal.c
- * @brief   CMT2300A hardware abstraction layer
- *
- * @version 1.2
- * @date    Jul 17 2017
- * @author  CMOSTEK R@D
- */
-
-#include "cmt2300a_hal.h"
-#include "cmt_spi3.h"
-#include <Arduino.h>
-
-/*! ********************************************************
- * @name    CMT2300A_InitSpi
- * @desc    Initializes the CMT2300A SPI interface.
- * *********************************************************/
-void CMT2300A_InitSpi(int8_t pin_sdio, int8_t pin_clk, int8_t pin_cs, int8_t pin_fcs, uint32_t spi_speed)
-{
-    cmt_spi3_init(pin_sdio, pin_clk, pin_cs, pin_fcs, spi_speed);
-}
-
-/*! ********************************************************
- * @name    CMT2300A_ReadReg
- * @desc    Read the CMT2300A register at the specified address.
- * @param   addr: register address
- * @return  Register value
- * *********************************************************/
-uint8_t CMT2300A_ReadReg(uint8_t addr)
-{
-    return cmt_spi3_read(addr);
-}
-
-/*! ********************************************************
- * @name    CMT2300A_WriteReg
- * @desc    Write the CMT2300A register at the specified address.
- * @param   addr: register address
- *          dat: register value
- * *********************************************************/
-void CMT2300A_WriteReg(uint8_t addr, uint8_t dat)
-{
-    cmt_spi3_write(addr, dat);
-}
-
-/*! ********************************************************
- * @name    CMT2300A_ReadFifo
- * @desc    Reads the contents of the CMT2300A FIFO.
- * @param   buf: buffer where to copy the FIFO read data
- *          len: number of bytes to be read from the FIFO
- * *********************************************************/
-void CMT2300A_ReadFifo(uint8_t buf[], uint16_t len)
-{
-    cmt_spi3_read_fifo(buf, len);
-}
-
-/*! ********************************************************
- * @name    CMT2300A_WriteFifo
- * @desc    Writes the buffer contents to the CMT2300A FIFO.
- * @param   buf: buffer containing data to be put on the FIFO
- *          len: number of bytes to be written to the FIFO
- * *********************************************************/
-void CMT2300A_WriteFifo(const uint8_t buf[], uint16_t len)
-{
-    cmt_spi3_write_fifo(buf, len);
-}
+/*
+ * THE FOLLOWING FIRMWARE IS PROVIDED: (1) "AS IS" WITH NO WARRANTY; AND
+ * (2)TO ENABLE ACCESS TO CODING INFORMATION TO GUIDE AND FACILITATE CUSTOMER.
+ * CONSEQUENTLY, CMOSTEK SHALL NOT BE HELD LIABLE FOR ANY DIRECT, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE CONTENT
+ * OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING INFORMATION
+ * CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
+ *
+ * Copyright (C) CMOSTEK SZ.
+ */
+
+/*!
+ * @file    cmt2300a_hal.c
+ * @brief   CMT2300A hardware abstraction layer
+ *
+ * @version 1.2
+ * @date    Jul 17 2017
+ * @author  CMOSTEK R@D
+ */
+
+#include "cmt2300a_hal.h"
+#include "cmt_hal.h"
+
+static cmt_hal hal;
+
+/*! ********************************************************
+ * @name    CMT2300A_InitSpi
+ * @desc    Initializes the CMT2300A SPI interface.
+ * *********************************************************/
+void CMT2300A_InitSpi(int8_t pin_sdio, int8_t pin_clk, int8_t pin_cs, int8_t pin_fcs)
+{
+    hal.init(
+        static_cast<gpio_num_t>(pin_sdio),
+        static_cast<gpio_num_t>(pin_clk),
+        static_cast<gpio_num_t>(pin_cs),
+        static_cast<gpio_num_t>(pin_fcs)
+    );
+}
+
+/*! ********************************************************
+ * @name    CMT2300A_ReadReg
+ * @desc    Read the CMT2300A register at the specified address.
+ * @param   addr: register address
+ * @return  Register value
+ * *********************************************************/
+uint8_t CMT2300A_ReadReg(uint8_t addr)
+{
+    return hal.read_reg(addr);
+}
+
+/*! ********************************************************
+ * @name    CMT2300A_WriteReg
+ * @desc    Write the CMT2300A register at the specified address.
+ * @param   addr: register address
+ *          dat: register value
+ * *********************************************************/
+void CMT2300A_WriteReg(uint8_t addr, uint8_t dat)
+{
+    hal.write_reg(addr, dat);
+}
+
+/*! ********************************************************
+ * @name    CMT2300A_ReadFifo
+ * @desc    Reads the contents of the CMT2300A FIFO.
+ * @param   buf: buffer where to copy the FIFO read data
+ *          len: number of bytes to be read from the FIFO
+ * *********************************************************/
+void CMT2300A_ReadFifo(uint8_t buf[], uint16_t len)
+{
+    hal.read_fifo(buf, len);
+}
+
+/*! ********************************************************
+ * @name    CMT2300A_WriteFifo
+ * @desc    Writes the buffer contents to the CMT2300A FIFO.
+ * @param   buf: buffer containing data to be put on the FIFO
+ *          len: number of bytes to be written to the FIFO
+ * *********************************************************/
+void CMT2300A_WriteFifo(const uint8_t buf[], uint16_t len)
+{
+    hal.write_fifo(buf, len);
+}

lib/CMT2300a/cmt2300a_hal.h

@@ -36,7 +36,7 @@ extern "C" {
 #define CMT2300A_GetTickCount() millis()
 /* ************************************************************************ */
 
-void CMT2300A_InitSpi(int8_t pin_sdio, int8_t pin_clk, int8_t pin_cs, int8_t pin_fcs, uint32_t spi_speed);
+void CMT2300A_InitSpi(int8_t pin_sdio, int8_t pin_clk, int8_t pin_cs, int8_t pin_fcs);
 
 uint8_t CMT2300A_ReadReg(uint8_t addr);
 void CMT2300A_WriteReg(uint8_t addr, uint8_t dat);

lib/CMT2300a/cmt2300wrapper.cpp

@@ -6,13 +6,12 @@
 #include "cmt2300a.h"
 #include "cmt2300a_params.h"
 
-CMT2300A::CMT2300A(uint8_t pin_sdio, uint8_t pin_clk, uint8_t pin_cs, uint8_t pin_fcs, uint32_t spi_speed)
+CMT2300A::CMT2300A(uint8_t pin_sdio, uint8_t pin_clk, uint8_t pin_cs, uint8_t pin_fcs)
 {
     _pin_sdio = pin_sdio;
     _pin_clk = pin_clk;
     _pin_cs = pin_cs;
     _pin_fcs = pin_fcs;
-    _spi_speed = spi_speed;
 }
 
 bool CMT2300A::begin(void)
@@ -249,7 +248,7 @@ void CMT2300A::flush_rx(void)
 
 bool CMT2300A::_init_pins()
 {
-    CMT2300A_InitSpi(_pin_sdio, _pin_clk, _pin_cs, _pin_fcs, _spi_speed);
+    CMT2300A_InitSpi(_pin_sdio, _pin_clk, _pin_cs, _pin_fcs);
 
     return true; // assuming pins are connected properly
 }

lib/CMT2300a/cmt2300wrapper.h

@@ -6,11 +6,10 @@
 #define CMT2300A_ONE_STEP_SIZE 2500 // frequency channel step size for fast frequency hopping operation: One step size is 2.5 kHz.
 #define CMT_BASE_FREQ 860000000 // from Frequency Bank in cmt2300a_params.h
 #define FH_OFFSET 100 // value * CMT2300A_ONE_STEP_SIZE = channel frequency offset
-#define CMT_SPI_SPEED 4000000 // 4 MHz
 
 class CMT2300A {
 public:
-    CMT2300A(uint8_t pin_sdio, uint8_t pin_clk, uint8_t pin_cs, uint8_t pin_fcs, uint32_t _spi_speed = CMT_SPI_SPEED);
+    CMT2300A(uint8_t pin_sdio, uint8_t pin_clk, uint8_t pin_cs, uint8_t pin_fcs);
 
     bool begin(void);
 
@@ -108,5 +107,4 @@ class CMT2300A {
     int8_t _pin_clk;
     int8_t _pin_cs;
     int8_t _pin_fcs;
-    uint32_t _spi_speed;
 };