diff --git a/build/index.html b/build/index.html index 8114f22..df9913e 100644 --- a/build/index.html +++ b/build/index.html @@ -1 +1 @@ -ESP3D-Configurator \ No newline at end of file +ESP3D-Configurator \ No newline at end of file diff --git a/src/configuration.json b/src/configuration.json index f0492d5..d3e3e2a 100644 --- a/src/configuration.json +++ b/src/configuration.json @@ -811,6 +811,36 @@ "setting": true, "usedescforoptions": true }, + { + "id": "ethernetspi", + "define": "", + "label": "Ethernet Dedicated SPI", + "description": "SPI Used by Ethernet", + "type": "select", + "value": "ETHERNET_SPI_USE_SPI2", + "depend": [ + { + "id": "ethernetboard", + "value": "TYPE_ETH_PHY_W5500" + }, + { + "id": "ethernet", + "value": "true" + } + ], + "setting": true, + "usedescforoptions": true, + "options": [ + { + "label": "SPI", + "value": "ETHERNET_SPI_USE_SPI" + }, + { + "label": "SPI2", + "value": "ETHERNET_SPI_USE_SPI2" + } + ] + }, { "id": "ethernetspicspin", "define": "ETH_PHY_CS", @@ -2320,20 +2350,6 @@ "value": "SETTINGS_IN_PREFERENCES" } ] - }, - { - "id": "serialTask", - "define": "SERIAL_INDEPENDANT_TASK", - "label": "Add serial task", - "description": "ESP32 need to add a task to handle serial communication", - "type": "boolean", - "value": true, - "setting": true, - "disableiffalse": true, - "depend": { - "id": "targetmcu", - "value": ["esp32", "esp32s3"] - } } ] } diff --git a/src/tabs/generate/index.js b/src/tabs/generate/index.js index f1168a6..4f0beb2 100644 --- a/src/tabs/generate/index.js +++ b/src/tabs/generate/index.js @@ -570,7 +570,7 @@ const convertToText = (data) => { (element.header ? element.header : "") + (element.define ? `#define ${element.define} ${element.value}\n` - : "") + : `#define ${element.value}\n`) ) } else if (element.type == "boolean") { return (