Skip to content

Commit bebdf7f

Browse files
committed
Move values from config options to cmake options
1 parent 11b9bc0 commit bebdf7f

File tree

2 files changed

+49
-8
lines changed

2 files changed

+49
-8
lines changed

targets/ESP32/CMakePresets.json

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,14 @@
538538
"NF_FEATURE_HAS_SDCARD": "ON",
539539
"ESP32_ETHERNET_SUPPORT": "ON",
540540
"ESP32_ETHERNET_INTERFACE": "W5500",
541+
"ESP32_ETHERNET_SPI_HOST": "HSPI_HOST",
542+
"ESP32_ETHERNET_SPI_CLOCK_MHZ": "20",
543+
"ESP32_ETHERNET_SPI_CS": "26",
544+
"ESP32_ETHERNET_SPI_INT_GPIO": "34",
541545
"ETH_PHY_RST_GPIO": "13",
546+
"ESP32_ETHERNET_SPI_MISO_GPIO": "19",
547+
"ESP32_ETHERNET_SPI_MOSI_GPIO": "23",
548+
"ESP32_ETHERNET_SPI_SCLK_GPIO": "18",
542549
"API_nanoFramework.Device.OneWire": "ON",
543550
"API_nanoFramework.Device.Bluetooth": "ON",
544551
"API_nanoFramework.Graphics": "ON",
@@ -635,7 +642,14 @@
635642
"NF_FEATURE_RTC": "ON",
636643
"NF_FEATURE_HAS_SDCARD": "ON",
637644
"ESP32_ETHERNET_SUPPORT": "ON",
645+
"ESP32_ETHERNET_SPI_HOST": "SPI2_HOST",
646+
"ESP32_ETHERNET_SPI_CLOCK_MHZ": "8",
647+
"ESP32_ETHERNET_SPI_CS": "5",
648+
"ESP32_ETHERNET_SPI_INT_GPIO": "16",
638649
"ETH_PHY_RST_GPIO": "5",
650+
"ESP32_ETHERNET_SPI_MISO_GPIO": "23",
651+
"ESP32_ETHERNET_SPI_MOSI_GPIO": "18",
652+
"ESP32_ETHERNET_SPI_SCLK_GPIO": "19",
639653
"ETH_RMII_CLK_OUT_GPIO": "17",
640654
"API_System.Device.I2c.Slave": "OFF",
641655
"API_nanoFramework.Device.OneWire": "ON"
@@ -657,7 +671,14 @@
657671
"NF_FEATURE_RTC": "ON",
658672
"NF_FEATURE_HAS_SDCARD": "ON",
659673
"ESP32_ETHERNET_SUPPORT": "ON",
674+
"ESP32_ETHERNET_SPI_HOST": "SPI2_HOST",
675+
"ESP32_ETHERNET_SPI_CLOCK_MHZ": "8",
676+
"ESP32_ETHERNET_SPI_CS": "5",
677+
"ESP32_ETHERNET_SPI_INT_GPIO": "16",
660678
"ETH_PHY_RST_GPIO": "12",
679+
"ESP32_ETHERNET_SPI_MISO_GPIO": "23",
680+
"ESP32_ETHERNET_SPI_MOSI_GPIO": "18",
681+
"ESP32_ETHERNET_SPI_SCLK_GPIO": "19",
661682
"ETH_RMII_CLK_OUT_GPIO": "17",
662683
"API_nanoFramework.Device.OneWire": "ON",
663684
"API_System.Device.I2c.Slave": "OFF"
@@ -681,7 +702,14 @@
681702
"API_nanoFramework.Device.OneWire": "ON",
682703
"API_System.Device.I2c.Slave": "ON",
683704
"ESP32_ETHERNET_SUPPORT": "ON",
705+
"ESP32_ETHERNET_SPI_HOST": "SPI2_HOST",
706+
"ESP32_ETHERNET_SPI_CLOCK_MHZ": "8",
707+
"ESP32_ETHERNET_SPI_CS": "5",
708+
"ESP32_ETHERNET_SPI_INT_GPIO": "16",
684709
"ETH_PHY_RST_GPIO": "12",
710+
"ESP32_ETHERNET_SPI_MISO_GPIO": "23",
711+
"ESP32_ETHERNET_SPI_MOSI_GPIO": "18",
712+
"ESP32_ETHERNET_SPI_SCLK_GPIO": "19",
685713
"ETH_RMII_CLK_OUT_GPIO": "00"
686714
}
687715
},
@@ -753,7 +781,14 @@
753781
"NF_FEATURE_HAS_SDCARD": "ON",
754782
"ESP32_ETHERNET_SUPPORT": "ON",
755783
"ESP32_ETHERNET_INTERFACE": "IP101",
784+
"ESP32_ETHERNET_SPI_HOST": "SPI2_HOST",
785+
"ESP32_ETHERNET_SPI_CLOCK_MHZ": "8",
786+
"ESP32_ETHERNET_SPI_CS": "5",
787+
"ESP32_ETHERNET_SPI_INT_GPIO": "16",
756788
"ETH_PHY_RST_GPIO": "5",
789+
"ESP32_ETHERNET_SPI_MISO_GPIO": "23",
790+
"ESP32_ETHERNET_SPI_MOSI_GPIO": "18",
791+
"ESP32_ETHERNET_SPI_SCLK_GPIO": "19",
757792
"ETH_RMII_CLK_IN_GPIO": "0",
758793
"ETH_PHY_ADDR": "1",
759794
"API_nanoFramework.Device.OneWire": "ON",
@@ -779,7 +814,14 @@
779814
"ESP32_ETHERNET_SUPPORT": "ON",
780815
"ETH_RMII_CLK_IN_GPIO": "0",
781816
"ETH_PHY_ADDR": "1",
817+
"ESP32_ETHERNET_SPI_HOST": "SPI2_HOST",
818+
"ESP32_ETHERNET_SPI_CLOCK_MHZ": "8",
819+
"ESP32_ETHERNET_SPI_CS": "5",
820+
"ESP32_ETHERNET_SPI_INT_GPIO": "16",
782821
"ETH_PHY_RST_GPIO": "16",
822+
"ESP32_ETHERNET_SPI_MISO_GPIO": "23",
823+
"ESP32_ETHERNET_SPI_MOSI_GPIO": "18",
824+
"ESP32_ETHERNET_SPI_SCLK_GPIO": "19",
783825
"API_nanoFramework.Device.OneWire": "ON",
784826
"API_System.Device.I2c.Slave": "OFF"
785827
}

