");
- content += ("
");
content +=("
");
- content += ("
");
/*Extended editor content*/
content += ("
");
- content +=("
");
- content += ("");
-
- content +=("");
- content += ("
");
-
content += ("
");
content += ("
");
-
content += ("
");
- target.innerHTML = content;
}
+ target.innerHTML = content;
}
function applytm() {
}
function addtm() {
var num = timarr_test.length + 1;
- timarr_test.push({ 'num': num, 'start': 1500000000, 'cron': '* * * * * *' });
+ timarr_test.push({ 'num': num, 'enab':1, 'name':'Timer'+num+' name', 'obj': 0, 'act': 0, 'cron': '* * * * * *' });
drawtimers(timarr_test);
}
\ No newline at end of file
diff --git a/HTML/res/styles.css b/HTML/res/styles.css
index 5088516..5dfb9ab 100644
--- a/HTML/res/styles.css
+++ b/HTML/res/styles.css
@@ -319,6 +319,7 @@ select {
-moz-appearance: none;
appearance: none;
background-color: var(--panel-bgr-color);
+ width: 150px;
}
.btn{min-width:100px; color:var(--text-color);}
@@ -363,6 +364,7 @@ input[type="radio"] { margin-top: -1px; vertical-align: middle;}
margin: 0 0 10px 10px;
padding: 10px;
background-color:var(--panel-bgr-color);
+ border-radius: 10px;
}
.ml {
diff --git a/dependencies.lock b/dependencies.lock
index b34c22b..55ac77a 100644
--- a/dependencies.lock
+++ b/dependencies.lock
@@ -1,9 +1,9 @@
-dependencies:
- idf:
- component_hash: null
- source:
- type: idf
- version: 4.4.4
-manifest_hash: 31dd4ec84ade1450fc168388f4adce2efacd1516170670735140bc772e9d72bd
-target: esp32
-version: 1.0.0
+dependencies:
+ idf:
+ component_hash: null
+ source:
+ type: idf
+ version: 4.4.4
+manifest_hash: f9b3d78d7d56685d1c543701158a0fab7a56c908117ed70644f77e4247c831ae
+target: esp32
+version: 1.0.0
diff --git a/main/HTTPPostCustom.c b/main/HTTPPostCustom.c
index 6184da7..7a85799 100644
--- a/main/HTTPPostCustom.c
+++ b/main/HTTPPostCustom.c
@@ -1,125 +1,139 @@
- /*! Copyright 2022 Bogdan Pilyugin
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * \file HTTPPostCustom.c
- * \version 1.0
- * \date 2022-08-18
- * \author Bogdan Pilyugin
- * \brief
- * \details
- * \copyright Apache License, Version 2.0
- */
-#include "webguiapp.h"
-
-const char pg_40[] = "index40.html";
-const char pg_42[] = "index42.html";
-const char pg_43[] = "index43.html";
-const char pg_44[] = "index44.html";
-
-static HTTP_IO_RESULT HTTPPostIndex40(httpd_req_t *req, char *PostData);
-static HTTP_IO_RESULT HTTPPostIndex42(httpd_req_t *req, char *PostData);
-static HTTP_IO_RESULT HTTPPostIndex43(httpd_req_t *req, char *PostData);
-static HTTP_IO_RESULT HTTPPostIndex44(httpd_req_t *req, char *PostData);
-
-HTTP_IO_RESULT AfterPostHandlerCustom(httpd_req_t *req, const char *filename, char *PostData)
-{
-
-
- if (!memcmp(filename, pg_40, sizeof(pg_40)))
- return HTTPPostIndex40(req, PostData);
- if (!memcmp(filename, pg_42, sizeof(pg_42)))
- return HTTPPostIndex42(req, PostData);
- if (!memcmp(filename, pg_43, sizeof(pg_43)))
- return HTTPPostIndex43(req, PostData);
- if (!memcmp(filename, pg_44, sizeof(pg_44)))
- return HTTPPostIndex44(req, PostData);
-
-
- return HTTP_IO_DONE;
-}
-
-static HTTP_IO_RESULT HTTPPostIndex40(httpd_req_t *req, char *PostData)
-{
- char tmp[8];
- if (httpd_query_key_value(PostData, "cmd", tmp, 4) == ESP_OK)
- {
- if (!strcmp(tmp, (const char*) "1"))
- {
- // SetCTRL_BAT(ON);
- }
- else if (!strcmp(tmp, (const char*) "2"))
- {
- // SetCTRL_BAT(OFF);
- }
- else if (!strcmp(tmp, (const char*) "3"))
- {
- //MQTTStart();
- }
- else if (!strcmp(tmp, (const char*) "4"))
- {
- // MQTTStop();
- }
- else if (!strcmp(tmp, (const char*) "5"))
- {
-
- }
- else if (!strcmp(tmp, (const char*) "6"))
- {
-
- }
- else if (!strcmp(tmp, (const char*) "7"))
- {
- //SetDefaultNetIF(GetETHNetifAdapter());
- }
- else if (!strcmp(tmp, (const char*) "8"))
- {
- //SetDefaultNetIF(GetSTANetifAdapter());
- }
- else if (!strcmp(tmp, (const char*) "9"))
- {
- //SetDefaultNetIF(GetPPPNetifAdapter());
- }
- else if (!strcmp(tmp, (const char*) "10"))
- {
- //NextDefaultNetIF();
- }
- else if (!strcmp(tmp, (const char*) "11"))
- {
- //PrintNetifs();
- }
- else if (!strcmp(tmp, (const char*) "12"))
- {
- // SendTestEvent();
- }
-
- }
- return HTTP_IO_DONE;
-}
-
-static HTTP_IO_RESULT HTTPPostIndex42(httpd_req_t *req, char *PostData)
-{
- return HTTP_IO_DONE;
-}
-
-static HTTP_IO_RESULT HTTPPostIndex43(httpd_req_t *req, char *PostData)
-{
- return HTTP_IO_DONE;
-}
-
-static HTTP_IO_RESULT HTTPPostIndex44(httpd_req_t *req, char *PostData)
-{
- return HTTP_IO_DONE;
-}
-
-
+ /*! Copyright 2022 Bogdan Pilyugin
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * \file HTTPPostCustom.c
+ * \version 1.0
+ * \date 2022-08-18
+ * \author Bogdan Pilyugin
+ * \brief
+ * \details
+ * \copyright Apache License, Version 2.0
+ */
+#include "webguiapp.h"
+
+const char pg_40[] = "index40.html";
+const char pg_42[] = "index42.html";
+const char pg_43[] = "index43.html";
+const char pg_44[] = "index44.html";
+const char url_application[] = "application.html";
+
+static HTTP_IO_RESULT HTTPPostIndex40(httpd_req_t *req, char *PostData);
+static HTTP_IO_RESULT HTTPPostIndex42(httpd_req_t *req, char *PostData);
+static HTTP_IO_RESULT HTTPPostIndex43(httpd_req_t *req, char *PostData);
+static HTTP_IO_RESULT HTTPPostIndex44(httpd_req_t *req, char *PostData);
+static HTTP_IO_RESULT HTTPPostApplication(httpd_req_t *req, char *PostData);
+
+HTTP_IO_RESULT AfterPostHandlerCustom(httpd_req_t *req, const char *filename, char *PostData)
+{
+
+
+ if (!memcmp(filename, pg_40, sizeof(pg_40)))
+ return HTTPPostIndex40(req, PostData);
+ if (!memcmp(filename, pg_42, sizeof(pg_42)))
+ return HTTPPostIndex42(req, PostData);
+ if (!memcmp(filename, pg_43, sizeof(pg_43)))
+ return HTTPPostIndex43(req, PostData);
+ if (!memcmp(filename, pg_44, sizeof(pg_44)))
+ return HTTPPostIndex44(req, PostData);
+ if (!memcmp(filename, url_application, sizeof(url_application)))
+ return HTTPPostApplication(req, PostData);
+
+ return HTTP_IO_DONE;
+}
+
+
+static HTTP_IO_RESULT HTTPPostApplication(httpd_req_t *req, char *PostData)
+{
+ char tmp[512];
+ if (httpd_query_key_value(PostData, "tmrec", tmp, sizeof(tmp)) == ESP_OK)
+ {
+ ESP_LOGI("HTTP_POST","%s", tmp);
+ }
+ return HTTP_IO_DONE;
+}
+
+static HTTP_IO_RESULT HTTPPostIndex40(httpd_req_t *req, char *PostData)
+{
+ char tmp[8];
+ if (httpd_query_key_value(PostData, "cmd", tmp, 4) == ESP_OK)
+ {
+ if (!strcmp(tmp, (const char*) "1"))
+ {
+ // SetCTRL_BAT(ON);
+ }
+ else if (!strcmp(tmp, (const char*) "2"))
+ {
+ // SetCTRL_BAT(OFF);
+ }
+ else if (!strcmp(tmp, (const char*) "3"))
+ {
+ //MQTTStart();
+ }
+ else if (!strcmp(tmp, (const char*) "4"))
+ {
+ // MQTTStop();
+ }
+ else if (!strcmp(tmp, (const char*) "5"))
+ {
+
+ }
+ else if (!strcmp(tmp, (const char*) "6"))
+ {
+
+ }
+ else if (!strcmp(tmp, (const char*) "7"))
+ {
+ //SetDefaultNetIF(GetETHNetifAdapter());
+ }
+ else if (!strcmp(tmp, (const char*) "8"))
+ {
+ //SetDefaultNetIF(GetSTANetifAdapter());
+ }
+ else if (!strcmp(tmp, (const char*) "9"))
+ {
+ //SetDefaultNetIF(GetPPPNetifAdapter());
+ }
+ else if (!strcmp(tmp, (const char*) "10"))
+ {
+ //NextDefaultNetIF();
+ }
+ else if (!strcmp(tmp, (const char*) "11"))
+ {
+ //PrintNetifs();
+ }
+ else if (!strcmp(tmp, (const char*) "12"))
+ {
+ // SendTestEvent();
+ }
+
+ }
+ return HTTP_IO_DONE;
+}
+
+static HTTP_IO_RESULT HTTPPostIndex42(httpd_req_t *req, char *PostData)
+{
+ return HTTP_IO_DONE;
+}
+
+static HTTP_IO_RESULT HTTPPostIndex43(httpd_req_t *req, char *PostData)
+{
+ return HTTP_IO_DONE;
+}
+
+static HTTP_IO_RESULT HTTPPostIndex44(httpd_req_t *req, char *PostData)
+{
+ return HTTP_IO_DONE;
+}
+
+