From 3564810d1f7a9fbe3cfc02800a6df28cecef3685 Mon Sep 17 00:00:00 2001
From: Luc <8822552+luc-github@users.noreply.github.com>
Date: Wed, 22 Jun 2022 20:56:59 +0800
Subject: [PATCH] Remove SSL Client settings
Add number type for generated results
Do not show Autostart section if set to none
---
build/index.html | 2 +-
src/components/App/version.js | 2 +-
src/configuration.json | 33 ++++++---------------------------
src/tabs/generate/index.js | 5 ++++-
4 files changed, 12 insertions(+), 30 deletions(-)
diff --git a/build/index.html b/build/index.html
index d1dfd50..92aad49 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/components/App/version.js b/src/components/App/version.js
index 9ce3770..1ebc1c9 100644
--- a/src/components/App/version.js
+++ b/src/components/App/version.js
@@ -16,4 +16,4 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
import { h } from "preact"
-export const Version = "1.0.0-a3"
+export const Version = "1.0.0-a4"
diff --git a/src/configuration.json b/src/configuration.json
index 48f880b..5a34d51 100644
--- a/src/configuration.json
+++ b/src/configuration.json
@@ -1256,6 +1256,7 @@
"define":"AUTOSTART_SCRIPT_FEATURE",
"label":"Enable Autostart script",
"description":"Automaticaly launch script when ESP3D is started",
+ "setting":true,
"type":"select",
"value": "-1",
"usedescforoptions":true,
@@ -1266,11 +1267,11 @@
},
{
"label": "Commands",
- "value": "commandsautoscript"
+ "value": "\"script\""
},
{
"label": "File",
- "value": "fileautoscript"
+ "value": "\"file\""
}
]
},
@@ -1279,7 +1280,7 @@
"define":"ESP_AUTOSTART_SCRIPT",
"label":"Commands to run on startup",
"description":"Separate commands with ';'",
- "depend":{"id":"autorunscript","value":["commandsautoscript"]},
+ "depend":{"id":"autorunscript","value":["\"script\""]},
"type":"text",
"needquote":true,
"value":"M117 Mounting SD;M21",
@@ -1288,10 +1289,10 @@
},
{
"id":"autostartfile",
- "define":"ESP_AUTOSTART_SCRIPT",
+ "define":"ESP_AUTOSTART_SCRIPT_FILE",
"label":"File to run on startup",
"description":"The file should be on ESP3D filesystem",
- "depend":{"id":"autorunscript","value":["fileautoscript"]},
+ "depend":{"id":"autorunscript","value":["\"file\""]},
"type":"text",
"needquote":true,
"value":"autorun.gco",
@@ -1350,28 +1351,6 @@
]
}
,
- {
- "id":"SSLClient1",
- "define":"BEARSSL_MFLN_SIZE",
- "label":"Bear SSL buffer size",
- "description":"Using BearSSL need to decrease default size of packet to not be out of memory on ESP8266",
- "type":"number",
- "value":512,
- "setting":true,
- "depend":{"id":"targetmcu","value":["esp8266"]}
- }
- ,
- {
- "id":"SSLClient2",
- "define":"BEARSSL_MFLN_SIZE_FALLBACK",
- "label":"Bear SSL buffer size fallback",
- "description":"Using BearSSL need to decrease default fallback size of packet to not be out of memory on ESP8266",
- "type":"number",
- "value":4096,
- "setting":true,
- "depend":{"id":"targetmcu","value":["esp8266"]}
- }
- ,
{
"id":"serialTask",
"define":"SERIAL_INDEPENDANT_TASK",
diff --git a/src/tabs/generate/index.js b/src/tabs/generate/index.js
index 3864406..01daf69 100644
--- a/src/tabs/generate/index.js
+++ b/src/tabs/generate/index.js
@@ -128,7 +128,10 @@ const convertToText = (data) => {
!element.disableiffalse ? element.value : ""
}\n`
)
- } else if (element.type == "text") {
+ } else if (
+ element.type == "text" ||
+ element.type == "number"
+ ) {
return (
acc3 +
`\n// ${element.label}\n` +