Skip to content

Commit 3564810

Browse files
committed
Remove SSL Client settings
Add number type for generated results Do not show Autostart section if set to none
1 parent 15893a2 commit 3564810

File tree

4 files changed

+12
-30
lines changed

4 files changed

+12
-30
lines changed

build/index.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/components/App/version.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1717
*/
1818
import { h } from "preact"
19-
export const Version = "1.0.0-a3"
19+
export const Version = "1.0.0-a4"

src/configuration.json

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,6 +1256,7 @@
12561256
"define":"AUTOSTART_SCRIPT_FEATURE",
12571257
"label":"Enable Autostart script",
12581258
"description":"Automaticaly launch script when ESP3D is started",
1259+
"setting":true,
12591260
"type":"select",
12601261
"value": "-1",
12611262
"usedescforoptions":true,
@@ -1266,11 +1267,11 @@
12661267
},
12671268
{
12681269
"label": "Commands",
1269-
"value": "commandsautoscript"
1270+
"value": "\"script\""
12701271
},
12711272
{
12721273
"label": "File",
1273-
"value": "fileautoscript"
1274+
"value": "\"file\""
12741275
}
12751276
]
12761277
},
@@ -1279,7 +1280,7 @@
12791280
"define":"ESP_AUTOSTART_SCRIPT",
12801281
"label":"Commands to run on startup",
12811282
"description":"Separate commands with ';'",
1282-
"depend":{"id":"autorunscript","value":["commandsautoscript"]},
1283+
"depend":{"id":"autorunscript","value":["\"script\""]},
12831284
"type":"text",
12841285
"needquote":true,
12851286
"value":"M117 Mounting SD;M21",
@@ -1288,10 +1289,10 @@
12881289
},
12891290
{
12901291
"id":"autostartfile",
1291-
"define":"ESP_AUTOSTART_SCRIPT",
1292+
"define":"ESP_AUTOSTART_SCRIPT_FILE",
12921293
"label":"File to run on startup",
12931294
"description":"The file should be on ESP3D filesystem",
1294-
"depend":{"id":"autorunscript","value":["fileautoscript"]},
1295+
"depend":{"id":"autorunscript","value":["\"file\""]},
12951296
"type":"text",
12961297
"needquote":true,
12971298
"value":"autorun.gco",
@@ -1350,28 +1351,6 @@
13501351
]
13511352
}
13521353
,
1353-
{
1354-
"id":"SSLClient1",
1355-
"define":"BEARSSL_MFLN_SIZE",
1356-
"label":"Bear SSL buffer size",
1357-
"description":"Using BearSSL need to decrease default size of packet to not be out of memory on ESP8266",
1358-
"type":"number",
1359-
"value":512,
1360-
"setting":true,
1361-
"depend":{"id":"targetmcu","value":["esp8266"]}
1362-
}
1363-
,
1364-
{
1365-
"id":"SSLClient2",
1366-
"define":"BEARSSL_MFLN_SIZE_FALLBACK",
1367-
"label":"Bear SSL buffer size fallback",
1368-
"description":"Using BearSSL need to decrease default fallback size of packet to not be out of memory on ESP8266",
1369-
"type":"number",
1370-
"value":4096,
1371-
"setting":true,
1372-
"depend":{"id":"targetmcu","value":["esp8266"]}
1373-
}
1374-
,
13751354
{
13761355
"id":"serialTask",
13771356
"define":"SERIAL_INDEPENDANT_TASK",

src/tabs/generate/index.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,10 @@ const convertToText = (data) => {
128128
!element.disableiffalse ? element.value : ""
129129
}\n`
130130
)
131-
} else if (element.type == "text") {
131+
} else if (
132+
element.type == "text" ||
133+
element.type == "number"
134+
) {
132135
return (
133136
acc3 +
134137
`\n// ${element.label}\n` +

0 commit comments

Comments
 (0)