diff --git a/build/index.html b/build/index.html index fca10b2..59e0879 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 486dbfb..4ab472e 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-a24" +export const Version = "1.0.0-a25" diff --git a/src/configuration.json b/src/configuration.json index b8cf988..6650c8f 100644 --- a/src/configuration.json +++ b/src/configuration.json @@ -2075,7 +2075,53 @@ "value": false, "disableiffalse": true, "setting": true + }, + { + "id": "hook_ip", + "label": "Enable hook when getting IP", + "description": "Automaticaly launch script when get IP", + "setting": true, + "type": "boolean", + "value": false, + "disableiffalse": true + }, { + "id": "get_ip_hook", + "define": "ESP_GOT_IP_HOOK", + "label": "Commands to run when got IP", + "description": "Separate commands with ';'", + "depend": { + "id": "hook_ip", + "value": [true] + }, + "type": "text", + "needquote": true, + "value": "[ESP212]IP:%ESP_IP%", + "setting": true + }, + { + "id": "hook_datetime", + "label": "Enable hook when getting date/time", + "description": "Automaticaly launch script when get date/time", + "setting": true, + "type": "boolean", + "value": false, + "disableiffalse": true + }, { + "id": "get_datetime_hook", + "define": "ESP_GOT_DATE_TIME_HOOK", + "label": "Commands to run when got date/time", + "description": "Separate commands with ';'", + "depend": { + "id": "hook_datetime", + "value": [true] + }, + "type": "text", + "needquote": true, + "value": "[ESP212]DATE:%ESP_DATETIME%", + "disableiffalse": true, + "setting": true } + ] } ], diff --git a/src/tabs/generate/footer.js b/src/tabs/generate/footer.js index 552269e..789d461 100644 --- a/src/tabs/generate/footer.js +++ b/src/tabs/generate/footer.js @@ -54,7 +54,7 @@ const footer = * Do not modify \n\ ************************************/\n\ \n\ -#if defined (SD_TIMESTAMP_FEATURE) || defined (FILESYSTEM_TIMESTAMP_FEATURE)\n\ +#if defined(ESP_GOT_DATE_TIME_HOOK) || defined (SD_TIMESTAMP_FEATURE) || defined (FILESYSTEM_TIMESTAMP_FEATURE)\n\ #define TIMESTAMP_FEATURE\n\ #endif //SD_TIMESTAMP_FEATURE || FILESYSTEM_TIMESTAMP_FEATURE \n\ \n\ diff --git a/src/tabs/generate/index.js b/src/tabs/generate/index.js index 17e632c..62b2fae 100644 --- a/src/tabs/generate/index.js +++ b/src/tabs/generate/index.js @@ -563,7 +563,7 @@ const convertToText = (data) => { : "" }` + (element.header ? element.header : "") + - `#define ${element.define} ${element.value}\n` + (element.define?`#define ${element.define} ${element.value}\n`:"") ) } else if (element.type == "boolean") { return ( @@ -571,9 +571,9 @@ const convertToText = (data) => { `\n// ${element.label}\n` + `// ${element.description}\n` + (element.header ? element.header : "") + - `#define ${element.define} ${ + (element.define?`#define ${element.define} ${ !element.disableiffalse ? element.value : "" - }\n` + }\n`:"") ) } else if ( element.type == "text" ||