targets/ESP32/_Network/esp32_ethernet_options.h.in

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,15 @@
2929
// Experimental SPI (Untested)
3030
// Use an SPI Ethernet module
3131
// Pins choosen to work with wrover and jtag avoiding strapping pins (on same side of dev board)
32-
#define ESP32_ETHERNET_SPI_HOST HSPI_HOST
33-
#define ESP32_ETHERNET_SPI_CLOCK_MHZ 20
34-
#define ESP32_ETHERNET_SPI_CS 26
35-
#define ESP32_ETHERNET_SPI_INT_GPIO 34
36-
// ETH_PHY_RST_GPIO is defined in the CMake file.
32+
#cmakedefine ESP32_ETHERNET_SPI_HOST @ESP32_ETHERNET_SPI_HOST@
33+
#cmakedefine ESP32_ETHERNET_SPI_CLOCK_MHZ @ESP32_ETHERNET_SPI_CLOCK_MHZ@
34+
#cmakedefine ESP32_ETHERNET_SPI_CS @ESP32_ETHERNET_SPI_CS@
35+
#cmakedefine ESP32_ETHERNET_SPI_INT_GPIO @ESP32_ETHERNET_SPI_INT_GPIO@
3736

3837
// Define SPI pins to use
39-
#define ESP32_ETHERNET_SPI_MISO_GPIO 19
40-
#define ESP32_ETHERNET_SPI_MOSI_GPIO 23
41-
#define ESP32_ETHERNET_SPI_SCLK_GPIO 18
38+
#cmakedefine ESP32_ETHERNET_SPI_MISO_GPIO @ESP32_ETHERNET_SPI_SCLK_GPIO@
39+
#cmakedefine ESP32_ETHERNET_SPI_MOSI_GPIO @ESP32_ETHERNET_SPI_SCLK_GPIO@
40+
#cmakedefine ESP32_ETHERNET_SPI_SCLK_GPIO @ESP32_ETHERNET_SPI_SCLK_GPIO@
4241

4342
#endif
4443

0 commit comments

Comments
 (0)