diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 51fbc13..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -/app/mdns -/AutoMake/ -/CreateLib/ -/esp8266web.asm -/eagle.app.v6.asm diff --git a/CreateLib/Web_Base.lib b/CreateLib/Web_Base.lib new file mode 100644 index 0000000..1946d8d Binary files /dev/null and b/CreateLib/Web_Base.lib differ diff --git a/CreateLib/app/sdklib/lwip/api/api_lib.o b/CreateLib/app/sdklib/lwip/api/api_lib.o new file mode 100644 index 0000000..48ca731 Binary files /dev/null and b/CreateLib/app/sdklib/lwip/api/api_lib.o differ diff --git a/CreateLib/app/sdklib/lwip/api/api_msg.o b/CreateLib/app/sdklib/lwip/api/api_msg.o new file mode 100644 index 0000000..cf9d24d Binary files /dev/null and b/CreateLib/app/sdklib/lwip/api/api_msg.o differ diff --git a/CreateLib/app/sdklib/lwip/api/err.o b/CreateLib/app/sdklib/lwip/api/err.o new file mode 100644 index 0000000..9870e7b Binary files /dev/null and b/CreateLib/app/sdklib/lwip/api/err.o differ diff --git a/CreateLib/app/sdklib/lwip/api/netbuf.o b/CreateLib/app/sdklib/lwip/api/netbuf.o new file mode 100644 index 0000000..851f0d4 Binary files /dev/null and b/CreateLib/app/sdklib/lwip/api/netbuf.o differ diff --git a/CreateLib/app/sdklib/lwip/api/netdb.o b/CreateLib/app/sdklib/lwip/api/netdb.o new file mode 100644 index 0000000..79b35e5 Binary files /dev/null and b/CreateLib/app/sdklib/lwip/api/netdb.o differ diff --git a/CreateLib/app/sdklib/lwip/api/netifapi.o b/CreateLib/app/sdklib/lwip/api/netifapi.o new file mode 100644 index 0000000..80fc9fa Binary files /dev/null and b/CreateLib/app/sdklib/lwip/api/netifapi.o differ diff --git a/CreateLib/app/sdklib/lwip/api/sockets.o b/CreateLib/app/sdklib/lwip/api/sockets.o new file mode 100644 index 0000000..057dc1f Binary files /dev/null and b/CreateLib/app/sdklib/lwip/api/sockets.o differ diff --git a/CreateLib/app/sdklib/lwip/api/tcpip.o b/CreateLib/app/sdklib/lwip/api/tcpip.o new file mode 100644 index 0000000..a98c003 Binary files /dev/null and b/CreateLib/app/sdklib/lwip/api/tcpip.o differ diff --git a/CreateLib/app/sdklib/lwip/app/dhcpserver.o b/CreateLib/app/sdklib/lwip/app/dhcpserver.o new file mode 100644 index 0000000..e243f10 Binary files /dev/null and b/CreateLib/app/sdklib/lwip/app/dhcpserver.o differ diff --git a/CreateLib/app/sdklib/lwip/app/espconn.o b/CreateLib/app/sdklib/lwip/app/espconn.o new file mode 100644 index 0000000..269bc5e Binary files /dev/null and b/CreateLib/app/sdklib/lwip/app/espconn.o differ diff --git a/CreateLib/app/sdklib/lwip/app/espconn_mdns.o b/CreateLib/app/sdklib/lwip/app/espconn_mdns.o new file mode 100644 index 0000000..0488089 Binary files /dev/null and b/CreateLib/app/sdklib/lwip/app/espconn_mdns.o differ diff --git a/CreateLib/app/sdklib/lwip/app/espconn_tcp.o b/CreateLib/app/sdklib/lwip/app/espconn_tcp.o new file mode 100644 index 0000000..da2bb99 Binary files /dev/null and b/CreateLib/app/sdklib/lwip/app/espconn_tcp.o differ diff --git a/CreateLib/app/sdklib/lwip/app/espconn_udp.o b/CreateLib/app/sdklib/lwip/app/espconn_udp.o new file mode 100644 index 0000000..466eedc Binary files /dev/null and b/CreateLib/app/sdklib/lwip/app/espconn_udp.o differ diff --git a/CreateLib/app/sdklib/lwip/app/netio.o b/CreateLib/app/sdklib/lwip/app/netio.o new file mode 100644 index 0000000..0a8163d Binary files /dev/null and b/CreateLib/app/sdklib/lwip/app/netio.o differ diff --git a/CreateLib/app/sdklib/lwip/app/ping.o b/CreateLib/app/sdklib/lwip/app/ping.o new file mode 100644 index 0000000..bca05a8 Binary files /dev/null and b/CreateLib/app/sdklib/lwip/app/ping.o differ diff --git a/CreateLib/app/sdklib/lwip/core/def.o b/CreateLib/app/sdklib/lwip/core/def.o new file mode 100644 index 0000000..b1a2a0b Binary files /dev/null and b/CreateLib/app/sdklib/lwip/core/def.o differ diff --git a/CreateLib/app/sdklib/lwip/core/dhcp.o b/CreateLib/app/sdklib/lwip/core/dhcp.o new file mode 100644 index 0000000..47cdfc2 Binary files /dev/null and b/CreateLib/app/sdklib/lwip/core/dhcp.o differ diff --git a/CreateLib/app/sdklib/lwip/core/dns.o b/CreateLib/app/sdklib/lwip/core/dns.o new file mode 100644 index 0000000..bd05599 Binary files /dev/null and b/CreateLib/app/sdklib/lwip/core/dns.o differ diff --git a/CreateLib/app/sdklib/lwip/core/init.o b/CreateLib/app/sdklib/lwip/core/init.o new file mode 100644 index 0000000..7cbc28b Binary files /dev/null and b/CreateLib/app/sdklib/lwip/core/init.o differ diff --git a/CreateLib/app/sdklib/lwip/core/ipv4/autoip.o b/CreateLib/app/sdklib/lwip/core/ipv4/autoip.o new file mode 100644 index 0000000..055ba2e Binary files /dev/null and b/CreateLib/app/sdklib/lwip/core/ipv4/autoip.o differ diff --git a/CreateLib/app/sdklib/lwip/core/ipv4/icmp.o b/CreateLib/app/sdklib/lwip/core/ipv4/icmp.o new file mode 100644 index 0000000..04f07f3 Binary files /dev/null and b/CreateLib/app/sdklib/lwip/core/ipv4/icmp.o differ diff --git a/CreateLib/app/sdklib/lwip/core/ipv4/igmp.o b/CreateLib/app/sdklib/lwip/core/ipv4/igmp.o new file mode 100644 index 0000000..048a09f Binary files /dev/null and b/CreateLib/app/sdklib/lwip/core/ipv4/igmp.o differ diff --git a/CreateLib/app/sdklib/lwip/core/ipv4/inet.o b/CreateLib/app/sdklib/lwip/core/ipv4/inet.o new file mode 100644 index 0000000..0f0831a Binary files /dev/null and b/CreateLib/app/sdklib/lwip/core/ipv4/inet.o differ diff --git a/CreateLib/app/sdklib/lwip/core/ipv4/inet_chksum.o b/CreateLib/app/sdklib/lwip/core/ipv4/inet_chksum.o new file mode 100644 index 0000000..ef7e45d Binary files /dev/null and b/CreateLib/app/sdklib/lwip/core/ipv4/inet_chksum.o differ diff --git a/CreateLib/app/sdklib/lwip/core/ipv4/ip.o b/CreateLib/app/sdklib/lwip/core/ipv4/ip.o new file mode 100644 index 0000000..e768d6f Binary files /dev/null and b/CreateLib/app/sdklib/lwip/core/ipv4/ip.o differ diff --git a/CreateLib/app/sdklib/lwip/core/ipv4/ip_addr.o b/CreateLib/app/sdklib/lwip/core/ipv4/ip_addr.o new file mode 100644 index 0000000..22b72c5 Binary files /dev/null and b/CreateLib/app/sdklib/lwip/core/ipv4/ip_addr.o differ diff --git a/CreateLib/app/sdklib/lwip/core/ipv4/ip_frag.o b/CreateLib/app/sdklib/lwip/core/ipv4/ip_frag.o new file mode 100644 index 0000000..10675f3 Binary files /dev/null and b/CreateLib/app/sdklib/lwip/core/ipv4/ip_frag.o differ diff --git a/CreateLib/app/sdklib/lwip/core/mdns.o b/CreateLib/app/sdklib/lwip/core/mdns.o new file mode 100644 index 0000000..cc0bec5 Binary files /dev/null and b/CreateLib/app/sdklib/lwip/core/mdns.o differ diff --git a/CreateLib/app/sdklib/lwip/core/mem.o b/CreateLib/app/sdklib/lwip/core/mem.o new file mode 100644 index 0000000..65e0e77 Binary files /dev/null and b/CreateLib/app/sdklib/lwip/core/mem.o differ diff --git a/CreateLib/app/sdklib/lwip/core/memp.o b/CreateLib/app/sdklib/lwip/core/memp.o new file mode 100644 index 0000000..2919509 Binary files /dev/null and b/CreateLib/app/sdklib/lwip/core/memp.o differ diff --git a/CreateLib/app/sdklib/lwip/core/netif.o b/CreateLib/app/sdklib/lwip/core/netif.o new file mode 100644 index 0000000..a0125d6 Binary files /dev/null and b/CreateLib/app/sdklib/lwip/core/netif.o differ diff --git a/CreateLib/app/sdklib/lwip/core/pbuf.o b/CreateLib/app/sdklib/lwip/core/pbuf.o new file mode 100644 index 0000000..580e1e5 Binary files /dev/null and b/CreateLib/app/sdklib/lwip/core/pbuf.o differ diff --git a/CreateLib/app/sdklib/lwip/core/raw.o b/CreateLib/app/sdklib/lwip/core/raw.o new file mode 100644 index 0000000..b7d693b Binary files /dev/null and b/CreateLib/app/sdklib/lwip/core/raw.o differ diff --git a/CreateLib/app/sdklib/lwip/core/sntp.o b/CreateLib/app/sdklib/lwip/core/sntp.o new file mode 100644 index 0000000..8550813 Binary files /dev/null and b/CreateLib/app/sdklib/lwip/core/sntp.o differ diff --git a/CreateLib/app/sdklib/lwip/core/stats.o b/CreateLib/app/sdklib/lwip/core/stats.o new file mode 100644 index 0000000..ecaff87 Binary files /dev/null and b/CreateLib/app/sdklib/lwip/core/stats.o differ diff --git a/CreateLib/app/sdklib/lwip/core/sys.o b/CreateLib/app/sdklib/lwip/core/sys.o new file mode 100644 index 0000000..67d7648 Binary files /dev/null and b/CreateLib/app/sdklib/lwip/core/sys.o differ diff --git a/CreateLib/app/sdklib/lwip/core/tcp.o b/CreateLib/app/sdklib/lwip/core/tcp.o new file mode 100644 index 0000000..c7b0c47 Binary files /dev/null and b/CreateLib/app/sdklib/lwip/core/tcp.o differ diff --git a/CreateLib/app/sdklib/lwip/core/tcp_in.o b/CreateLib/app/sdklib/lwip/core/tcp_in.o new file mode 100644 index 0000000..b06d82c Binary files /dev/null and b/CreateLib/app/sdklib/lwip/core/tcp_in.o differ diff --git a/CreateLib/app/sdklib/lwip/core/tcp_out.o b/CreateLib/app/sdklib/lwip/core/tcp_out.o new file mode 100644 index 0000000..c1e701c Binary files /dev/null and b/CreateLib/app/sdklib/lwip/core/tcp_out.o differ diff --git a/CreateLib/app/sdklib/lwip/core/timers.o b/CreateLib/app/sdklib/lwip/core/timers.o new file mode 100644 index 0000000..dac843f Binary files /dev/null and b/CreateLib/app/sdklib/lwip/core/timers.o differ diff --git a/CreateLib/app/sdklib/lwip/core/udp.o b/CreateLib/app/sdklib/lwip/core/udp.o new file mode 100644 index 0000000..6cced48 Binary files /dev/null and b/CreateLib/app/sdklib/lwip/core/udp.o differ diff --git a/CreateLib/app/sdklib/lwip/netif/etharp.o b/CreateLib/app/sdklib/lwip/netif/etharp.o new file mode 100644 index 0000000..780ee08 Binary files /dev/null and b/CreateLib/app/sdklib/lwip/netif/etharp.o differ diff --git a/CreateLib/app/sdklib/phy/phy_chip_v6_unused.o b/CreateLib/app/sdklib/phy/phy_chip_v6_unused.o new file mode 100644 index 0000000..9d66a2d Binary files /dev/null and b/CreateLib/app/sdklib/phy/phy_chip_v6_unused.o differ diff --git a/CreateLib/app/sdklib/pp/pplibadd.o b/CreateLib/app/sdklib/pp/pplibadd.o new file mode 100644 index 0000000..d040d9c Binary files /dev/null and b/CreateLib/app/sdklib/pp/pplibadd.o differ diff --git a/CreateLib/app/sdklib/system/app_main.o b/CreateLib/app/sdklib/system/app_main.o new file mode 100644 index 0000000..13651bf Binary files /dev/null and b/CreateLib/app/sdklib/system/app_main.o differ diff --git a/CreateLib/app/sdklib/system/eagle_lwip_if.o b/CreateLib/app/sdklib/system/eagle_lwip_if.o new file mode 100644 index 0000000..8935449 Binary files /dev/null and b/CreateLib/app/sdklib/system/eagle_lwip_if.o differ diff --git a/CreateLib/app/sdklib/system/ets_run_new.o b/CreateLib/app/sdklib/system/ets_run_new.o new file mode 100644 index 0000000..5745209 Binary files /dev/null and b/CreateLib/app/sdklib/system/ets_run_new.o differ diff --git a/CreateLib/app/sdklib/system/ets_timer.o b/CreateLib/app/sdklib/system/ets_timer.o new file mode 100644 index 0000000..89e024b Binary files /dev/null and b/CreateLib/app/sdklib/system/ets_timer.o differ diff --git a/CreateLib/app/sdklib/system/main-vectors.o b/CreateLib/app/sdklib/system/main-vectors.o new file mode 100644 index 0000000..c9f3673 Binary files /dev/null and b/CreateLib/app/sdklib/system/main-vectors.o differ diff --git a/CreateLib/app/sdklib/system/mem_manager.o b/CreateLib/app/sdklib/system/mem_manager.o new file mode 100644 index 0000000..6648850 Binary files /dev/null and b/CreateLib/app/sdklib/system/mem_manager.o differ diff --git a/CreateLib/app/sdklib/system/os_printf.o b/CreateLib/app/sdklib/system/os_printf.o new file mode 100644 index 0000000..f92152f Binary files /dev/null and b/CreateLib/app/sdklib/system/os_printf.o differ diff --git a/CreateLib/app/sdklib/system/rom2ram.o b/CreateLib/app/sdklib/system/rom2ram.o new file mode 100644 index 0000000..3e70392 Binary files /dev/null and b/CreateLib/app/sdklib/system/rom2ram.o differ diff --git a/CreateLib/app/sdklib/system/spi_flash.o b/CreateLib/app/sdklib/system/spi_flash.o new file mode 100644 index 0000000..500cab2 Binary files /dev/null and b/CreateLib/app/sdklib/system/spi_flash.o differ diff --git a/CreateLib/app/sdklib/system/spi_overlap.o b/CreateLib/app/sdklib/system/spi_overlap.o new file mode 100644 index 0000000..68b4128 Binary files /dev/null and b/CreateLib/app/sdklib/system/spi_overlap.o differ diff --git a/CreateLib/app/sdklib/system/wdt.o b/CreateLib/app/sdklib/system/wdt.o new file mode 100644 index 0000000..9df539f Binary files /dev/null and b/CreateLib/app/sdklib/system/wdt.o differ diff --git a/CreateLib/app/sdklib/wpa/os_xtensa.o b/CreateLib/app/sdklib/wpa/os_xtensa.o new file mode 100644 index 0000000..b83ad02 Binary files /dev/null and b/CreateLib/app/sdklib/wpa/os_xtensa.o differ diff --git a/CreateLib/app/sdklib/wpa/wpa_debug.o b/CreateLib/app/sdklib/wpa/wpa_debug.o new file mode 100644 index 0000000..959f1db Binary files /dev/null and b/CreateLib/app/sdklib/wpa/wpa_debug.o differ diff --git a/ESP-01_RS-485_sch.gif b/ESP-01_RS-485_sch.gif deleted file mode 100644 index 0c0be14..0000000 Binary files a/ESP-01_RS-485_sch.gif and /dev/null differ diff --git a/LICENSE b/LICENSE index 68a49da..3a9d10d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,24 +1,41 @@ -This is free and unencumbered software released into the public domain. -Anyone is free to copy, modify, publish, use, compile, sell, or -distribute this software, either in source code form or as a compiled -binary, for any purpose, commercial or non-commercial, and by any -means. +Данная лицензия разрешает лицам, получившим копию данного программного +обеспечения и сопутствующей документации (в дальнейшем именуемыми +<Программное Обеспечение>), безвозмездно использовать Программное +Обеспечение без ограничений, включая неограниченное право на +использование, копирование, изменение, добавление, публикацию, +распространение, сублицензирование и/или продажу копий Программного +Обеспечения, а также лицам, которым предоставляется данное Программное +Обеспечение, при соблюдении следующих условий: -In jurisdictions that recognize copyright laws, the author or authors -of this software dedicate any and all copyright interest in the -software to the public domain. We make this dedication for the benefit -of the public at large and to the detriment of our heirs and -successors. We intend this dedication to be an overt act of -relinquishment in perpetuity of all present and future rights to this -software under copyright law. +Указанное выше уведомление об авторском праве и данные условия должны быть +включены во все копии или значимые части данного Программного Обеспечения. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. +ДАННОЕ ПРОГРАММНОЕ ОБЕСПЕЧЕНИЕ ПРЕДОСТАВЛЯЕТСЯ <КАК ЕСТЬ>, +БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ, ЯВНО ВЫРАЖЕННЫХ ИЛИ ПОДРАЗУМЕВАЕМЫХ, +ВКЛЮЧАЯ ГАРАНТИИ ТОВАРНОЙ ПРИГОДНОСТИ, СООТВЕТСТВИЯ ПО ЕГО КОНКРЕТНОМУ +НАЗНАЧЕНИЮ И ОТСУТСТВИЯ НАРУШЕНИЙ, НО НЕ ОГРАНИЧИВАЯСЬ ИМИ. НИ В КАКОМ +СЛУЧАЕ АВТОРЫ ИЛИ ПРАВООБЛАДАТЕЛИ НЕ НЕСУТ ОТВЕТСТВЕННОСТИ ПО КАКИМ-ЛИБО +ИСКАМ, ЗА УЩЕРБ ИЛИ ПО ИНЫМ ТРЕБОВАНИЯМ, В ТОМ ЧИСЛЕ, ПРИ ДЕЙСТВИИ +КОНТРАКТА, ДЕЛИКТЕ ИЛИ ИНОЙ СИТУАЦИИ, ВОЗНИКШИМ ИЗ-ЗА ИСПОЛЬЗОВАНИЯ +ПРОГРАММНОГО ОБЕСПЕЧЕНИЯ ИЛИ ИНЫХ ДЕЙСТВИЙ С ПРОГРАММНЫМ ОБЕСПЕЧЕНИЕМ. -For more information, please refer to +The MIT License (MIT) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/Makefile b/Makefile index bc164df..3cc6079 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ # ############################################################# -ESPOPTION ?= -p COM6 -b 460800 +ESPOPTION ?= -p COM2 -b 460800 # SPI_SPEED = 40MHz or 80MHz SPI_SPEED?=80 diff --git a/README.md b/README.md index 9a0f452..65924a4 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,11 @@ # esp8266web -Small WEB server on ESP8266 + TCP2UART or Modbus RS-485 +Small WEB server on ESP8266 + TCP2UART (server/client) --- HTTP-Web supports more than hundred variables -
All I/O, Wifi, system, ... variables.
GET/POST/websocket, cookie, load/upload data/Flash, multipart/form-data,...
TCP2UART: 300..3000000 Baud, Flow Control On/Off, Inverse On/Of all signals, ...
-RS-485: half-duplex 300..1000000 Baud
HTTP-Web services to more than 10 simultaneous open connections.
Websocket open uri: '/web.cgi'
@@ -18,8 +17,6 @@ Sends 14-bit samples at 1 Hz .. 48 kHz ([max 192 kHz 12 bits](https://github.co Modbus TCP port 502:
GPIOs, ADC, VDD.
-RS-485 chematics: -![SCH](https://github.com/pvvx/esp8266web/blob/master/ESP-01_RS-485_sch.gif) Supported options 48 kbytes IRAM.
Supported '[Rapid Loader](https://github.com/pvvx/Rapid_Loader/)' and Flash 512 кbytes - 16 Mbytes.
@@ -51,17 +48,12 @@ Upload WEBFS:
2) Explorer: http://192.168.4.1/fsupload (name and password from WiFi AP)
3) Select WEBFiles.bin file. Upload.
-Для компиляции SDK используется [Unofficial Developer Kit](http://esp8266.ru/forum/forums/devkit/).

-Переключение проекта с TCP2UART на MODBUS RS-485 производится в include/user_config.h.
-Файлы для web-диска для проектов находятся в разных папках.
-Желательно переместить используемые для проекта в папку WEBFiles.
-Но возможно использование и make_webfs_rs485.bat или make_webfs_tcp2uart.bat.
+[Forum esp8266web Web_Base](http://esp8266.ru/forum/threads/razrabotka-biblioteki-malogo-webservera-na-esp8266.56/) + +Для компиляции SDK используется [Unofficial Developer Kit](http://esp8266.ru/forum/forums/devkit/).
В Eclipse заданы 3 опции Manage Configurations:
1. AutoMake (собрать проект для прошивки, используются установки в Eclipse)
2. CreateLib (собрать библиотеку libsdk.a (meSDK), используются установки в Eclipse)
3. Default (собрать проект для прошивки, используя makefile)
- -[Forum esp8266web Web_Base](http://esp8266.ru/forum/threads/razrabotka-biblioteki-malogo-webservera-na-esp8266.56/) -[Forum Modbus TCP / RTU RS-485 + WEB server](http://esp8266.ru/forum/threads/modbus-tcp-rtu-rs-485-web-server.911/) diff --git a/WEBFilesRS485/$js.inc b/WEBFilesRS485/$js.inc deleted file mode 100644 index 515a2a2..0000000 --- a/WEBFilesRS485/$js.inc +++ /dev/null @@ -1 +0,0 @@ -var $ = function(id){return document.getElementById(id);} \ No newline at end of file diff --git a/WEBFilesRS485/404.htm b/WEBFilesRS485/404.htm deleted file mode 100644 index 01aae58..0000000 --- a/WEBFilesRS485/404.htm +++ /dev/null @@ -1,14 +0,0 @@ - - - - 404 - Page not found - - - -

ESP8266 Built-in Web server ©

-
-

404 - Page not found

-

Sorry, the page you are requesting was not found on this server.

-
-~inc:footer.inc~ - \ No newline at end of file diff --git a/WEBFilesRS485/adc.htm b/WEBFilesRS485/adc.htm deleted file mode 100644 index a4e492c..0000000 --- a/WEBFilesRS485/adc.htm +++ /dev/null @@ -1,10 +0,0 @@ -~inc:grfx1.inc~ -ADC: ? - -~inc:grfx2.inc~ \ No newline at end of file diff --git a/WEBFilesRS485/adc.xml b/WEBFilesRS485/adc.xml deleted file mode 100644 index 743eebc..0000000 --- a/WEBFilesRS485/adc.xml +++ /dev/null @@ -1 +0,0 @@ -ADC~sys_adc~ \ No newline at end of file diff --git a/WEBFilesRS485/disk_er1.htm b/WEBFilesRS485/disk_er1.htm deleted file mode 100644 index 74a19e5..0000000 --- a/WEBFilesRS485/disk_er1.htm +++ /dev/null @@ -1,5 +0,0 @@ -~inc:timer.inc~ -

Image Corrupt or Wrong Version!

- -~inc:footer.inc~ - \ No newline at end of file diff --git a/WEBFilesRS485/disk_er2.htm b/WEBFilesRS485/disk_er2.htm deleted file mode 100644 index 65e5a15..0000000 --- a/WEBFilesRS485/disk_er2.htm +++ /dev/null @@ -1,5 +0,0 @@ -~inc:timer.inc~ -

File to big in flash!

- -~inc:footer.inc~ - \ No newline at end of file diff --git a/WEBFilesRS485/disk_er3.htm b/WEBFilesRS485/disk_er3.htm deleted file mode 100644 index 31552cb..0000000 --- a/WEBFilesRS485/disk_er3.htm +++ /dev/null @@ -1,5 +0,0 @@ -~inc:timer.inc~ -

Bad file!

- -~inc:footer.inc~ - \ No newline at end of file diff --git a/WEBFilesRS485/disk_ok.htm b/WEBFilesRS485/disk_ok.htm deleted file mode 100644 index 05e8f52..0000000 --- a/WEBFilesRS485/disk_ok.htm +++ /dev/null @@ -1,5 +0,0 @@ -~inc:timer.inc~ -

Update Successful!

- -~inc:footer.inc~ - \ No newline at end of file diff --git a/WEBFilesRS485/esp.gif b/WEBFilesRS485/esp.gif deleted file mode 100644 index 2d22546..0000000 Binary files a/WEBFilesRS485/esp.gif and /dev/null differ diff --git a/WEBFilesRS485/favicon.ico b/WEBFilesRS485/favicon.ico deleted file mode 100644 index 8c3e438..0000000 Binary files a/WEBFilesRS485/favicon.ico and /dev/null differ diff --git a/WEBFilesRS485/footer.inc b/WEBFilesRS485/footer.inc deleted file mode 100644 index 5f7ef1b..0000000 --- a/WEBFilesRS485/footer.inc +++ /dev/null @@ -1,5 +0,0 @@ -
- Version: ~sys_sysver~.
- Modbus TCP Connection: ~mdb_remote~, WEB Connection: ~web_remote~
-
-
(c) 2014..2015 by esp8266.ru
\ No newline at end of file diff --git a/WEBFilesRS485/grf.js b/WEBFilesRS485/grf.js deleted file mode 100644 index bf2669e..0000000 --- a/WEBFilesRS485/grf.js +++ /dev/null @@ -1,613 +0,0 @@ -; -(function(exports) { - var Util = { - extend : function() { - arguments[0] = arguments[0] || {}; - for (var i = 1; i < arguments.length; i++) { - for ( var key in arguments[i]) { - if (arguments[i].hasOwnProperty(key)) { - if (typeof (arguments[i][key]) === 'object') { - if (arguments[i][key] instanceof Array) { - arguments[0][key] = arguments[i][key] - } else { - arguments[0][key] = Util.extend( - arguments[0][key], arguments[i][key]) - } - } else { - arguments[0][key] = arguments[i][key] - } - } - } - } - return arguments[0] - } - }; - function TimeSeries(options) { - this.options = Util.extend({}, TimeSeries.defaultOptions, options); - this.clear() - } - TimeSeries.defaultOptions = { - resetBoundsInterval : 3000, - resetBounds : true - }; - TimeSeries.prototype.clear = function() { - this.data = []; - this.maxValue = Number.NaN; - this.minValue = Number.NaN - }; - TimeSeries.prototype.resetBounds = function() { - if (this.data.length) { - this.maxValue = this.data[0][1]; - this.minValue = this.data[0][1]; - for (var i = 1; i < this.data.length; i++) { - var value = this.data[i][1]; - if (value > this.maxValue) { - this.maxValue = value - } - if (value < this.minValue) { - this.minValue = value - } - } - } else { - this.maxValue = Number.NaN; - this.minValue = Number.NaN - } - }; - TimeSeries.prototype.append = function(timestamp, value, - sumRepeatedTimeStampValues) { - var i = this.data.length - 1; - while (i >= 0 && this.data[i][0] > timestamp) { - i-- - } - if (i === -1) { - this.data.splice(0, 0, [ timestamp, value ]) - } else if (this.data.length > 0 && this.data[i][0] === timestamp) { - if (sumRepeatedTimeStampValues) { - this.data[i][1] += value; - value = this.data[i][1] - } else { - this.data[i][1] = value - } - } else if (i < this.data.length - 1) { - this.data.splice(i + 1, 0, [ timestamp, value ]) - } else { - this.data.push([ timestamp, value ]) - } - this.maxValue = isNaN(this.maxValue) ? value : Math.max(this.maxValue, - value); - this.minValue = isNaN(this.minValue) ? value : Math.min(this.minValue, - value) - }; - TimeSeries.prototype.dropOldData = function(oldestValidTime, - maxDataSetLength) { - var removeCount = 0; - while (this.data.length - removeCount >= maxDataSetLength - && this.data[removeCount + 1][0] < oldestValidTime) { - removeCount++ - } - if (removeCount !== 0) { - this.data.splice(0, removeCount) - } - }; - function SmoothieChart(options) { - this.options = Util.extend({}, SmoothieChart.defaultChartOptions, - options); - this.seriesSet = []; - this.currentValueRange = 1; - this.currentVisMinValue = 0; - this.lastRenderTimeMillis = 0 - } - SmoothieChart.defaultChartOptions = { - millisPerPixel : 20, - enableDpiScaling : true, - yMinFormatter : function(min, precision) { - return parseFloat(min).toFixed(precision) - }, - yMaxFormatter : function(max, precision) { - return parseFloat(max).toFixed(precision) - }, - maxValueScale : 1, - interpolation : 'bezier', - scaleSmoothing : 0.125, - maxDataSetLength : 2, - grid : { - fillStyle : '#000000', - strokeStyle : '#777777', - lineWidth : 1, - sharpLines : false, - millisPerLine : 1000, - verticalSections : 2, - borderVisible : true - }, - labels : { - fillStyle : '#ffffff', - disabled : false, - fontSize : 10, - fontFamily : 'monospace', - precision : 2 - }, - horizontalLines : [] - }; - SmoothieChart.AnimateCompatibility = (function() { - var requestAnimationFrame = function(callback, element) { - var requestAnimationFrame = window.requestAnimationFrame - || window.webkitRequestAnimationFrame - || window.mozRequestAnimationFrame - || window.oRequestAnimationFrame - || window.msRequestAnimationFrame || function(callback) { - return window.setTimeout(function() { - callback(new Date().getTime()) - }, 16) - }; - return requestAnimationFrame.call(window, callback, element) - }, cancelAnimationFrame = function(id) { - var cancelAnimationFrame = window.cancelAnimationFrame - || function(id) { - clearTimeout(id) - }; - return cancelAnimationFrame.call(window, id) - }; - return { - requestAnimationFrame : requestAnimationFrame, - cancelAnimationFrame : cancelAnimationFrame - } - })(); - SmoothieChart.defaultSeriesPresentationOptions = { - lineWidth : 1, - strokeStyle : '#ffffff' - }; - SmoothieChart.prototype.addTimeSeries = function(timeSeries, options) { - this.seriesSet.push({ - timeSeries : timeSeries, - options : Util.extend({}, - SmoothieChart.defaultSeriesPresentationOptions, options) - }); - if (timeSeries.options.resetBounds - && timeSeries.options.resetBoundsInterval > 0) { - timeSeries.resetBoundsTimerId = setInterval(function() { - timeSeries.resetBounds() - }, timeSeries.options.resetBoundsInterval) - } - }; - SmoothieChart.prototype.removeTimeSeries = function(timeSeries) { - var numSeries = this.seriesSet.length; - for (var i = 0; i < numSeries; i++) { - if (this.seriesSet[i].timeSeries === timeSeries) { - this.seriesSet.splice(i, 1); - break - } - } - if (timeSeries.resetBoundsTimerId) { - clearInterval(timeSeries.resetBoundsTimerId) - } - }; - SmoothieChart.prototype.getTimeSeriesOptions = function(timeSeries) { - var numSeries = this.seriesSet.length; - for (var i = 0; i < numSeries; i++) { - if (this.seriesSet[i].timeSeries === timeSeries) { - return this.seriesSet[i].options - } - } - }; - SmoothieChart.prototype.bringToFront = function(timeSeries) { - var numSeries = this.seriesSet.length; - for (var i = 0; i < numSeries; i++) { - if (this.seriesSet[i].timeSeries === timeSeries) { - var set = this.seriesSet.splice(i, 1); - this.seriesSet.push(set[0]); - break - } - } - }; - SmoothieChart.prototype.streamTo = function(canvas, delayMillis) { - this.canvas = canvas; - this.delay = delayMillis; - this.start() - }; - SmoothieChart.prototype.start = function() { - if (this.frame) { - return - } - if (this.options.enableDpiScaling && window - && window.devicePixelRatio !== 1) { - var canvasWidth = this.canvas.getAttribute('width'); - var canvasHeight = this.canvas.getAttribute('height'); - this.canvas.setAttribute('width', canvasWidth - * window.devicePixelRatio); - this.canvas.setAttribute('height', canvasHeight - * window.devicePixelRatio); - this.canvas.style.width = canvasWidth + 'px'; - this.canvas.style.height = canvasHeight + 'px'; - this.canvas.getContext('2d').scale(window.devicePixelRatio, - window.devicePixelRatio) - } - var animate = function() { - this.frame = SmoothieChart.AnimateCompatibility - .requestAnimationFrame(function() { - this.render(); - animate() - }.bind(this)) - }.bind(this); - animate() - }; - SmoothieChart.prototype.stop = function() { - if (this.frame) { - SmoothieChart.AnimateCompatibility.cancelAnimationFrame(this.frame); - delete this.frame - } - }; - SmoothieChart.prototype.updateValueRange = function() { - var chartOptions = this.options, chartMaxValue = Number.NaN, chartMinValue = Number.NaN; - for (var d = 0; d < this.seriesSet.length; d++) { - var timeSeries = this.seriesSet[d].timeSeries; - if (!isNaN(timeSeries.maxValue)) { - chartMaxValue = !isNaN(chartMaxValue) ? Math.max(chartMaxValue, - timeSeries.maxValue) : timeSeries.maxValue - } - if (!isNaN(timeSeries.minValue)) { - chartMinValue = !isNaN(chartMinValue) ? Math.min(chartMinValue, - timeSeries.minValue) : timeSeries.minValue - } - } - if (chartOptions.maxValue != null) { - chartMaxValue = chartOptions.maxValue - } else { - chartMaxValue *= chartOptions.maxValueScale - } - if (chartOptions.minValue != null) { - chartMinValue = chartOptions.minValue - } - if (this.options.yRangeFunction) { - var range = this.options.yRangeFunction({ - min : chartMinValue, - max : chartMaxValue - }); - chartMinValue = range.min; - chartMaxValue = range.max - } - if (!isNaN(chartMaxValue) && !isNaN(chartMinValue)) { - var targetValueRange = chartMaxValue - chartMinValue; - var valueRangeDiff = (targetValueRange - this.currentValueRange); - var minValueDiff = (chartMinValue - this.currentVisMinValue); - this.isAnimatingScale = Math.abs(valueRangeDiff) > 0.1 - || Math.abs(minValueDiff) > 0.1; - this.currentValueRange += chartOptions.scaleSmoothing - * valueRangeDiff; - this.currentVisMinValue += chartOptions.scaleSmoothing - * minValueDiff - } - this.valueRange = { - min : chartMinValue, - max : chartMaxValue - } - }; - SmoothieChart.prototype.render = function(canvas, time) { - var nowMillis = new Date().getTime(); - if (!this.isAnimatingScale) { - var maxIdleMillis = Math.min(1000 / 6, this.options.millisPerPixel); - if (nowMillis - this.lastRenderTimeMillis < maxIdleMillis) { - return - } - } - this.lastRenderTimeMillis = nowMillis; - canvas = canvas || this.canvas; - time = time || nowMillis - (this.delay || 0); - time -= time % this.options.millisPerPixel; - var context = canvas.getContext('2d'), chartOptions = this.options, dimensions = { - top : 0, - left : 0, - width : canvas.clientWidth, - height : canvas.clientHeight - }, oldestValidTime = time - - (dimensions.width * chartOptions.millisPerPixel), valueToYPixel = function( - value) { - var offset = value - this.currentVisMinValue; - return this.currentValueRange === 0 ? dimensions.height - : dimensions.height - - (Math.round((offset / this.currentValueRange) - * dimensions.height)) - }.bind(this), timeToXPixel = function(t) { - return Math.round(dimensions.width - - ((time - t) / chartOptions.millisPerPixel)) - }; - this.updateValueRange(); - context.font = chartOptions.labels.fontSize + 'px ' - + chartOptions.labels.fontFamily; - context.save(); - context.translate(dimensions.left, dimensions.top); - context.beginPath(); - context.rect(0, 0, dimensions.width, dimensions.height); - context.clip(); - context.save(); - context.fillStyle = chartOptions.grid.fillStyle; - context.clearRect(0, 0, dimensions.width, dimensions.height); - context.fillRect(0, 0, dimensions.width, dimensions.height); - context.restore(); - context.save(); - context.lineWidth = chartOptions.grid.lineWidth; - context.strokeStyle = chartOptions.grid.strokeStyle; - if (chartOptions.grid.millisPerLine > 0) { - context.beginPath(); - for (var t = time - (time % chartOptions.grid.millisPerLine); t >= oldestValidTime; t -= chartOptions.grid.millisPerLine) { - var gx = timeToXPixel(t); - if (chartOptions.grid.sharpLines) { - gx -= 0.5 - } - context.moveTo(gx, 0); - context.lineTo(gx, dimensions.height) - } - context.stroke(); - context.closePath() - } - for (var v = 1; v < chartOptions.grid.verticalSections; v++) { - var gy = Math.round(v * dimensions.height - / chartOptions.grid.verticalSections); - if (chartOptions.grid.sharpLines) { - gy -= 0.5 - } - context.beginPath(); - context.moveTo(0, gy); - context.lineTo(dimensions.width, gy); - context.stroke(); - context.closePath() - } - if (chartOptions.grid.borderVisible) { - context.beginPath(); - context.strokeRect(0, 0, dimensions.width, dimensions.height); - context.closePath() - } - context.restore(); - if (chartOptions.horizontalLines && chartOptions.horizontalLines.length) { - for (var hl = 0; hl < chartOptions.horizontalLines.length; hl++) { - var line = chartOptions.horizontalLines[hl], hly = Math - .round(valueToYPixel(line.value)) - 0.5; - context.strokeStyle = line.color || '#ffffff'; - context.lineWidth = line.lineWidth || 1; - context.beginPath(); - context.moveTo(0, hly); - context.lineTo(dimensions.width, hly); - context.stroke(); - context.closePath() - } - } - for (var d = 0; d < this.seriesSet.length; d++) { - context.save(); - var timeSeries = this.seriesSet[d].timeSeries, dataSet = timeSeries.data, seriesOptions = this.seriesSet[d].options; - timeSeries.dropOldData(oldestValidTime, - chartOptions.maxDataSetLength); - context.lineWidth = seriesOptions.lineWidth; - context.strokeStyle = seriesOptions.strokeStyle; - context.beginPath(); - var firstX = 0, lastX = 0, lastY = 0; - for (var i = 0; i < dataSet.length && dataSet.length !== 1; i++) { - var x = timeToXPixel(dataSet[i][0]), y = valueToYPixel(dataSet[i][1]); - if (i === 0) { - firstX = x; - context.moveTo(x, y) - } else { - switch (chartOptions.interpolation) { - case "linear": - case "line": { - context.lineTo(x, y); - break - } - case "bezier": - default: { - context.bezierCurveTo(Math.round((lastX + x) / 2), - lastY, Math.round((lastX + x)) / 2, y, x, y); - break - } - case "step": { - context.lineTo(x, lastY); - context.lineTo(x, y); - break - } - } - } - lastX = x; - lastY = y - } - if (dataSet.length > 1) { - if (seriesOptions.fillStyle) { - context.lineTo(dimensions.width + seriesOptions.lineWidth - + 1, lastY); - context.lineTo(dimensions.width + seriesOptions.lineWidth - + 1, dimensions.height + seriesOptions.lineWidth - + 1); - context.lineTo(firstX, dimensions.height - + seriesOptions.lineWidth); - context.fillStyle = seriesOptions.fillStyle; - context.fill() - } - if (seriesOptions.strokeStyle - && seriesOptions.strokeStyle !== 'none') { - context.stroke() - } - context.closePath() - } - context.restore() - } - if (!chartOptions.labels.disabled && !isNaN(this.valueRange.min) - && !isNaN(this.valueRange.max)) { - var maxValueString = chartOptions.yMaxFormatter( - this.valueRange.max, chartOptions.labels.precision), minValueString = chartOptions - .yMinFormatter(this.valueRange.min, - chartOptions.labels.precision); - context.fillStyle = chartOptions.labels.fillStyle; - context.fillText(maxValueString, dimensions.width - - context.measureText(maxValueString).width - 2, - chartOptions.labels.fontSize); - context.fillText(minValueString, dimensions.width - - context.measureText(minValueString).width - 2, - dimensions.height - 2) - } - if (chartOptions.timestampFormatter - && chartOptions.grid.millisPerLine > 0) { - var textUntilX = dimensions.width - - context.measureText(minValueString).width + 4; - for (var t = time - (time % chartOptions.grid.millisPerLine); t >= oldestValidTime; t -= chartOptions.grid.millisPerLine) { - var gx = timeToXPixel(t); - if (gx < textUntilX) { - var tx = new Date(t), ts = chartOptions - .timestampFormatter(tx), tsWidth = context - .measureText(ts).width; - textUntilX = gx - tsWidth - 2; - context.fillStyle = chartOptions.labels.fillStyle; - context.fillText(ts, gx - tsWidth, dimensions.height - 2) - } - } - } - context.restore() - }; - SmoothieChart.timeFormatter = function(date) { - function pad2(number) { - return (number < 10 ? '0' : '') + number - } - return pad2(date.getHours()) + ':' + pad2(date.getMinutes()) + ':' - + pad2(date.getSeconds()) - }; - exports.TimeSeries = TimeSeries; - exports.SmoothieChart = SmoothieChart -})(typeof exports === 'undefined' ? this : exports); -var line1 = new TimeSeries(); -var newval = 0; -function addpoint(xmlData) { - if (xmlData) { - newval = eval(getXMLValue(xmlData, 'value')); - line1.append(new Date().getTime(), newval); - document.getElementById('xdata').innerHTML = newval; - if (newval > xmax) - document.getElementById('xdata').style.color = '#0000A0'; - else if (newval < xmin) - document.getElementById('xdata').style.color = '#A00000'; - else - document.getElementById('xdata').style.color = '#00A000' - } else - line1.append(new Date().getTime(), newval) -} -var smoothie = new SmoothieChart({ - interpolation : 'linear', - minValue : 0, - millisPerPixel : millisPerPixel, - grid : { - strokeStyle : 'rgb(100, 110, 150)', - fillStyle : 'rgb(50, 55, 75)', - lineWidth : 1, - millisPerLine : millisPerLine, - verticalSections : 6 - }, - labels : { - precision : 0 - } -}); -smoothie.addTimeSeries(line1, { - strokeStyle : 'rgb(255, 0, 200)', - fillStyle : 'rgba(255, 0, 200, 0.3)', - lineWidth : 3 -}); -smoothie.streamTo(document.getElementById("mycanvas"), nextimeout); -setTimeout("newAJAXCommand(xmlfile, addpoint, true)", 100); -function slider(elemId, sliderWidth, range1, range2, step) { - var knobWidth = 17; - var knobHeight = 21; - var sliderHeight = 21; - var offsX, tmp; - var d = document; - var isIE = d.all || window.opera; - var point = (sliderWidth - knobWidth - 3) / (range2 - range1); - var slider = d.createElement('DIV'); - slider.id = elemId + '_slider'; - slider.className = 'slider'; - d.getElementById(elemId).appendChild(slider); - var knob = d.createElement('DIV'); - knob.id = elemId + '_knob'; - knob.className = 'knob'; - slider.appendChild(knob); - knob.style.left = 0; - knob.style.width = knobWidth + 'px'; - knob.style.height = knobHeight + 'px'; - slider.style.width = sliderWidth + 'px'; - slider.style.height = sliderHeight + 'px'; - var sliderOffset = slider.offsetLeft; - tmp = slider.offsetParent; - while (tmp.tagName != 'BODY') { - sliderOffset += tmp.offsetLeft; - tmp = tmp.offsetParent - } - if (isIE) { - knob.onmousedown = startCoord; - slider.onclick = sliderClick; - knob.onmouseup = endCoord; - slider.onmouseup = endCoord - } else { - knob.addEventListener("mousedown", startCoord, true); - slider.addEventListener("click", sliderClick, true); - knob.addEventListener("mouseup", endCoord, true); - slider.addEventListener("mouseup", endCoord, true) - } - function setValue(x) { - if (x < 0) - knob.style.left = 0; - else if (x > sliderWidth - knobWidth - 3) - knob.style.left = (sliderWidth - 3 - knobWidth) + 'px'; - else { - if (step == 0) - knob.style.left = x + 'px'; - else - knob.style.left = Math.round(x / (step * point)) * step * point - + 'px' - } - nextimeout = getValue(); - d.getElementById('toutid').value = nextimeout; - document.getElementById('toutid').innerHTML = nextimeout - } - function setValue2(x) { - if (x < range1 || x > range2) - alert('Value is not included into a slider range!'); - else - setValue((x - range1) * point); - nextimeout = getValue(); - d.getElementById('toutid').value = nextimeout; - document.getElementById('toutid').innerHTML = nextimeout - } - function getValue() { - return Math.round(parseInt(knob.style.left) / point) + range1 - } - function sliderClick(e) { - var x; - if (isIE) { - if (event.srcElement != slider) - return; - x = event.offsetX - Math.round(knobWidth / 2) - } else - x = e.pageX - sliderOffset - knobWidth / 2; - setValue(x) - } - function startCoord(e) { - if (isIE) { - offsX = event.clientX - parseInt(knob.style.left); - slider.onmousemove = mov - } else { - slider.addEventListener("mousemove", mov, true) - } - } - function mov(e) { - var x; - if (isIE) - x = event.clientX - offsX; - else - x = e.pageX - sliderOffset - knobWidth / 2; - setValue(x) - } - function endCoord() { - if (isIE) - slider.onmousemove = null; - else - slider.removeEventListener("mousemove", mov, true) - } - this.setValue = setValue2; - this.getValue = getValue -} -var mysl1 = new slider('sl', 333, 20, 10020, 0); -mysl1.setValue(500); -document.getElementById('toutid').innerHTML = mysl1.getValue(); \ No newline at end of file diff --git a/WEBFilesRS485/grfx1.inc b/WEBFilesRS485/grfx1.inc deleted file mode 100644 index 14fde81..0000000 --- a/WEBFilesRS485/grfx1.inc +++ /dev/null @@ -1,13 +0,0 @@ - - - - ESP8266 - - - -~inc:menu.inc~ - -
\ No newline at end of file diff --git a/WEBFilesRS485/grfx2.inc b/WEBFilesRS485/grfx2.inc deleted file mode 100644 index 30b1323..0000000 --- a/WEBFilesRS485/grfx2.inc +++ /dev/null @@ -1,6 +0,0 @@ -
-
GET TimeOuts ? ms'
-
- - -~inc:footer.inc~ diff --git a/WEBFilesRS485/heap.htm b/WEBFilesRS485/heap.htm deleted file mode 100644 index 1cf6850..0000000 --- a/WEBFilesRS485/heap.htm +++ /dev/null @@ -1,9 +0,0 @@ -~inc:grfx1.inc~ -Heap Size: ? bytes -~inc:grfx2.inc~ diff --git a/WEBFilesRS485/heap.xml b/WEBFilesRS485/heap.xml deleted file mode 100644 index edc3199..0000000 --- a/WEBFilesRS485/heap.xml +++ /dev/null @@ -1 +0,0 @@ -Heap Size~sys_heap~ \ No newline at end of file diff --git a/WEBFilesRS485/help/webvars.files/filelist.xml b/WEBFilesRS485/help/webvars.files/filelist.xml deleted file mode 100644 index 3483a55..0000000 --- a/WEBFilesRS485/help/webvars.files/filelist.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/WEBFilesRS485/help/webvars.files/sheet001.htm b/WEBFilesRS485/help/webvars.files/sheet001.htm deleted file mode 100644 index 6fe67cf..0000000 --- a/WEBFilesRS485/help/webvars.files/sheet001.htm +++ /dev/null @@ -1,2005 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
inc:filename  (include). - 3-.
filename - , .
( )
startstart=hdhd 32- - dec hex . hex .
stopstop=hdhd 32- - dec hex . hex .
xml_mdb  16 - Modbus xml <maddr>data</maddr>. - start, stop. unsigned dec .
xml_mdbs  16 - Modbus xml <maddr>data</maddr>. - start, stop. signed dec - .
xml_mdbh  16 - Modbus xml <maddr>data</maddr>. - start, stop. hex - '0x'.
xml_mdbx  16 - Modbus xml <maddr>data</maddr>. - start, stop. hex - c '0x'.
xml_ram  32- - start start 4. hex .
hexdmpb  - hex . start, stop.
hexdmpd  - hex dword . start, stop.
 hexdmpbaddr=len - hex web.cgi. addr - , len -, 16. dec hex .
: - web.cgi?hexdmpb0x40000000=0x100
 hexdmpbaddr=len dword - web.cgi. addr - , len -, 16. dec hex .
: - web.cgi?hexdmpd0x40000000=0x100
bin_mdb  - modbus. - - web init.ini - mdbfini=__
bin_ram  ram - i/o. addr - , len - .
bin_flash  Flash. addr - , len - .
bin_flash_all  Flash
bin_flash_sec_num  num Flash (4)
bin_flash_disk  - Flash.
bin_flash_const  - Flash (128 )
sys_cid  hip ID. : 0099ad1d
sys_fid  Flash ID. : 001340c8
sys_fsize  Flash - dec .
sys_sdkver  - SDK. : 1.4.1
sys_sysver  . - : 0.5.1
sys_webver  Web. - : 0.1.4
sys_heap  - heap dec .
sys_adc  ADC 16 - dec .
sys_time  - , 32 , dec .
sys_rtctime  RTC, RTC - (~5.75us), 32 , dec .
sys_mactime  - , 64 , hex .
sys_vdd33  - , ADC. - . . - sys_uconst_0.
sys_wdt  WDT
sys_res_event  :
1 - power/ch_pd, 2 - reset, 3 - - software, 4 - wdt ...
sys_rst  : - system_get_rst_info()
sys_clkcpusys_clkcpu=XMHz CLK CPU MHz. XMHz 80 160 MHz.
 sys_sleep_option=nn - - deep-sleep.
. - system_deep_sleep_set_option(n)
 sys_sleep_us=x deep_sleep - x .
sys_sleep_old  - deep-sleep.
RTC - deep-sleep / - , ( ).
sys_resetsys_reset=12345 - CPU.
sys_restartsys_restart=12345 - system_restart().
sys_ramaddrsys_ramaddr=val 32- - addr hex - . addr - 4-. addr - hex dec .
val 32- - hex dec .
sys_rdecaddr  32- - addr dec - . addr 4-. addr hex dec - .
sys_ip  IP , - .
sys_url  url, - , WiFi.
sys_debugsys_debug=x - TX UART1 (GPIO2).
x =0 - , =1 .
sys_vdd  - . ( sys_const_107).
sys_netbios  NETBIOS, AP - A, ST S.
sys_const_numsys_const_num=x - esp_init_data_default.bin. num - 0 127 - esp_init_data_default.bin. num hex dec . 8 dec .
x 8 - dec - hex
sys_const_faddr  - esp_init_data_default.bin. 0x00007C00
sys_ucnst_numsys_ucnst_num=x4- 32- - . num - hex dec 0 3 . dec .
x 32 - - dec hex
SNTP
sntp_time  SNTP. =0, - SNTP .
WiFi
wifi_modewifi_mode=xwifi_get_opmode()
wifi_phywifi_phy=xwifi_get_phy_mode()
wifi_sleepwifi_sleep=xwifi_get_sleep_type()
wifi_maxpwwifi_maxpw=xsystem_phy_set_max_tpw()
wifi_vddpwwifi_vddpw=xsystem_phy_set_tpw_via_vdd33(x)
wifi_rfoptwifi_rfopt=xsystem_phy_set_rfoption(x)
wifi_scanwifi_scan=1 scan - xml, .
 wifi_aps_cnt=n - - wifi_station_ap_number_set(n)
wifi_aps_idwifi_aps_id=nwifi_station_get_current_ap_id(), - wifi_station_ap_change(n)
wifi_aps_xml  aps - xml
wifi_prrq_xml  Probe - Request xml
wifi_rdcfgwifi_rdcfg=mask WiFi - .
wifi_rdcfg .
wifi_newcfgwifi_newcfg=mask WiFi - flash .
wifi_newcfg , - flash .
 wifi_read=mask WiFi flash - .
 wifi_save=mask WiFi - WiFi flash.
WiFi STATION
wifi_st_aucnwifi_st_aucn=x/ - -
wifi_st_rectwifi_st_rect =sec -. 0..8192 -
wifi_st_dhcpwifi_st_dhcp=xDHCP /
wifi_st_ipwifi_st_sip=ipIP
wifi_st_mskwifi_st_msk=mask_ip IP
wifi_st_gwwifi_st_gw=gateway_ipGateway
wifi_st_macwifi_st_mac=macMAC
wifi_st_ssidwifi_st_ssid=ssidSSID
wifi_st_pswwifi_st_psw=password, 8
wifi_st_bssidwifi_st_bssid= bssidBSSID
wifi_st_sbsswifi_st_sbss=nBSSID on/off
wifi_st_hostnamewifi_st_hostname=hostnameHost Name
wifi_st_rssi RSSI
wifi_st_sta wifi_station_get_connect_status()
WiFi SOFT AP
wifi_ap_dhcpwifi_st_dhcp=xDNCP /
wifi_ap_sipwifi_st_sip=start_ipDHCP IP
wifi_ap_eipwifi_st_eip=end_ipDHCP IP
wifi_ap_mskwifi_st_msk=mask_ipDHCP IP
wifi_ap_gwwifi_st_gw=gateway_ipGateway
wifi_ap_macwifi_st_mac=macMAC
wifi_ap_ssidwifi_st_ssid=ssidSSID
wifi_ap_hssidwifi_ap_hssid=nSSID hidden
wifi_ap_pswwifi_st_psw=password, 8
wifi_ap_authwifi_ap_auth=nAuth mode
wifi_ap_bintwifi_ap_bint=nBeacon interval 100..60000 ms
wifi_ap_chlwifi_ap_chl=nChannel
wifi_ap_mcnswifi_ap_mcns=nMax connections
Modbus RTU RS-485
rs485_baudrs485_baud=xBaud rate RS-485
x 300 - 3 000 000.
rs485_pausers485_pause=x - / , x = 065535
rs485_timeoutrs485_timeout=x / - , x = 365535
rs485_parityrs485_parity=x0 - none (2 ), 1 - none (2 - ), 2 - even, 3 - odd
rs485_pinrers485_pinre=n GPIOn .
rs485_swaprs485_swap=n0 - RX = GPIO3 TX = GPIO 1, 1 - - RX = GPIO13 TX = GPIO 15.
rs485_spdtwrs485_spdtw=n0 - - 19200 baud = 1750
1 - 3.5
 rs485_save=n RS-485, n -
 rs485_read=n RS-485, n -
 rs485_start=n RS-485, n -
 rs485_stop=n RS-485, n -
rs485_masterrs485_master=n0 - modbus - RS-485 slave, 1 - master.
rs485_enable 0 - , 1 - - .
WEB server
web_remote  IP:Port
web_host  IP:Port
Modbus
 mdbfini=__ - - modbus c web . init.ini.
mdb_remote  IP:Port , - closed
mdb_host  IP:Port, - none
mdb_trna  -
mdb_trns  -
mdbudaddr  dword unsigned, addr - (dec hex)
mdbsdaddr  dword signed, addr - (dec hex)
mdbhdaddr  dword hex '0x', addr - (dec hex)
mdbxdaddr  dword hex c '0x', addr - (dec hex)
mdbuwaddr  word unsigned, addr - (dec hex)
mdbswaddr  word signed, addr - (dec hex)
mdbhwaddr  dword hex '0x', addr - (dec hex)
mdbxwaddr  dword hex c '0x', addr - (dec hex)
 mdbwaddr=x,x,x word x (dec hex) c addr (dec hex)
 mdbdaddr=x,x,x, dword x (dec hex) c addr (dec hex)
 mdbtn=x,x,x, - n, dec hex.
mdbaaddrmdbaaddr=stirng/ ( 32- ),
addr - - (dec hex)
Web File System
wfs_files -
wfs_addr 32- - Flash, hex
wfs_size 32- - Flash, dec
wfs_max_size 32- - Flash, dec
GPIO
gpio_inpgpio_inp=x GPIO0..GPIO15 - 16 . dec - .
x 16 - - dec hex .
gpio_outgpio_out=x - GPIO0..GPIO15 16 . dec .
x 16 - - dec hex .
gpio_dirgpio_dir=x ( =1 , =0 - ) GPIO0..GPIO15 16 . dec .
x 16 - - dec hex .
 gpio_ena=x - GPIOn - .
x = 16 - - dec hex.
n - GPIO: 0..15
 gpio_dis=x - GPIOn .
x = 16 - - dec hex.
n - GPIO: 0..15
gpion_inp  GPIOn, 0 1.
n - GPIO: 0..15
gpion_outgpion_out=x/ - GPIOn.
x =0 - - 0, =1 - 1, =3 - .
n - GPIO: 0..15
 gpion_clr=x/ 0 - GPIOn,
x - 0 1.
n - GPIO: 0..15
 gpion_set=x/ 1 GPIOn,
x - 0 1.
n - GPIO: 0..15
gpion_dirgpion_dir=x/ - GPIOn.
x =1 - - , =0 - .
n - GPIO: 0..15
 gpion_ena=any - GPIOn
n - GPIO: 0..15
 gpion_dis=any - GPIOn
n - GPIO: 0..15
gpion_fungpion_fun=fun/ GPIOn.
fun = 0..5
n - GPIO: 0..15
gpion_pull  pull GPIOn.
x =0 - , - =2 - pullup, =1 pulldown ( )
n - GPIO: 0..15
gpion_opdgpion_opd=x/ - GPIOn.
x =0 - , - =1 , =3 - .
n - GPIO: 0..15
gpion_pugpion_pu=x/ pullup GPIOn.
x =0 - , - =1 , =3 - .
n - GPIO: 0..15
gpion_pdgpion_pd=x/ pulldown GPIOn ( ).
x =0 - , - =1 , =3 - .
n - GPIO: 0..15
 gpion_io=any GPIOn i/o port.
n - GPIO: 0..15
 gpion_def=any GPIOn SDK.
n - GPIO: 0..15
 gpion_sgs=duty GPIOn sigma-delta 312
duty - duty 0 255.
n - GPIO: 0..15
 gpion_sg=any GPIOn sigma-delta 312
n - GPIO: 0..15
 gpio_sgn=duty duty sigma-delta 312
duty - duty 0 255.
cfg_web_portcfg_web_port=n port Web . =0 -
cfg_web_twreccfg_web_twrec=n - Web , .
n =0 - -
cfg_web_twclscfg_web_twcls=n - Web , .
n =0 - -
cfg_web_twdcfg_web_twd=n TIME_WAIT - pcb
cfg_tcp_tcreccfg_tcp_tcrec=n - TCP , .
cfg_mdb_urlcfg_mdb_url=ip IP, - Modbus TCP client. ip 127.0.0.1 server.
cfg_mdb_portcfg_mdb_port=nPort Modbus TCP. =0
cfg_mdb_twreccfg_mdb_twrec=n - Modbus TCP , .
n =0 - -
cfg_mdb_twclscfg_mdb_twcls=n - Modbus TCP , .
n =0 - -
cfg_mdb_reopcfg_mdb_reop=n - Modbus TCP . =1 , =0
cfg_mdb_idcfg_mdb_id=n - ESP8266 modbus. n - 0..255
cfg_overclkcfg_overclk=n CLK CPU 160 MHz. - =1 , =0
cfg_pinclrcfg_pinclr=n WiFi - RX. =1 , =0
cfg_debugcfg_debug=n - UART1. =1 , =0
cfg_netbioscfg_netbios=n NETBIOS. =1 , =0
cfg_sntpcfg_sntp=n SNTP. =1 , =0
cfg_cdnscfg_cdns=n Capture portal. =1 , =0
 cfg_save=n .
=1 , =2 - , .
UART ( UART1 !)
uart_n_bauduart_n_baud=xBaud rate UARTn.
x 300 - 10000000.
uart_n_bitsuart_n_bits=x- UARTn.
x =0 5 - , =3 8 .
uart_n_parityuart_n_parity=xEnable Parity UARTn.
x =0 disable, =1 enable.
uart_n_evenuart_n_even=xParity UARTn.
x =0 even, =1 odd.
uart_n_stopuart_n_stop=x- UARTn.
x =1 1 - , =2 1.5 , =3 2 .
uart_n_loopbackuart_n_loopback=xEnable loopback UARTn.
x =0 disable, =1 enable.
uart_n_swapuart_n_swap=xEnable swap pin RX<->CTS, - TX<->RTS UARTn.
x =0 disable, =1 enable.
uart_n_flowuart_n_flow=xEnable flow control UARTn.
x =0 disable, =1 enable.
uart_n_rts_invuart_n_rts_inv=x RTS UARTn.
x =0 disable, =1 enable.
uart_n_cts_invuart_n_cts_inv=x CTS UARTn.
x =0 disable, =1 enable.
uart_n_rxd_invuart_n_rxd_inv=x RXD UARTn.
x =0 disable, =1 enable.
uart_n_txd_invuart_n_txd_inv=x TXD UARTn.
x =0 disable, =1 enable.
uart_n_dtr_invuart_n_dtr_inv=x DTR UARTn.
x =0 disable, =1 enable.
uart_n_dsr_invuart_n_dsr_inv=x DSR UARTn.
x =0 disable, =1 enable.
 uart_save=n UARTx
n 0 =1 - UART0, 1 - =1 UART1.
 uart_read=n - UARTx UARTx.
n 0 =1 - UART0, 1 - =1 UART1.
- - - - diff --git a/WEBFilesRS485/help/webvars.files/sheet002.htm b/WEBFilesRS485/help/webvars.files/sheet002.htm deleted file mode 100644 index 6b31b74..0000000 --- a/WEBFilesRS485/help/webvars.files/sheet002.htm +++ /dev/null @@ -1,403 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- ( )
0..999u16BUF Modbus TCP <-> Modbus RTU RS-485 <-> - WEB
0  
1000u16trn0: start_flg - ( 50 )
1001u16trn0: id/ modbus
1002u16trn0: cmd
1003u16trn0: len
1004u16trn0: ext_addr
1005u16trn0: int_addr
1006u16trn0: timer (x 50 ), - 0 -
1007u16trn0: error /
1008u16trn0: fifo
1009u16trn0: cnt
1,2,3,4,5,6,7 
1010..1079u16  10
 
110016bitGPIO_IN : 0 = GPIO0, , 15 = GPIO15
110116bitGPIO_OUT : - 0 = GPIO0, , 15 = GPIO15
110216bitGPIO_OUT_SET : 1 GPIO_OUT
110316bitGPIO_OUT_CLEAR : 1 GPIO_OUT
110416bitGPIO_ENABLE 1 : 0 = GPIO0, - , 15 = GPIO15
1105u16GPIO_NUM - ( 0 15 )
1106u16GPIO_FUNC (0..4). - GPIO_NUM.
1107u16GPIO_PULLUP +VDD (= 0 - , =1 - ). - GPIO_NUM.
1108u16GPIO_OD" " (= 0 - , =1 - ) - GPIO_NUM.
1109u16GPIO_MUX . - GPIO_NUM.
1110u16ADC ADC
1111u16VDD VDD c ADC
1112u16arg_ UserFunc UserFunc
1113u16UserFunc UserFunc ( = 1 - deep_sleep(arg_ UserFunc ))
1114u32SNTP Time SNTP, = 0 -
RS-485 
1200u32baud RS-485, 300..3 000 000 bps
1202u16parity0,1 - , 2 ; - 2 - even, 3 - odd
   0..4 - GPIO - , > 15 .
1203u16pin_ena + flg 8 - swap TXD(GPIO15<->GPIO1), - RXD(GPIO13<->GPIO3)
   9 - =0 - 19200 baud = 1750 - , =1 3.5
   10 - =0 - slave, =1 - master
1204u32timeout ms / - (), 3840 000
   0 - =1 RS-485
1206u16RS-485 func 1 - =1 Flash
    2 - =1 Flash
RTC (256 / - 512 ) 
1300u16Start RTC RAM 256 RTC RAM
1555u16End RTC RAM ( ) RTC RAM
- - - - diff --git a/WEBFilesRS485/help/webvars.files/stylesheet.css b/WEBFilesRS485/help/webvars.files/stylesheet.css deleted file mode 100644 index 490a3e4..0000000 --- a/WEBFilesRS485/help/webvars.files/stylesheet.css +++ /dev/null @@ -1,539 +0,0 @@ -tr - {mso-height-source:auto;} -col - {mso-width-source:auto;} -br - {mso-data-placement:same-cell;} -.style0 - {mso-number-format:General; - text-align:general; - vertical-align:bottom; - white-space:nowrap; - mso-rotate:0; - mso-background-source:auto; - mso-pattern:auto; - color:black; - font-size:11.0pt; - font-weight:400; - font-style:normal; - text-decoration:none; - font-family:Calibri, sans-serif; - mso-font-charset:204; - border:none; - mso-protection:locked visible; - mso-style-name:; - mso-style-id:0;} -.font0 - {color:black; - font-size:11.0pt; - font-weight:400; - font-style:normal; - text-decoration:none; - font-family:Calibri, sans-serif; - mso-font-charset:204;} -.font5 - {color:black; - font-size:11.0pt; - font-weight:400; - font-style:normal; - text-decoration:none; - font-family:Calibri, sans-serif; - mso-font-charset:204;} -.font8 - {color:black; - font-size:11.0pt; - font-weight:700; - font-style:normal; - text-decoration:none; - font-family:Calibri, sans-serif; - mso-font-charset:204;} -.font9 - {color:#0070C0; - font-size:11.0pt; - font-weight:700; - font-style:normal; - text-decoration:none; - font-family:Calibri, sans-serif; - mso-font-charset:204;} -.font11 - {color:#00B050; - font-size:11.0pt; - font-weight:400; - font-style:normal; - text-decoration:none; - font-family:Calibri, sans-serif; - mso-font-charset:204;} -.font12 - {color:#215968; - font-size:11.0pt; - font-weight:700; - font-style:normal; - text-decoration:none; - font-family:Calibri, sans-serif; - mso-font-charset:204;} -.font13 - {color:black; - font-size:9.0pt; - font-weight:400; - font-style:normal; - text-decoration:none; - font-family:Tahoma, sans-serif; - mso-font-charset:204;} -.font14 - {color:black; - font-size:10.5pt; - font-weight:400; - font-style:normal; - text-decoration:none; - font-family:Tahoma, sans-serif; - mso-font-charset:204;} -.font15 - {color:#215868; - font-size:11.0pt; - font-weight:700; - font-style:normal; - text-decoration:none; - font-family:Calibri, sans-serif; - mso-font-charset:204;} -.font16 - {color:#366092; - font-size:11.0pt; - font-weight:700; - font-style:normal; - text-decoration:none; - font-family:Calibri, sans-serif; - mso-font-charset:204;} -.font17 - {color:#215968; - font-size:11.0pt; - font-weight:400; - font-style:normal; - text-decoration:none; - font-family:Calibri, sans-serif; - mso-font-charset:204;} -.font18 - {color:#215967; - font-size:11.0pt; - font-weight:700; - font-style:normal; - text-decoration:none; - font-family:Calibri, sans-serif; - mso-font-charset:204;} -td - {mso-style-parent:style0; - padding-top:1px; - padding-right:1px; - padding-left:1px; - mso-ignore:padding; - color:black; - font-size:11.0pt; - font-weight:400; - font-style:normal; - text-decoration:none; - font-family:Calibri, sans-serif; - mso-font-charset:204; - mso-number-format:General; - text-align:general; - vertical-align:bottom; - border:none; - mso-background-source:auto; - mso-pattern:auto; - mso-protection:locked visible; - white-space:nowrap; - mso-rotate:0;} -.xl65 - {mso-style-parent:style0; - text-align:center;} -.xl66 - {mso-style-parent:style0; - color:white; - font-weight:700; - text-align:center; - vertical-align:middle; - border:1.0pt solid windowtext; - background:black; - mso-pattern:black none; - white-space:normal;} -.xl67 - {mso-style-parent:style0; - color:white; - font-weight:700; - text-align:center; - vertical-align:middle; - border-top:1.0pt solid windowtext; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:none; - background:black; - mso-pattern:black none; - white-space:normal;} -.xl68 - {mso-style-parent:style0; - color:white; - font-weight:700; - vertical-align:middle; - border-top:1.0pt solid windowtext; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:none; - background:black; - mso-pattern:black none; - white-space:normal;} -.xl69 - {mso-style-parent:style0; - text-align:center; - border-top:1.0pt solid windowtext; - border-right:none; - border-bottom:1.0pt solid windowtext; - border-left:none;} -.xl70 - {mso-style-parent:style0; - vertical-align:middle; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:none; - border-left:none; - white-space:normal;} -.xl71 - {mso-style-parent:style0; - color:#215868; - vertical-align:middle; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:none; - white-space:normal;} -.xl72 - {mso-style-parent:style0; - font-weight:700; - text-align:center; - vertical-align:middle; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:1.0pt solid windowtext; - white-space:normal;} -.xl73 - {mso-style-parent:style0; - font-weight:700; - text-align:center; - vertical-align:middle; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:none; - white-space:normal;} -.xl74 - {mso-style-parent:style0; - text-align:center; - vertical-align:middle; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:none; - white-space:normal;} -.xl75 - {mso-style-parent:style0; - vertical-align:middle; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:none; - white-space:normal;} -.xl76 - {mso-style-parent:style0; - color:#215868; - font-weight:700; - vertical-align:middle; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:none; - border-left:none; - white-space:normal;} -.xl77 - {mso-style-parent:style0; - color:#215868; - font-weight:700; - vertical-align:middle; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:none; - white-space:normal;} -.xl78 - {mso-style-parent:style0; - color:#215968; - font-weight:700; - vertical-align:middle; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:none; - white-space:normal;} -.xl79 - {mso-style-parent:style0; - vertical-align:middle; - border-top:1.0pt solid windowtext; - border-right:1.0pt solid windowtext; - border-bottom:none; - border-left:none; - white-space:normal;} -.xl80 - {mso-style-parent:style0; - text-align:center; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:none; - border-left:1.0pt solid windowtext;} -.xl81 - {mso-style-parent:style0; - color:#215968; - font-weight:700; - vertical-align:middle; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:none; - border-left:none; - white-space:normal;} -.xl82 - {mso-style-parent:style0; - text-align:left; - vertical-align:middle; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:none; - white-space:normal;} -.xl83 - {mso-style-parent:style0; - text-align:center; - vertical-align:middle;} -.xl84 - {mso-style-parent:style0; - font-style:italic; - vertical-align:middle; - border-top:1.0pt solid windowtext; - border-right:none; - border-bottom:1.0pt solid windowtext; - border-left:1.0pt solid windowtext; - white-space:normal;} -.xl85 - {mso-style-parent:style0; - font-style:italic; - vertical-align:middle; - border-top:1.0pt solid windowtext; - border-right:none; - border-bottom:1.0pt solid windowtext; - border-left:none; - white-space:normal;} -.xl86 - {mso-style-parent:style0; - font-style:italic; - vertical-align:middle; - border-top:1.0pt solid windowtext; - border-right:1.0pt solid black; - border-bottom:1.0pt solid windowtext; - border-left:none; - white-space:normal;} -.xl87 - {mso-style-parent:style0; - font-weight:700; - text-align:center; - vertical-align:middle; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:none; - border-left:1.0pt solid windowtext; - white-space:normal;} -.xl88 - {mso-style-parent:style0; - font-weight:700; - text-align:center; - vertical-align:middle; - border-top:1.0pt solid windowtext; - border-right:1.0pt solid windowtext; - border-bottom:none; - border-left:1.0pt solid windowtext; - white-space:normal;} -.xl89 - {mso-style-parent:style0; - text-align:center; - vertical-align:middle; - border-top:1.0pt solid windowtext; - border-right:1.0pt solid windowtext; - border-bottom:none; - border-left:1.0pt solid windowtext; - white-space:normal;} -.xl90 - {mso-style-parent:style0; - text-align:center; - vertical-align:middle; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:1.0pt solid windowtext; - white-space:normal;} -.xl91 - {mso-style-parent:style0; - font-weight:700; - text-align:center; - vertical-align:middle; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid black; - border-left:1.0pt solid windowtext; - white-space:normal;} -.xl92 - {mso-style-parent:style0; - font-weight:700; - text-align:center; - vertical-align:middle; - border-top:1.0pt solid black; - border-right:1.0pt solid windowtext; - border-bottom:none; - border-left:1.0pt solid windowtext; - white-space:normal;} -.xl93 - {mso-style-parent:style0; - text-align:center; - vertical-align:middle; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid black; - border-left:1.0pt solid windowtext; - white-space:normal;} -.xl94 - {mso-style-parent:style0; - color:white; - font-weight:700; - text-align:center; - border:1.0pt solid windowtext; - background:black; - mso-pattern:black none;} -.xl95 - {mso-style-parent:style0; - color:white; - font-weight:700; - text-align:center; - border-top:1.0pt solid windowtext; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:none; - background:black; - mso-pattern:black none;} -.xl96 - {mso-style-parent:style0; - font-style:italic; - text-align:left; - border-top:1.0pt solid windowtext; - border-right:none; - border-bottom:1.0pt solid windowtext; - border-left:1.0pt solid windowtext;} -.xl97 - {mso-style-parent:style0; - font-style:italic; - text-align:left; - border-top:1.0pt solid windowtext; - border-right:none; - border-bottom:1.0pt solid windowtext; - border-left:none;} -.xl98 - {mso-style-parent:style0; - font-style:italic; - text-align:left; - border-top:1.0pt solid windowtext; - border-right:1.0pt solid black; - border-bottom:1.0pt solid windowtext; - border-left:none;} -.xl99 - {mso-style-parent:style0; - text-align:center; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:none; - border-left:none;} -.xl100 - {mso-style-parent:style0; - text-align:left; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:none; - border-left:none;} -.xl101 - {mso-style-parent:style0; - text-align:left; - border-top:1.0pt solid windowtext; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:none;} -.xl102 - {mso-style-parent:style0; - text-align:center; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:1.0pt solid windowtext;} -.xl103 - {mso-style-parent:style0; - text-align:center; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:none;} -.xl104 - {mso-style-parent:style0; - text-align:left; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:none;} -.xl105 - {mso-style-parent:style0; - text-align:center; - border-top:none; - border-right:none; - border-bottom:none; - border-left:1.0pt solid windowtext;} -.xl106 - {mso-style-parent:style0; - text-align:left; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:none; - border-left:1.0pt solid windowtext;} -.xl107 - {mso-style-parent:style0; - text-align:center; - border-top:1.0pt solid windowtext; - border-right:none; - border-bottom:1.0pt solid windowtext; - border-left:1.0pt solid windowtext;} -.xl108 - {mso-style-parent:style0; - text-align:center; - border:1.0pt solid windowtext;} -.xl109 - {mso-style-parent:style0; - text-align:left; - border:1.0pt solid windowtext;} -.xl110 - {mso-style-parent:style0; - text-align:center; - border-top:none; - border-right:none; - border-bottom:1.0pt solid windowtext; - border-left:1.0pt solid windowtext;} -.xl111 - {mso-style-parent:style0; - text-align:center; - border-top:none; - border-right:none; - border-bottom:1.0pt solid windowtext; - border-left:none;} -.xl112 - {mso-style-parent:style0; - text-align:left; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:1.0pt solid windowtext;} diff --git a/WEBFilesRS485/help/webvars.files/tabstrip.htm b/WEBFilesRS485/help/webvars.files/tabstrip.htm deleted file mode 100644 index 6b8f22e..0000000 --- a/WEBFilesRS485/help/webvars.files/tabstrip.htm +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - -
 WebVars  Modbus 
- - diff --git a/WEBFilesRS485/help/webvars.htm b/WEBFilesRS485/help/webvars.htm deleted file mode 100644 index 3e2864c..0000000 --- a/WEBFilesRS485/help/webvars.htm +++ /dev/null @@ -1,330 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - <body> - <p> , .</p> - </body> - - - diff --git a/WEBFilesRS485/index.htm b/WEBFilesRS485/index.htm deleted file mode 100644 index 3dabf16..0000000 --- a/WEBFilesRS485/index.htm +++ /dev/null @@ -1,22 +0,0 @@ - - - - ESP8266 - - -~inc:menu.inc~ -
-

✯Info✯

-

-Name: ~wifi_ap_ssid~ Password: ~wifi_ap_psw~
-Modbus TCP Connection: ~mdb_remote~, Web connect: ~web_remote~,

-WEB ver: ~sys_webver~, SDK ver: ~sys_sdkver~.
-Power: ? V
-ChipID: ~sys_cid~.

-DevTime: SNTP disable
-PowerStartTime: ?

-

-~inc:footer.inc~ -~inc:vdd.inc~ -~inc:time.inc~ - \ No newline at end of file diff --git a/WEBFilesRS485/led.xml b/WEBFilesRS485/led.xml deleted file mode 100644 index c0865c9..0000000 --- a/WEBFilesRS485/led.xml +++ /dev/null @@ -1,6 +0,0 @@ - -~gpio1_inp~ -~gpio1_out~ -~gpio1_dir~ -~gpio1_fun~ - \ No newline at end of file diff --git a/WEBFilesRS485/leds.xml b/WEBFilesRS485/leds.xml deleted file mode 100644 index 756c3c8..0000000 --- a/WEBFilesRS485/leds.xml +++ /dev/null @@ -1,5 +0,0 @@ - -~gpio_inp~ -~gpio_out~ -~gpio_dir~ - \ No newline at end of file diff --git a/WEBFilesRS485/logo.gif b/WEBFilesRS485/logo.gif deleted file mode 100644 index b930b2a..0000000 Binary files a/WEBFilesRS485/logo.gif and /dev/null differ diff --git a/WEBFilesRS485/menu.inc b/WEBFilesRS485/menu.inc deleted file mode 100644 index 35d4092..0000000 --- a/WEBFilesRS485/menu.inc +++ /dev/null @@ -1,26 +0,0 @@ -

ESP8266 Built-in Web server ©

-
-
- Main - Modbus Settings - WiFi settings - WiFi Scan - WebFS Upload - System Setup -
-
- GPIO - HexDump Bytes - HexDump DWord - Download Bin - Deep Sleep - Debug and Test -
-
- \ No newline at end of file diff --git a/WEBFilesRS485/protect/aps.xml b/WEBFilesRS485/protect/aps.xml deleted file mode 100644 index 14154a2..0000000 --- a/WEBFilesRS485/protect/aps.xml +++ /dev/null @@ -1 +0,0 @@ -~wifi_aps_xml~ diff --git a/WEBFilesRS485/protect/chiprams.xml b/WEBFilesRS485/protect/chiprams.xml deleted file mode 100644 index 5cad0a9..0000000 --- a/WEBFilesRS485/protect/chiprams.xml +++ /dev/null @@ -1,4 +0,0 @@ - -~start~ -~xml_ram~ - diff --git a/WEBFilesRS485/protect/cookie.js b/WEBFilesRS485/protect/cookie.js deleted file mode 100644 index ea8a307..0000000 --- a/WEBFilesRS485/protect/cookie.js +++ /dev/null @@ -1,70 +0,0 @@ -function getCookie(name) { - var prefix = name + "="; - var cookieStartIndex = document.cookie.indexOf(prefix); - if (cookieStartIndex == -1) - return null; - var cookieEndIndex = document.cookie.indexOf(";", cookieStartIndex - + prefix.length); - if (cookieEndIndex == -1) - cookieEndIndex = document.cookie.length; - return unescape(document.cookie.substring(cookieStartIndex + prefix.length, - cookieEndIndex)); -} -function setCookie(name, value) { - document.cookie = name + "=" + escape(value) + "; path=/"; -} -function setCookieElem(name, defv) { - var val = getCookie(name); - if (val == null || val.charAt(0) != '0' || val.charAt(1) != 'x') { - val = defv; - setCookie(name, val); - } - document.getElementById(name).value = val; -} -function NewCookie(add) { - var val = parseInt(document.getElementById('start').value, 16) & 0xFFFFFFF0; - if (val == NaN) - setCookieElem('start', '0x40000000'); - else { - val += add; - setCookie('start', '0x' + val.toString(16)); - var nval = val + 256; - setCookie('stop', '0x' + nval.toString(16)); - document.getElementById('start').value = '0x' + val.toString(16); - document.getElementById('pmem').contentWindow.location.reload(); - } -} -setCookieElem('start', '0x40000000'); -setCookieElem('set_ramaddr', '0x3FFF0000'); -setCookieElem('set_ramdata', '0x12345678'); -function UpTxt(xD, n, v) { - var x = getXMLValue(xD, n, v); - if (x == '?') - document.getElementById("id_" + n).style.color = "#833"; - else - document.getElementById("id_" + n).style.color = "#333"; - document.getElementById("id_" + n).innerHTML = x + v; -} -function UpdateValuesRam(xD) { - if (xD) { - UpTxt(xD, "ramaddr", ""); - UpTxt(xD, "ramdata", ""); - } -} -function SendRamVal(x) { - var addr = parseInt(document.getElementById('set_ramaddr').value, 16); - var val = parseInt(document.getElementById('set_ramdata').value, 16); - if (addr != NaN && val != NaN) { - document.getElementById('set_ramaddr').value = '0x' + addr.toString(16); - setCookie('set_ramaddr','0x' + addr.toString(16)); - document.getElementById('set_ramdata').value = '0x' + val.toString(16); - setCookie('set_ramdata','0x' + val.toString(16)); - if (x != 0) - newAJAXCommand('chiprams.xml?start=0x' + addr.toString(16), - UpdateValuesRam, 0); - else - newAJAXCommand('chiprams.xml?sys_ram0x' + addr.toString(16) + '=0x' - + val.toString(16) + '&start=0x' + addr.toString(16), - UpdateValuesRam, 0); - } -} \ No newline at end of file diff --git a/WEBFilesRS485/protect/debug.htm b/WEBFilesRS485/protect/debug.htm deleted file mode 100644 index d80c1c6..0000000 --- a/WEBFilesRS485/protect/debug.htm +++ /dev/null @@ -1,45 +0,0 @@ - - - - ESP8266 Debug and Tests - - -~inc:menu.inc~ -
-

Debug and Tests

-

-Chart 'heap', ADC, Vdd, ST-AP RSSI

-Page Modbus Data, Modbus TRNs, Vars Sample, Websock Sample

-Get system.xml, aps.xml, pr_request.xml, mdb.bin

-SoftWare Reset, System Restart

-Counter erase the last flash sector in the Chinese SDK, to save 28 bytes: ~sys_rdec0x4027F008~!

-

-
-
-

System constants

- - - - - - - - - - - - -
Sys_const 107:
Divided readvdd33():
-

-Power: ? V, readvdd33() = ~sys_vdd33~00
-system_adc_read() = ~sys_adc~, system_get_vdd33() = ~sys_vdd~

-

-Select esp_init_data_default.bin file... Next constants

-

-Download esp_init_data_default.bin -
-

-
-~inc:footer.inc~ -~inc:vdd.inc~ - \ No newline at end of file diff --git a/WEBFilesRS485/protect/dsleep.htm b/WEBFilesRS485/protect/dsleep.htm deleted file mode 100644 index fc451dc..0000000 --- a/WEBFilesRS485/protect/dsleep.htm +++ /dev/null @@ -1,51 +0,0 @@ - - - - ESP8266 - - - - - ~inc:menu.inc~ -
-

Test DeepSleep

- - - - - - - - - - - - - - - -
DeepSleep Time(us):
DeepSleep Mode:
Sys_const 108:
-

- Old sleep_mode = ~sys_sleep_old~
- Start event = ~sys_rst~ (0-power, 1-wdt, 2-exception, 3-soft wdt, 4-software, 5-deep-sleep, 6-external)
- Reset event = ~sys_res_event~ (1-power, 2-reset, 3-software, 4-wdt)
-

-
-~inc:footer.inc~ - - - - diff --git a/WEBFilesRS485/protect/esp_init_data_default.bin b/WEBFilesRS485/protect/esp_init_data_default.bin deleted file mode 100644 index 5c9f022..0000000 --- a/WEBFilesRS485/protect/esp_init_data_default.bin +++ /dev/null @@ -1 +0,0 @@ -~bin_flash_const~ \ No newline at end of file diff --git a/WEBFilesRS485/protect/fullflash.bin b/WEBFilesRS485/protect/fullflash.bin deleted file mode 100644 index 7bf721b..0000000 --- a/WEBFilesRS485/protect/fullflash.bin +++ /dev/null @@ -1 +0,0 @@ -~bin_flash_all~ \ No newline at end of file diff --git a/WEBFilesRS485/protect/gpio.htm b/WEBFilesRS485/protect/gpio.htm deleted file mode 100644 index a911b2e..0000000 --- a/WEBFilesRS485/protect/gpio.htm +++ /dev/null @@ -1,51 +0,0 @@ - - - - ESP8266 GPIOs - - - -~inc:menu.inc~ -
-

GPIO

- - -
PinInpOutDirFuncPUPDOD
-GPIO2(TX1) - Disable: 'GPIO2 debug UART TX Enable'. -
-~inc:footer.inc~ - - \ No newline at end of file diff --git a/WEBFilesRS485/protect/gpio.xml b/WEBFilesRS485/protect/gpio.xml deleted file mode 100644 index 6b14191..0000000 --- a/WEBFilesRS485/protect/gpio.xml +++ /dev/null @@ -1,53 +0,0 @@ - -~gpio_inp~ -~gpio_out~ -~gpio_dir~ -~gpio0_fun~ -~gpio1_fun~ -~gpio2_fun~ -~gpio3_fun~ -~gpio4_fun~ -~gpio5_fun~ -~gpio6_fun~ -~gpio7_fun~ -~gpio8_fun~ -~gpio9_fun~ -~gpio10_fun~ -~gpio11_fun~ -~gpio12_fun~ -~gpio13_fun~ -~gpio14_fun~ -~gpio15_fun~ -~gpio0_pull~ -~gpio1_pull~ -~gpio2_pull~ -~gpio3_pull~ -~gpio4_pull~ -~gpio5_pull~ -~gpio6_pull~ -~gpio7_pull~ -~gpio8_pull~ -~gpio9_pull~ -~gpio10_pull~ -~gpio11_pull~ -~gpio12_pull~ -~gpio13_pull~ -~gpio14_pull~ -~gpio15_pull~ -~gpio0_opd~ -~gpio1_opd~ -~gpio2_opd~ -~gpio3_opd~ -~gpio4_opd~ -~gpio5_opd~ -~gpio6_opd~ -~gpio7_opd~ -~gpio8_opd~ -~gpio9_opd~ -~gpio10_opd~ -~gpio11_opd~ -~gpio12_opd~ -~gpio13_opd~ -~gpio14_opd~ -~gpio15_opd~ - \ No newline at end of file diff --git a/WEBFilesRS485/protect/hexdmpb.htm b/WEBFilesRS485/protect/hexdmpb.htm deleted file mode 100644 index 01f4244..0000000 --- a/WEBFilesRS485/protect/hexdmpb.htm +++ /dev/null @@ -1,41 +0,0 @@ - - - - ESP8266 HexDump Byte - - - - ~inc:menu.inc~ -
-

HexDump Bytes

- - - - - - - - -
RAM Start addr
- - - - - - - - - - - - - - -
Write addr, value:
Read addr, value:??
-
-
- Protected area: 0..0x20000000, 0x60002000..0x60008000 !
- HEX Dump Flash 512k -
- - \ No newline at end of file diff --git a/WEBFilesRS485/protect/hexdmpb.txt b/WEBFilesRS485/protect/hexdmpb.txt deleted file mode 100644 index 0331abd..0000000 --- a/WEBFilesRS485/protect/hexdmpb.txt +++ /dev/null @@ -1 +0,0 @@ -~hexdmpb~ \ No newline at end of file diff --git a/WEBFilesRS485/protect/hexdmpd.htm b/WEBFilesRS485/protect/hexdmpd.htm deleted file mode 100644 index e522b0b..0000000 --- a/WEBFilesRS485/protect/hexdmpd.htm +++ /dev/null @@ -1,41 +0,0 @@ - - - - ESP8266 HexDump DWord - - - - ~inc:menu.inc~ -
-

HexDump DWord

- - - - - - - - -
RAM Start addr   
- - - - - - - - - - - - - - -
Write addr, value:
Read addr, value:??
-
-
- Protected area: 0..0x20000000, 0x60002000..0x60008000 !
- HEX Dump Flash 512k -
- - \ No newline at end of file diff --git a/WEBFilesRS485/protect/hexdmpd.txt b/WEBFilesRS485/protect/hexdmpd.txt deleted file mode 100644 index 8d03bdc..0000000 --- a/WEBFilesRS485/protect/hexdmpd.txt +++ /dev/null @@ -1 +0,0 @@ -~hexdmpd~ \ No newline at end of file diff --git a/WEBFilesRS485/protect/init.ini b/WEBFilesRS485/protect/init.ini deleted file mode 100644 index 6c093d6..0000000 --- a/WEBFilesRS485/protect/init.ini +++ /dev/null @@ -1,7 +0,0 @@ -mdbfini=protect/mdbini.bin -sys_ram0x60000f00=0x48 -sys_ram0x60000f00=0x65 -sys_ram0x60000f00=0x6c -sys_ram0x60000f00=0x6c -sys_ram0x60000f00=0x6f -sys_ram0x60000f00=0x21 \ No newline at end of file diff --git a/WEBFilesRS485/protect/mdb.bin b/WEBFilesRS485/protect/mdb.bin deleted file mode 100644 index e466497..0000000 --- a/WEBFilesRS485/protect/mdb.bin +++ /dev/null @@ -1 +0,0 @@ -~bin_mdb~ \ No newline at end of file diff --git a/WEBFilesRS485/protect/mdb.htm b/WEBFilesRS485/protect/mdb.htm deleted file mode 100644 index be8e46a..0000000 --- a/WEBFilesRS485/protect/mdb.htm +++ /dev/null @@ -1,66 +0,0 @@ - - - - ESP8266 Modbus data - - - -~inc:menu.inc~ -
-

Modbus data

- - -
Index0123456789
-

- - - - - - - - - - - - - - - - - - - -
Write addr, word:
Write addr, dword:
Write addr, string:
-

-
-~inc:footer.inc~ - - \ No newline at end of file diff --git a/WEBFilesRS485/protect/mdb.xml b/WEBFilesRS485/protect/mdb.xml deleted file mode 100644 index f0cae6d..0000000 --- a/WEBFilesRS485/protect/mdb.xml +++ /dev/null @@ -1,2 +0,0 @@ -~xml_mdb~ - diff --git a/WEBFilesRS485/protect/mdbh.xml b/WEBFilesRS485/protect/mdbh.xml deleted file mode 100644 index 00f5967..0000000 --- a/WEBFilesRS485/protect/mdbh.xml +++ /dev/null @@ -1,2 +0,0 @@ -~xml_mdbh~ - diff --git a/WEBFilesRS485/protect/mdbtrn.htm b/WEBFilesRS485/protect/mdbtrn.htm deleted file mode 100644 index a8307d8..0000000 --- a/WEBFilesRS485/protect/mdbtrn.htm +++ /dev/null @@ -1,53 +0,0 @@ - - - - ESP8266 Modbus - - - -~inc:menu.inc~ -
-

Modbus TRNs

- - -
Name
- - - - - - - -
Write trn n, data:
-
-~inc:footer.inc~ - - \ No newline at end of file diff --git a/WEBFilesRS485/protect/mdbtst.htm b/WEBFilesRS485/protect/mdbtst.htm deleted file mode 100644 index 623181b..0000000 --- a/WEBFilesRS485/protect/mdbtst.htm +++ /dev/null @@ -1,51 +0,0 @@ - - - - ESP8266 Sensors external device - - - -~inc:menu.inc~ -
-

Sensors external device

- - - - - - - - - - - - - - - - -
NameValue
Pressure1?
Pressure2?
Pressure3?
Pressure4?
Pressure5?
Pressure6?
Internal Temperature?
External Temperature?
External Dew Point?
Oxugen?
Input1?
Input2?
Input3?
Input4?
-
-~inc:footer.inc~ - - \ No newline at end of file diff --git a/WEBFilesRS485/protect/pr_request.xml b/WEBFilesRS485/protect/pr_request.xml deleted file mode 100644 index 1045642..0000000 --- a/WEBFilesRS485/protect/pr_request.xml +++ /dev/null @@ -1 +0,0 @@ -~wifi_prrq_xml~ \ No newline at end of file diff --git a/WEBFilesRS485/protect/ram.bin b/WEBFilesRS485/protect/ram.bin deleted file mode 100644 index cca0930..0000000 --- a/WEBFilesRS485/protect/ram.bin +++ /dev/null @@ -1 +0,0 @@ -~bin_ram~ \ No newline at end of file diff --git a/WEBFilesRS485/protect/rfinit1.htm b/WEBFilesRS485/protect/rfinit1.htm deleted file mode 100644 index 5bbcaa2..0000000 --- a/WEBFilesRS485/protect/rfinit1.htm +++ /dev/null @@ -1,109 +0,0 @@ - - - - ESP8266EX RF Data Setup 1 - - -~inc:menu.inc~ -
-

RF Data Setup 1

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
spur_freq_cfg [26]:
spur_freq_cfg_div [27]:
spur_freq_en_h [28]:
spur_freq_en_l [29]:
target_power_qdb_0 [34]:
target_power_qdb_1 [35]:
target_power_qdb_2 [36]:
target_power_qdb_3 [37]:
target_power_qdb_4 [38]:
target_power_qdb_5 [39]:
target_power_index_mcs0 [40]:
target_power_index_mcs1 [41]:
target_power_index_mcs2 [42]:
target_power_index_mcs3 [43]:
target_power_index_mcs4 [44]:
target_power_index_mcs5 [45]:
target_power_index_mcs6 [46]:
target_power_index_mcs7 [47]:
* Next >>
-
-~inc:footer.inc~ - \ No newline at end of file diff --git a/WEBFilesRS485/protect/rfinit2.htm b/WEBFilesRS485/protect/rfinit2.htm deleted file mode 100644 index 1bcc589..0000000 --- a/WEBFilesRS485/protect/rfinit2.htm +++ /dev/null @@ -1,143 +0,0 @@ - - - - ESP8266EX RF Data Setup 2 - - -~inc:menu.inc~ -
-

RF Data Setup 2

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
crystal_26m_en [48]:
gpio0_3_func [49]:
sdio_configure [50]:
bt_configure [51]:
bt_protocol [52]:
dual_ant_configure [53]:
gpio1_2_func [54]:
share_xtal [55]:
spur_freq_cfg_2 [64]:
spur_freq_cfg_div_2 [65]:
spur_freq_en_h_2 [66]:
spur_freq_cfg_msb [68]:
spur_freq_cfg_2_msb [69]:
spur_freq_cfg_3_low [70]:
spur_freq_cfg_3_high [71]:
spur_freq_cfg_4_low [72]:
spur_freq_cfg_4_high [73]:
<< Prev * * Next >>
-
-~inc:footer.inc~ - - \ No newline at end of file diff --git a/WEBFilesRS485/protect/rfinit3.htm b/WEBFilesRS485/protect/rfinit3.htm deleted file mode 100644 index 7853ef5..0000000 --- a/WEBFilesRS485/protect/rfinit3.htm +++ /dev/null @@ -1,91 +0,0 @@ - - - - ESP8266EX RF Data Setup 3 - - -~inc:menu.inc~ -
-

RF Data Setup 3

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
low_power_en [93]:
lp_rf_stg10 [94]:
lp_bb_att_ext [95]:
lp_rf_stg10 [96]:
pwr_ind_11b_0 [97]:
pwr_ind_11b_1 [98]:
vdd33_const [107]:
deep_sleep_mode [108]:
freq_correct_en [112]:
force_freq_offset [113]:
phy_powerup_option[114]:
<< Prev *
-
-~inc:footer.inc~ - - \ No newline at end of file diff --git a/WEBFilesRS485/protect/scan.htm b/WEBFilesRS485/protect/scan.htm deleted file mode 100644 index 4d30082..0000000 --- a/WEBFilesRS485/protect/scan.htm +++ /dev/null @@ -1,98 +0,0 @@ - - - - -WiFi Scan - - - - ~inc:menu.inc~ -
-

-
Stations scanning...
-

- - -
SSIDBSSIDAuthChRSSIHd
- -
-
- ~inc:footer.inc~ - - - - - diff --git a/WEBFilesRS485/protect/scan.xml b/WEBFilesRS485/protect/scan.xml deleted file mode 100644 index fc7188e..0000000 --- a/WEBFilesRS485/protect/scan.xml +++ /dev/null @@ -1 +0,0 @@ -~wifi_scan~ diff --git a/WEBFilesRS485/protect/setup.htm b/WEBFilesRS485/protect/setup.htm deleted file mode 100644 index b0807db..0000000 --- a/WEBFilesRS485/protect/setup.htm +++ /dev/null @@ -1,128 +0,0 @@ - - - - ESP8266EX Setup - - - - -~inc:menu.inc~ -
-

System Setup

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
WEB (HTTP) port:
WEB recved timeout:
WEB close timeout:
Debug UART BAUD:
Debug UART Bits:
Debug UART Stop Bits:
Debug UART Parity:
Debug UART Parity enable: - - -
GPIO2 debug UART TX enable: - - -
☭ 160MHz CPU enable: - - -
Web pcb close enable: - - -
Checking pin WiFi cfg reset: - - -
NetBIOS enable: - - -
SNTP enable: - - -
-

- - - -

-
-
-~inc:footer.inc~ - - \ No newline at end of file diff --git a/WEBFilesRS485/protect/tstfuncs.htm b/WEBFilesRS485/protect/tstfuncs.htm deleted file mode 100644 index 159b47d..0000000 --- a/WEBFilesRS485/protect/tstfuncs.htm +++ /dev/null @@ -1,96 +0,0 @@ - - - - ESP8266 Download bin - - - -~inc:menu.inc~ -
-

Download bin

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
I/O 1:0x3FF00000..0x3FF00100128 bytes
I/O 2:0x3FF20000..0x3FF218006 kbytes
RAM:0x3FFE8000..0x4000000096 kbytes
ROM-BIOS:0x40000000..0x4001000064 kbytes
IRAM:0x40100000..0x4011000064 kbytes
FLASH Bus:0x40200000..0x403000001 Mbytes
I/O 3:0x60000000..0x600018006 kbytes
I/O 4:0x60009800..0x6000A0002 kbytes
- - - - - - - - - - -
Start addr
End addr
-

-
-~inc:footer.inc~ - - - diff --git a/WEBFilesRS485/protect/uart.htm b/WEBFilesRS485/protect/uart.htm deleted file mode 100644 index 1380f0c..0000000 --- a/WEBFilesRS485/protect/uart.htm +++ /dev/null @@ -1,117 +0,0 @@ - - - - ESP8266EX Modbus TCP RTU RS-485 - - - - -~inc:menu.inc~ -
-

Modbus TCP RTU RS-485

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Baud:
Parity:
Max Timeout:
AltTp > 19200: - - -
Add msg pause:
Swap TXD<>RTS, RXD<>CTS: - - -
Pin RD_ENA:
IntDevID:
IntDevMaster: - - -
Modbus TCP Client/Server IP:
Modbus TCP port:
Modbus TCP recved timeout:
Modbus TCP close timeout:
Modbus TCP connect reopen:
-

- - - -

- -
-~inc:footer.inc~ - - - \ No newline at end of file diff --git a/WEBFilesRS485/protect/upload.htm b/WEBFilesRS485/protect/upload.htm deleted file mode 100644 index 6d4aa9b..0000000 --- a/WEBFilesRS485/protect/upload.htm +++ /dev/null @@ -1,23 +0,0 @@ - - - - ESP8266 WebFS Image Upload - - -~inc:menu.inc~ -
-

WebFS Image Upload

-

- Select WEBFiles.bin file...

-

- -

-
-

-Curent Disk has ~wfs_files~ files, Disk Size: ~wfs_size~ bytes.
-Disk Addres: ~wfs_addr~, Max Disk Size: ~wfs_max_size~ bytes, Max 250 files.

-Flash ID: ~sys_fid~, Size: ~sys_fsize~ bytes.
-Download fullflash.bin

-

-~inc:footer.inc~ - \ No newline at end of file diff --git a/WEBFilesRS485/protect/wifi.htm b/WEBFilesRS485/protect/wifi.htm deleted file mode 100644 index 0fb2522..0000000 --- a/WEBFilesRS485/protect/wifi.htm +++ /dev/null @@ -1,185 +0,0 @@ - - - - ESP8266 WiFi - - - - ~inc:menu.inc~ -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

WiFi SoftAP

WiFi Station

WiFi Mode:SSID:
AP SSID:Password:
Hidden SSID: - - - BSSID:
AP Password:Use BSSID: - - -
Channel:Status:
IEEE PHY:IP:
Auth Mode:Subnet Mask:
IP:Gateway:
Subnet Mask:AutoConnect: - - -
Gateway:ReConnect:
MAC:MAC:
DHCP: - - - DHCP: - - -
Start IP:RSSI:~wifi_st_rssi~ dB
End IP:Sleep Mode:
Max connections:Beacon (ms):
RF Tx Power:ST Host Name:
-

- - -

-
-
-~inc:footer.inc~ - - - \ No newline at end of file diff --git a/WEBFilesRS485/sample.htm b/WEBFilesRS485/sample.htm deleted file mode 100644 index d10bacf..0000000 --- a/WEBFilesRS485/sample.htm +++ /dev/null @@ -1,36 +0,0 @@ - - - - ESP8266 Samples - - -~inc:menu.inc~ -
-
-Write Mdb[68] string 'Hello!'
~mdba68=Hello!~ -Read Mdb[68] string: '~mdba68~'
-Read Mdb[10] string: '~mdba10~'
-
-Write Mdb[0] dword -12345678
~mdbd0=-12345678~ -Read Mdb[0] unsigned dword = ~mdbud0~
-Read Mdb[0] signed dword = ~mdbsd0~
-Read Mdb[0] hex dword = 0x~mdbhd0~
-Read Mdb[0] unsigned word = ~mdbuw0~
-Read Mdb[1] unsigned word = ~mdbuw1~
-Read Mdb[0] signed word = ~mdbsw0~
-Read Mdb[1] signed word = ~mdbsw1~
-Read Mdb[0] hex word = 0x~mdbhw0~
-Read Mdb[1] hex word = 0x~mdbhw1~
-
-MdbTrn[0].id = 0x~mdbhw1001~
-MdbTrn[0].cmd = 0x~mdbhw1002~
-MdbTrn[0].len = 0x~mdbhw1003~
-MdbTrn[0].eaddr = 0x~mdbhw1004~
-MdbTrn[0].iaddr = 0x~mdbhw1005~
-MdbTrn[0].tims = 0x~mdbhw1006~
-MdbTrn[0].errs = 0x~mdbhw1007~
-MdbTrn[0].fifo = 0x~mdbhw1008~
-MdbTrn[0].timc = 0x~mdbhw1009~
-
-~inc:footer.inc~ - diff --git a/WEBFilesRS485/scripts.js b/WEBFilesRS485/scripts.js deleted file mode 100644 index a9cadab..0000000 --- a/WEBFilesRS485/scripts.js +++ /dev/null @@ -1,33 +0,0 @@ -var setFormValues = function(form, cfg) { - var name, field; - for (name in cfg){ - if (form[name]) { - field = form[name]; - if (field[1] && field[1].type === 'checkbox') { - field = field[1]; - } - if (field.type === 'checkbox'){ - field.checked = cfg[name] === '1' ? true : false; - } else { - field.value = cfg[name]; - } - } - } -} -var $ = function(id) { - return document.getElementById(id); -} -var reloadTimer={ - s:10, - reload:function(start) { - if(start) { - this.s = start; - } - $('timer').innerHTML = this.s < 10 ? '0' + this.s : this.s; - if (this.s == 0){ - document.location.href = document.referrer != '' ? document.referrer : '/'; - } - this.s--; - setTimeout('reloadTimer.reload()', 1000); - } -} diff --git a/WEBFilesRS485/site.js b/WEBFilesRS485/site.js deleted file mode 100644 index c083aaa..0000000 --- a/WEBFilesRS485/site.js +++ /dev/null @@ -1,95 +0,0 @@ -/* Java for WEB device */ -var ajaxList = new Array(); // Stores a queue of AJAX events to process -var nextimeout = 500; -function newAJAXCommand(url, container, repeat, data) { - // Set up our object - var newAjax = new Object(); - var theTimer = new Date(); - newAjax.url = url; - newAjax.container = container; - newAjax.repeat = repeat; - newAjax.ajaxReq = null; - // Create and send the request - if (window.XMLHttpRequest) { - newAjax.ajaxReq = new XMLHttpRequest(); - newAjax.ajaxReq.open((data == null) ? "GET" : "POST", newAjax.url, true); - newAjax.ajaxReq.send(data); - // If we're using IE6 style (maybe 5.5 compatible too) - } else if (window.ActiveXObject) { - newAjax.ajaxReq = new ActiveXObject("Microsoft.XMLHTTP"); - if (newAjax.ajaxReq) { - newAjax.ajaxReq.open((data == null) ? "GET" : "POST", newAjax.url, true); - newAjax.ajaxReq.send(data); - } - } - newAjax.lastCalled = theTimer.getTime(); - // Store in our array - ajaxList.push(newAjax); -} -function pollAJAX() { - var curAjax = new Object(); - var theTimer = new Date(); - var elapsed; - // Read off the ajaxList objects one by one - for (i = ajaxList.length; i > 0; i--) { - curAjax = ajaxList.shift(); - if (!curAjax) - continue; - elapsed = theTimer.getTime() - curAjax.lastCalled; - // If we suceeded - if (curAjax.ajaxReq.readyState == 4 && curAjax.ajaxReq.status == 200) { - // If it has a container, write the result - if (typeof (curAjax.container) == 'function') - curAjax.container(curAjax.ajaxReq.responseXML.documentElement); - else if (typeof (curAjax.container) == 'string') - document.getElementById(curAjax.container).innerHTML = curAjax.ajaxReq.responseText; - // (otherwise do nothing for null values) - curAjax.ajaxReq.abort(); - curAjax.ajaxReq = null; - // If it's a repeatable request, then do so - if (curAjax.repeat) { - if (elapsed >= curAjax.repeat) - elapsed = 100; - else - elapsed = curAjax.repeat - elapsed; - setTimeout("newAJAXCommand('" + curAjax.url + "'," - + curAjax.container + "," + curAjax.repeat + ")", - elapsed); - } - continue; - } - // If we've waited over 4 second, then we timed out - if ((curAjax.ajaxReq.readyState == 4 && curAjax.ajaxReq.status == 404) - || (elapsed > 4000)) { - // Invoke the user function with null input - if (typeof (curAjax.container) == 'function') - curAjax.container(null); - else - // Alert the user - alert("Command failed.\nConnection to device was lost."); - curAjax.ajaxReq.abort(); - curAjax.ajaxReq = null; - // If it's a repeatable request, then do so - if (curAjax.repeat) - setTimeout("newAJAXCommand('" + curAjax.url + "'," - + curAjax.container + "," + curAjax.repeat + ")", 200); - continue; - } - // Otherwise, just keep waiting - ajaxList.push(curAjax); - } - // Call ourselves again in 10ms? - setTimeout("pollAJAX()", nextimeout); -}// End pollAjax -function getXMLValue(xmlData, field) { - try { - if (xmlData.getElementsByTagName(field)[0].firstChild.nodeValue) - return xmlData.getElementsByTagName(field)[0].firstChild.nodeValue; - else - return null; - } catch (err) { - return null; - } -} -//kick off the AJAX Updater -setTimeout("pollAJAX()", nextimeout); diff --git a/WEBFilesRS485/style.css b/WEBFilesRS485/style.css deleted file mode 100644 index 64e291b..0000000 --- a/WEBFilesRS485/style.css +++ /dev/null @@ -1,235 +0,0 @@ -body{ -margin:4px auto; -width:640px; -color:black; -background:#fff; -font-size:14px; -font-family:"Lucida Grande", Tahoma, sans-serif; -} -img,table{ -border:0; -} -.top{ -color:#888; -background:url(logo.gif) no-repeat 0 0; -padding:3px 0 0 45px; -margin:0 0 10px 0; -} -.top img{ -vertical-align:middle; -} -h2.error{ -color:red; -} -h2.ok{ -color:green; -} -h2.title{ -text-align:center; -} -.menu{ -border-top:#fab548 5px solid; -background:#f1f1ed url(esp.gif) no-repeat 10px 10px; -padding:5px 5px 5px 120px; -margin:0 0 10px 0; -min-height:120px; -border-radius:5px; -} -.menu div{ -width:220px; -float:left; -margin-right:10px; -} -.menu a, -.menu a:link{ -display:block; -font-weight:bold; -text-decoration:none; -color:#1486ba; -padding:0 5px 1px 10px; -font-size:13px; -border-radius:5px; -margin:0 0 1px 0; -border-bottom:#d6d9da 1px solid; -} -.menu a:visited{ -color:#777; -} -.menu a.active{ -color:#777; -background:#d6d9da; -} -.menu a:hover{ -color:#842; -background:#d6d9da; -} -table.form select{ -width:143px; -} -table.form{ -width:100%; -} -table.form td{ -font-size:13px; -padding:0; -} -table.form .label{ -width:45%; -font-weight:bold; -text-align:right; -padding-right:10px; -} -table.form .left{ -width:45%; -font-weight:bold; -text-align:left; -padding-left:10px; -} -table.scan{ -border-collapse:separate; -border-spacing: 0; -border:#aaa 2px solid; -text-align:center; -font-size:14px; -width:100%; -margin:0 0 10px 0; -background:#fff; -border-radius:5px; -} -table.scan th{ -color:#247; -border:#aaa 1px solid; -font-size:15px; -padding:2px 2px; -background:#fec; -} -table.scan td{ -border:#aaa 1px solid; -padding:2px 2px; -} -table.scan td.s:hover{ -background:#eef; -} -table.scan a:link{ -display:block; -font-weight:bold; -text-decoration:none; -color:#444; -border-radius:5px; -} -table.scan a:visited{ -color:#444; -} -table.scan a.active, -table.scan a:hover{ -color:#21e; -background:#d6d9da; -} -table.mdbtab{ -border-collapse:separate; -border-spacing: 0; -border:#aaa 2px solid; -text-align:center; -font-size:12px; -width:100%; -margin:0 0 10px 0; -background:#fff; -border-radius:5px; -} -table.mdbtab th{ -color:#247; -border:#aaa 1px solid; -font-size:12px; -padding:2px 2px; -background:#fec; -} -table.mdbtab td{ -border:#aaa 1px solid; -padding:2px 2px; -} -table.mdbtab td.s:hover{ -background:#eef; -} -table.mdbtab a:link{ -display:block; -font-weight:bold; -text-decoration:none; -color:#444; -border-radius:5px; -} -table.mdbtab a:visited{ -color:#444; -} -table.mdbtab a.active, -table.mdbtab a:hover{ -color:#21e; -background:#d6d9da; -} -.content{ -background:#f1f1ed; -border-radius:5px; -border-top:#1486ba 5px solid; -padding:10px; -margin:0 0 10px 0; -} -.footer{ -border-top:#75be45 5px solid;; -background:#d6d9da; -border-radius:5px; -padding:10px; -font-size:12px; -margin:0 0 5px 0; -} -.copyright{ -font-size:11px; -padding:0 0 0 10px; -text-align:right; -} -.button:visited, -.button{ -cursor:pointer; -display:inline-block; -font-weight:bold; -text-align:center; -text-decoration:none; -white-space:nowrap; -border-radius:5px; -background-image: linear-gradient(rgba(255,255,255,.1), rgba(255,255,255,.05) 49%, rgba(0,0,0,.05) 51%, rgba(0,0,0,.1)); -background-color:#f0f0eb; -color:#312c2a; -border:1px solid #aaa; -border-color: rgba(0,0,0,0.3); -border-bottom-color: #777; -border-bottom-color: rgba(0,0,0,0.5); -box-shadow: inset 0 0.08em 0 rgba(255,255,255,0.7), inset 0 0 0.08em rgba(255,255,255,0.5); -text-shadow: 0 1px 0 rgba(255,255,255,0.8); -padding:3px 15px; -} -.button:focus, -.button:hover{ -background-color:#ffffff; -background-image: linear-gradient(rgba(255,255,255,0.5), rgba(255,255,255,0.2) 49%, rgba(0,0,0,0.05) 51%, rgba(0,0,0,0.15)); -} -#timer{ -color:red; -} -.center{ -text-align:center; -} -hr{ -border:0; -height:1px; -background:#333; -background-image:-webkit-linear-gradient(left, #ccc, #333, #ccc); -background-image:-moz-linear-gradient(left, #ccc, #333, #ccc); -background-image:-ms-linear-gradient(left, #ccc, #333, #ccc); -background-image: -o-linear-gradient(left, #ccc, #333, #ccc); -} -select, -input, -iframe{ -border-collapse:separate; -border-spacing: 0; -background:#fff; -border-radius:5px; -} \ No newline at end of file diff --git a/WEBFilesRS485/system.xml b/WEBFilesRS485/system.xml deleted file mode 100644 index 1d943cf..0000000 --- a/WEBFilesRS485/system.xml +++ /dev/null @@ -1,130 +0,0 @@ - - -~hellomsg~ -~gpio_inp~ -~gpio_out~ -~gpio_dir~ -~gpio0_fun~,~gpio1_fun~,~gpio2_fun~,~gpio3_fun~,~gpio4_fun~,~gpio5_fun~,~gpio6_fun~,~gpio7_fun~,~gpio8_fun~,~gpio9_fun~,~gpio10_fun~,~gpio11_fun~,~gpio12_fun~,~gpio13_fun~,~gpio14_fun~,~gpio15_fun~ - - ~uart_0_baud~ - ~uart_0_bits~,~uart_0_stop~,~uart_0_parity~,~uart_0_even~ - ~uart_0_loopback~,~uart_0_flow~ - ~uart_0_txd_inv~,~uart_0_rxd_inv~,~uart_0_cts_inv~,~uart_0_rts_inv~ - - - ~uart_1_baud~ - ~uart_1_bits~,~uart_1_stop~,~uart_1_parity~,~uart_1_even~ - ~uart_1_loopback~,~uart_1_flow~ - ~uart_1_txd_inv~,~uart_1_rxd_inv~,~uart_1_cts_inv~,~uart_1_rts_inv~ - - - ~sys_cid~ - ~sys_fid~ - ~sys_fsize~ - ~sys_sysver~ - ~sys_sdkver~ - ~sys_webver~ - ~sys_clkcpu~ - ~sys_adc~ - ~sys_vdd33~ - ~sys_ucnst_0~ - - ~sys_rtctime~ - ~sys_mactime~ - ~sys_heap~ - ~sys_wdt~ - ~sys_rst~ - ~sys_res_event~ - ~sys_sleep_old~ - ~sys_ip~ - ~sys_url~ - ~sys_netbios~ - ~sys_ucnst_1~ - ~sys_ucnst_1~ - ~sys_ucnst_1~ - ~sys_test~ - - - ~web_host~ - ~web_remote~ - - - ~rs485_baud~ - ~rs485_timeout~ - ~rs485_parity~ - ~rs485_pinre~ - ~rs485_swap~ - ~rs485_spdtw~ - ~rs485_enable~ - - - ~mdb_host~ - ~mdb_remote~ - - - ~cfg_web_port~ - ~cfg_web_twd~ - ~cfg_mdb_port~ - ~cfg_mdb_twrec~ - ~cfg_mdb_twcls~ - ~cfg_mdb_reop~ - ~cfg_mdb_id~ - ~cfg_overclk~ - ~cfg_pinclr~ - ~cfg_debug~ - ~cfg_netbios~ - ~cfg_cdns~ - - - ~wifi_mode~ - ~wifi_phy~ - ~wifi_maxpw~ - ~wifi_vddpw~ - ~wifi_rfopt~ - - ~wifi_ap_ssid~ - ~wifi_ap_psw~ - ~wifi_ap_chl~ - ~wifi_ap_auth~ - ~wifi_ap_hssid~ - ~wifi_ap_mcns~ - ~wifi_ap_ip~ - ~wifi_ap_gw~ - ~wifi_ap_msk~ - ~wifi_ap_mac~ - ~wifi_ap_dhcp~ - ~wifi_ap_sip~ - ~wifi_ap_eip~ - ~wifi_ap_bint~ - ~wifi_maxpw~ - - - ~wifi_st_sta~ - ~wifi_st_ssid~ - ~wifi_st_psw~ - ~wifi_st_bssid~ - ~wifi_st_sbss~ - ~wifi_st_ip~ - ~wifi_st_gw~ - ~wifi_st_msk~ - ~wifi_st_mac~ - ~wifi_st_dhcp~ - ~wifi_st_rssi~ - ~wifi_st_aucn~ - ~wifi_st_hostname~ - - - - ~wfs_addr~ - ~wfs_files~ - ~wfs_size~ - ~wfs_max_size~ - - -~wifi_aps_id~ -~wifi_aps_xml~ - - -~wifi_scan~ - - diff --git a/WEBFilesRS485/time.inc b/WEBFilesRS485/time.inc deleted file mode 100644 index dfef378..0000000 --- a/WEBFilesRS485/time.inc +++ /dev/null @@ -1,9 +0,0 @@ - \ No newline at end of file diff --git a/WEBFilesRS485/timeout.htm b/WEBFilesRS485/timeout.htm deleted file mode 100644 index 45d1245..0000000 --- a/WEBFilesRS485/timeout.htm +++ /dev/null @@ -1,16 +0,0 @@ - - - - ESP8266 WIFI - - - -

ESP8266 Built-in Web server ©

-
-

Timeout ? sec...

- * Redirect: http://~sys_url~/ *

- Main -
-~inc:footer.inc~ - - diff --git a/WEBFilesRS485/timer.inc b/WEBFilesRS485/timer.inc deleted file mode 100644 index a7c41c1..0000000 --- a/WEBFilesRS485/timer.inc +++ /dev/null @@ -1,12 +0,0 @@ - - - - ESP8266 - - - -

ESP8266 Built-in Web server ©

-
-

Timeout ? sec...

- Redirect: Main - diff --git a/WEBFilesRS485/tst.htm b/WEBFilesRS485/tst.htm deleted file mode 100644 index bc74021..0000000 --- a/WEBFilesRS485/tst.htm +++ /dev/null @@ -1,9 +0,0 @@ -~inc:grfx1.inc~ -Test: ? -~inc:grfx2.inc~ \ No newline at end of file diff --git a/WEBFilesRS485/tst.xml b/WEBFilesRS485/tst.xml deleted file mode 100644 index 88a35c1..0000000 --- a/WEBFilesRS485/tst.xml +++ /dev/null @@ -1 +0,0 @@ -Test-1*~wifi_st_rssi~? diff --git a/WEBFilesRS485/vdd.htm b/WEBFilesRS485/vdd.htm deleted file mode 100644 index 2d30036..0000000 --- a/WEBFilesRS485/vdd.htm +++ /dev/null @@ -1,10 +0,0 @@ -~inc:grfx1.inc~ -Vdd: ?V -~inc:grfx2.inc~ - diff --git a/WEBFilesRS485/vdd.inc b/WEBFilesRS485/vdd.inc deleted file mode 100644 index ebf9f81..0000000 --- a/WEBFilesRS485/vdd.inc +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/WEBFilesRS485/vdd.xml b/WEBFilesRS485/vdd.xml deleted file mode 100644 index 55c138e..0000000 --- a/WEBFilesRS485/vdd.xml +++ /dev/null @@ -1 +0,0 @@ -Vdd(eval(~sys_vdd33~*100.0/~sys_ucnst_0~.0)).toFixed(3) diff --git a/WEBFilesRS485/websock.htm b/WEBFilesRS485/websock.htm deleted file mode 100644 index 8fe8419..0000000 --- a/WEBFilesRS485/websock.htm +++ /dev/null @@ -1,54 +0,0 @@ - - -WebSocket Test - -

WebSocket Test

-
diff --git a/WEBFilesTCP2UART/$js.inc b/WEBFilesTCP2UART/$js.inc deleted file mode 100644 index 515a2a2..0000000 --- a/WEBFilesTCP2UART/$js.inc +++ /dev/null @@ -1 +0,0 @@ -var $ = function(id){return document.getElementById(id);} \ No newline at end of file diff --git a/WEBFilesTCP2UART/404.htm b/WEBFilesTCP2UART/404.htm deleted file mode 100644 index 01aae58..0000000 --- a/WEBFilesTCP2UART/404.htm +++ /dev/null @@ -1,14 +0,0 @@ - - - - 404 - Page not found - - - -

ESP8266 Built-in Web server ©

-
-

404 - Page not found

-

Sorry, the page you are requesting was not found on this server.

-
-~inc:footer.inc~ - \ No newline at end of file diff --git a/WEBFilesTCP2UART/adc.htm b/WEBFilesTCP2UART/adc.htm deleted file mode 100644 index a4e492c..0000000 --- a/WEBFilesTCP2UART/adc.htm +++ /dev/null @@ -1,10 +0,0 @@ -~inc:grfx1.inc~ -ADC: ? - -~inc:grfx2.inc~ \ No newline at end of file diff --git a/WEBFilesTCP2UART/adc.wav b/WEBFilesTCP2UART/adc.wav deleted file mode 100644 index eafeb9e..0000000 --- a/WEBFilesTCP2UART/adc.wav +++ /dev/null @@ -1 +0,0 @@ -~test_adc~ \ No newline at end of file diff --git a/WEBFilesTCP2UART/adc.xml b/WEBFilesTCP2UART/adc.xml deleted file mode 100644 index 743eebc..0000000 --- a/WEBFilesTCP2UART/adc.xml +++ /dev/null @@ -1 +0,0 @@ -ADC~sys_adc~ \ No newline at end of file diff --git a/WEBFilesTCP2UART/disk_er1.htm b/WEBFilesTCP2UART/disk_er1.htm deleted file mode 100644 index 74a19e5..0000000 --- a/WEBFilesTCP2UART/disk_er1.htm +++ /dev/null @@ -1,5 +0,0 @@ -~inc:timer.inc~ -

Image Corrupt or Wrong Version!

-
-~inc:footer.inc~ - \ No newline at end of file diff --git a/WEBFilesTCP2UART/disk_er2.htm b/WEBFilesTCP2UART/disk_er2.htm deleted file mode 100644 index 65e5a15..0000000 --- a/WEBFilesTCP2UART/disk_er2.htm +++ /dev/null @@ -1,5 +0,0 @@ -~inc:timer.inc~ -

File to big in flash!

- -~inc:footer.inc~ - \ No newline at end of file diff --git a/WEBFilesTCP2UART/disk_er3.htm b/WEBFilesTCP2UART/disk_er3.htm deleted file mode 100644 index 31552cb..0000000 --- a/WEBFilesTCP2UART/disk_er3.htm +++ /dev/null @@ -1,5 +0,0 @@ -~inc:timer.inc~ -

Bad file!

- -~inc:footer.inc~ - \ No newline at end of file diff --git a/WEBFilesTCP2UART/disk_ok.htm b/WEBFilesTCP2UART/disk_ok.htm deleted file mode 100644 index 05e8f52..0000000 --- a/WEBFilesTCP2UART/disk_ok.htm +++ /dev/null @@ -1,5 +0,0 @@ -~inc:timer.inc~ -

Update Successful!

- -~inc:footer.inc~ - \ No newline at end of file diff --git a/WEBFilesTCP2UART/esp.gif b/WEBFilesTCP2UART/esp.gif deleted file mode 100644 index 2d22546..0000000 Binary files a/WEBFilesTCP2UART/esp.gif and /dev/null differ diff --git a/WEBFilesTCP2UART/favicon.ico b/WEBFilesTCP2UART/favicon.ico deleted file mode 100644 index 8c3e438..0000000 Binary files a/WEBFilesTCP2UART/favicon.ico and /dev/null differ diff --git a/WEBFilesTCP2UART/footer.inc b/WEBFilesTCP2UART/footer.inc deleted file mode 100644 index 4baa819..0000000 --- a/WEBFilesTCP2UART/footer.inc +++ /dev/null @@ -1,5 +0,0 @@ -
- Version: ~sys_sysver~.
- TCP2UART Connection: ~tcp_remote~, WEB Connection: ~web_remote~
-
-
(c) 2014..2015 by esp8266.ru
\ No newline at end of file diff --git a/WEBFilesTCP2UART/grf.js b/WEBFilesTCP2UART/grf.js deleted file mode 100644 index bf2669e..0000000 --- a/WEBFilesTCP2UART/grf.js +++ /dev/null @@ -1,613 +0,0 @@ -; -(function(exports) { - var Util = { - extend : function() { - arguments[0] = arguments[0] || {}; - for (var i = 1; i < arguments.length; i++) { - for ( var key in arguments[i]) { - if (arguments[i].hasOwnProperty(key)) { - if (typeof (arguments[i][key]) === 'object') { - if (arguments[i][key] instanceof Array) { - arguments[0][key] = arguments[i][key] - } else { - arguments[0][key] = Util.extend( - arguments[0][key], arguments[i][key]) - } - } else { - arguments[0][key] = arguments[i][key] - } - } - } - } - return arguments[0] - } - }; - function TimeSeries(options) { - this.options = Util.extend({}, TimeSeries.defaultOptions, options); - this.clear() - } - TimeSeries.defaultOptions = { - resetBoundsInterval : 3000, - resetBounds : true - }; - TimeSeries.prototype.clear = function() { - this.data = []; - this.maxValue = Number.NaN; - this.minValue = Number.NaN - }; - TimeSeries.prototype.resetBounds = function() { - if (this.data.length) { - this.maxValue = this.data[0][1]; - this.minValue = this.data[0][1]; - for (var i = 1; i < this.data.length; i++) { - var value = this.data[i][1]; - if (value > this.maxValue) { - this.maxValue = value - } - if (value < this.minValue) { - this.minValue = value - } - } - } else { - this.maxValue = Number.NaN; - this.minValue = Number.NaN - } - }; - TimeSeries.prototype.append = function(timestamp, value, - sumRepeatedTimeStampValues) { - var i = this.data.length - 1; - while (i >= 0 && this.data[i][0] > timestamp) { - i-- - } - if (i === -1) { - this.data.splice(0, 0, [ timestamp, value ]) - } else if (this.data.length > 0 && this.data[i][0] === timestamp) { - if (sumRepeatedTimeStampValues) { - this.data[i][1] += value; - value = this.data[i][1] - } else { - this.data[i][1] = value - } - } else if (i < this.data.length - 1) { - this.data.splice(i + 1, 0, [ timestamp, value ]) - } else { - this.data.push([ timestamp, value ]) - } - this.maxValue = isNaN(this.maxValue) ? value : Math.max(this.maxValue, - value); - this.minValue = isNaN(this.minValue) ? value : Math.min(this.minValue, - value) - }; - TimeSeries.prototype.dropOldData = function(oldestValidTime, - maxDataSetLength) { - var removeCount = 0; - while (this.data.length - removeCount >= maxDataSetLength - && this.data[removeCount + 1][0] < oldestValidTime) { - removeCount++ - } - if (removeCount !== 0) { - this.data.splice(0, removeCount) - } - }; - function SmoothieChart(options) { - this.options = Util.extend({}, SmoothieChart.defaultChartOptions, - options); - this.seriesSet = []; - this.currentValueRange = 1; - this.currentVisMinValue = 0; - this.lastRenderTimeMillis = 0 - } - SmoothieChart.defaultChartOptions = { - millisPerPixel : 20, - enableDpiScaling : true, - yMinFormatter : function(min, precision) { - return parseFloat(min).toFixed(precision) - }, - yMaxFormatter : function(max, precision) { - return parseFloat(max).toFixed(precision) - }, - maxValueScale : 1, - interpolation : 'bezier', - scaleSmoothing : 0.125, - maxDataSetLength : 2, - grid : { - fillStyle : '#000000', - strokeStyle : '#777777', - lineWidth : 1, - sharpLines : false, - millisPerLine : 1000, - verticalSections : 2, - borderVisible : true - }, - labels : { - fillStyle : '#ffffff', - disabled : false, - fontSize : 10, - fontFamily : 'monospace', - precision : 2 - }, - horizontalLines : [] - }; - SmoothieChart.AnimateCompatibility = (function() { - var requestAnimationFrame = function(callback, element) { - var requestAnimationFrame = window.requestAnimationFrame - || window.webkitRequestAnimationFrame - || window.mozRequestAnimationFrame - || window.oRequestAnimationFrame - || window.msRequestAnimationFrame || function(callback) { - return window.setTimeout(function() { - callback(new Date().getTime()) - }, 16) - }; - return requestAnimationFrame.call(window, callback, element) - }, cancelAnimationFrame = function(id) { - var cancelAnimationFrame = window.cancelAnimationFrame - || function(id) { - clearTimeout(id) - }; - return cancelAnimationFrame.call(window, id) - }; - return { - requestAnimationFrame : requestAnimationFrame, - cancelAnimationFrame : cancelAnimationFrame - } - })(); - SmoothieChart.defaultSeriesPresentationOptions = { - lineWidth : 1, - strokeStyle : '#ffffff' - }; - SmoothieChart.prototype.addTimeSeries = function(timeSeries, options) { - this.seriesSet.push({ - timeSeries : timeSeries, - options : Util.extend({}, - SmoothieChart.defaultSeriesPresentationOptions, options) - }); - if (timeSeries.options.resetBounds - && timeSeries.options.resetBoundsInterval > 0) { - timeSeries.resetBoundsTimerId = setInterval(function() { - timeSeries.resetBounds() - }, timeSeries.options.resetBoundsInterval) - } - }; - SmoothieChart.prototype.removeTimeSeries = function(timeSeries) { - var numSeries = this.seriesSet.length; - for (var i = 0; i < numSeries; i++) { - if (this.seriesSet[i].timeSeries === timeSeries) { - this.seriesSet.splice(i, 1); - break - } - } - if (timeSeries.resetBoundsTimerId) { - clearInterval(timeSeries.resetBoundsTimerId) - } - }; - SmoothieChart.prototype.getTimeSeriesOptions = function(timeSeries) { - var numSeries = this.seriesSet.length; - for (var i = 0; i < numSeries; i++) { - if (this.seriesSet[i].timeSeries === timeSeries) { - return this.seriesSet[i].options - } - } - }; - SmoothieChart.prototype.bringToFront = function(timeSeries) { - var numSeries = this.seriesSet.length; - for (var i = 0; i < numSeries; i++) { - if (this.seriesSet[i].timeSeries === timeSeries) { - var set = this.seriesSet.splice(i, 1); - this.seriesSet.push(set[0]); - break - } - } - }; - SmoothieChart.prototype.streamTo = function(canvas, delayMillis) { - this.canvas = canvas; - this.delay = delayMillis; - this.start() - }; - SmoothieChart.prototype.start = function() { - if (this.frame) { - return - } - if (this.options.enableDpiScaling && window - && window.devicePixelRatio !== 1) { - var canvasWidth = this.canvas.getAttribute('width'); - var canvasHeight = this.canvas.getAttribute('height'); - this.canvas.setAttribute('width', canvasWidth - * window.devicePixelRatio); - this.canvas.setAttribute('height', canvasHeight - * window.devicePixelRatio); - this.canvas.style.width = canvasWidth + 'px'; - this.canvas.style.height = canvasHeight + 'px'; - this.canvas.getContext('2d').scale(window.devicePixelRatio, - window.devicePixelRatio) - } - var animate = function() { - this.frame = SmoothieChart.AnimateCompatibility - .requestAnimationFrame(function() { - this.render(); - animate() - }.bind(this)) - }.bind(this); - animate() - }; - SmoothieChart.prototype.stop = function() { - if (this.frame) { - SmoothieChart.AnimateCompatibility.cancelAnimationFrame(this.frame); - delete this.frame - } - }; - SmoothieChart.prototype.updateValueRange = function() { - var chartOptions = this.options, chartMaxValue = Number.NaN, chartMinValue = Number.NaN; - for (var d = 0; d < this.seriesSet.length; d++) { - var timeSeries = this.seriesSet[d].timeSeries; - if (!isNaN(timeSeries.maxValue)) { - chartMaxValue = !isNaN(chartMaxValue) ? Math.max(chartMaxValue, - timeSeries.maxValue) : timeSeries.maxValue - } - if (!isNaN(timeSeries.minValue)) { - chartMinValue = !isNaN(chartMinValue) ? Math.min(chartMinValue, - timeSeries.minValue) : timeSeries.minValue - } - } - if (chartOptions.maxValue != null) { - chartMaxValue = chartOptions.maxValue - } else { - chartMaxValue *= chartOptions.maxValueScale - } - if (chartOptions.minValue != null) { - chartMinValue = chartOptions.minValue - } - if (this.options.yRangeFunction) { - var range = this.options.yRangeFunction({ - min : chartMinValue, - max : chartMaxValue - }); - chartMinValue = range.min; - chartMaxValue = range.max - } - if (!isNaN(chartMaxValue) && !isNaN(chartMinValue)) { - var targetValueRange = chartMaxValue - chartMinValue; - var valueRangeDiff = (targetValueRange - this.currentValueRange); - var minValueDiff = (chartMinValue - this.currentVisMinValue); - this.isAnimatingScale = Math.abs(valueRangeDiff) > 0.1 - || Math.abs(minValueDiff) > 0.1; - this.currentValueRange += chartOptions.scaleSmoothing - * valueRangeDiff; - this.currentVisMinValue += chartOptions.scaleSmoothing - * minValueDiff - } - this.valueRange = { - min : chartMinValue, - max : chartMaxValue - } - }; - SmoothieChart.prototype.render = function(canvas, time) { - var nowMillis = new Date().getTime(); - if (!this.isAnimatingScale) { - var maxIdleMillis = Math.min(1000 / 6, this.options.millisPerPixel); - if (nowMillis - this.lastRenderTimeMillis < maxIdleMillis) { - return - } - } - this.lastRenderTimeMillis = nowMillis; - canvas = canvas || this.canvas; - time = time || nowMillis - (this.delay || 0); - time -= time % this.options.millisPerPixel; - var context = canvas.getContext('2d'), chartOptions = this.options, dimensions = { - top : 0, - left : 0, - width : canvas.clientWidth, - height : canvas.clientHeight - }, oldestValidTime = time - - (dimensions.width * chartOptions.millisPerPixel), valueToYPixel = function( - value) { - var offset = value - this.currentVisMinValue; - return this.currentValueRange === 0 ? dimensions.height - : dimensions.height - - (Math.round((offset / this.currentValueRange) - * dimensions.height)) - }.bind(this), timeToXPixel = function(t) { - return Math.round(dimensions.width - - ((time - t) / chartOptions.millisPerPixel)) - }; - this.updateValueRange(); - context.font = chartOptions.labels.fontSize + 'px ' - + chartOptions.labels.fontFamily; - context.save(); - context.translate(dimensions.left, dimensions.top); - context.beginPath(); - context.rect(0, 0, dimensions.width, dimensions.height); - context.clip(); - context.save(); - context.fillStyle = chartOptions.grid.fillStyle; - context.clearRect(0, 0, dimensions.width, dimensions.height); - context.fillRect(0, 0, dimensions.width, dimensions.height); - context.restore(); - context.save(); - context.lineWidth = chartOptions.grid.lineWidth; - context.strokeStyle = chartOptions.grid.strokeStyle; - if (chartOptions.grid.millisPerLine > 0) { - context.beginPath(); - for (var t = time - (time % chartOptions.grid.millisPerLine); t >= oldestValidTime; t -= chartOptions.grid.millisPerLine) { - var gx = timeToXPixel(t); - if (chartOptions.grid.sharpLines) { - gx -= 0.5 - } - context.moveTo(gx, 0); - context.lineTo(gx, dimensions.height) - } - context.stroke(); - context.closePath() - } - for (var v = 1; v < chartOptions.grid.verticalSections; v++) { - var gy = Math.round(v * dimensions.height - / chartOptions.grid.verticalSections); - if (chartOptions.grid.sharpLines) { - gy -= 0.5 - } - context.beginPath(); - context.moveTo(0, gy); - context.lineTo(dimensions.width, gy); - context.stroke(); - context.closePath() - } - if (chartOptions.grid.borderVisible) { - context.beginPath(); - context.strokeRect(0, 0, dimensions.width, dimensions.height); - context.closePath() - } - context.restore(); - if (chartOptions.horizontalLines && chartOptions.horizontalLines.length) { - for (var hl = 0; hl < chartOptions.horizontalLines.length; hl++) { - var line = chartOptions.horizontalLines[hl], hly = Math - .round(valueToYPixel(line.value)) - 0.5; - context.strokeStyle = line.color || '#ffffff'; - context.lineWidth = line.lineWidth || 1; - context.beginPath(); - context.moveTo(0, hly); - context.lineTo(dimensions.width, hly); - context.stroke(); - context.closePath() - } - } - for (var d = 0; d < this.seriesSet.length; d++) { - context.save(); - var timeSeries = this.seriesSet[d].timeSeries, dataSet = timeSeries.data, seriesOptions = this.seriesSet[d].options; - timeSeries.dropOldData(oldestValidTime, - chartOptions.maxDataSetLength); - context.lineWidth = seriesOptions.lineWidth; - context.strokeStyle = seriesOptions.strokeStyle; - context.beginPath(); - var firstX = 0, lastX = 0, lastY = 0; - for (var i = 0; i < dataSet.length && dataSet.length !== 1; i++) { - var x = timeToXPixel(dataSet[i][0]), y = valueToYPixel(dataSet[i][1]); - if (i === 0) { - firstX = x; - context.moveTo(x, y) - } else { - switch (chartOptions.interpolation) { - case "linear": - case "line": { - context.lineTo(x, y); - break - } - case "bezier": - default: { - context.bezierCurveTo(Math.round((lastX + x) / 2), - lastY, Math.round((lastX + x)) / 2, y, x, y); - break - } - case "step": { - context.lineTo(x, lastY); - context.lineTo(x, y); - break - } - } - } - lastX = x; - lastY = y - } - if (dataSet.length > 1) { - if (seriesOptions.fillStyle) { - context.lineTo(dimensions.width + seriesOptions.lineWidth - + 1, lastY); - context.lineTo(dimensions.width + seriesOptions.lineWidth - + 1, dimensions.height + seriesOptions.lineWidth - + 1); - context.lineTo(firstX, dimensions.height - + seriesOptions.lineWidth); - context.fillStyle = seriesOptions.fillStyle; - context.fill() - } - if (seriesOptions.strokeStyle - && seriesOptions.strokeStyle !== 'none') { - context.stroke() - } - context.closePath() - } - context.restore() - } - if (!chartOptions.labels.disabled && !isNaN(this.valueRange.min) - && !isNaN(this.valueRange.max)) { - var maxValueString = chartOptions.yMaxFormatter( - this.valueRange.max, chartOptions.labels.precision), minValueString = chartOptions - .yMinFormatter(this.valueRange.min, - chartOptions.labels.precision); - context.fillStyle = chartOptions.labels.fillStyle; - context.fillText(maxValueString, dimensions.width - - context.measureText(maxValueString).width - 2, - chartOptions.labels.fontSize); - context.fillText(minValueString, dimensions.width - - context.measureText(minValueString).width - 2, - dimensions.height - 2) - } - if (chartOptions.timestampFormatter - && chartOptions.grid.millisPerLine > 0) { - var textUntilX = dimensions.width - - context.measureText(minValueString).width + 4; - for (var t = time - (time % chartOptions.grid.millisPerLine); t >= oldestValidTime; t -= chartOptions.grid.millisPerLine) { - var gx = timeToXPixel(t); - if (gx < textUntilX) { - var tx = new Date(t), ts = chartOptions - .timestampFormatter(tx), tsWidth = context - .measureText(ts).width; - textUntilX = gx - tsWidth - 2; - context.fillStyle = chartOptions.labels.fillStyle; - context.fillText(ts, gx - tsWidth, dimensions.height - 2) - } - } - } - context.restore() - }; - SmoothieChart.timeFormatter = function(date) { - function pad2(number) { - return (number < 10 ? '0' : '') + number - } - return pad2(date.getHours()) + ':' + pad2(date.getMinutes()) + ':' - + pad2(date.getSeconds()) - }; - exports.TimeSeries = TimeSeries; - exports.SmoothieChart = SmoothieChart -})(typeof exports === 'undefined' ? this : exports); -var line1 = new TimeSeries(); -var newval = 0; -function addpoint(xmlData) { - if (xmlData) { - newval = eval(getXMLValue(xmlData, 'value')); - line1.append(new Date().getTime(), newval); - document.getElementById('xdata').innerHTML = newval; - if (newval > xmax) - document.getElementById('xdata').style.color = '#0000A0'; - else if (newval < xmin) - document.getElementById('xdata').style.color = '#A00000'; - else - document.getElementById('xdata').style.color = '#00A000' - } else - line1.append(new Date().getTime(), newval) -} -var smoothie = new SmoothieChart({ - interpolation : 'linear', - minValue : 0, - millisPerPixel : millisPerPixel, - grid : { - strokeStyle : 'rgb(100, 110, 150)', - fillStyle : 'rgb(50, 55, 75)', - lineWidth : 1, - millisPerLine : millisPerLine, - verticalSections : 6 - }, - labels : { - precision : 0 - } -}); -smoothie.addTimeSeries(line1, { - strokeStyle : 'rgb(255, 0, 200)', - fillStyle : 'rgba(255, 0, 200, 0.3)', - lineWidth : 3 -}); -smoothie.streamTo(document.getElementById("mycanvas"), nextimeout); -setTimeout("newAJAXCommand(xmlfile, addpoint, true)", 100); -function slider(elemId, sliderWidth, range1, range2, step) { - var knobWidth = 17; - var knobHeight = 21; - var sliderHeight = 21; - var offsX, tmp; - var d = document; - var isIE = d.all || window.opera; - var point = (sliderWidth - knobWidth - 3) / (range2 - range1); - var slider = d.createElement('DIV'); - slider.id = elemId + '_slider'; - slider.className = 'slider'; - d.getElementById(elemId).appendChild(slider); - var knob = d.createElement('DIV'); - knob.id = elemId + '_knob'; - knob.className = 'knob'; - slider.appendChild(knob); - knob.style.left = 0; - knob.style.width = knobWidth + 'px'; - knob.style.height = knobHeight + 'px'; - slider.style.width = sliderWidth + 'px'; - slider.style.height = sliderHeight + 'px'; - var sliderOffset = slider.offsetLeft; - tmp = slider.offsetParent; - while (tmp.tagName != 'BODY') { - sliderOffset += tmp.offsetLeft; - tmp = tmp.offsetParent - } - if (isIE) { - knob.onmousedown = startCoord; - slider.onclick = sliderClick; - knob.onmouseup = endCoord; - slider.onmouseup = endCoord - } else { - knob.addEventListener("mousedown", startCoord, true); - slider.addEventListener("click", sliderClick, true); - knob.addEventListener("mouseup", endCoord, true); - slider.addEventListener("mouseup", endCoord, true) - } - function setValue(x) { - if (x < 0) - knob.style.left = 0; - else if (x > sliderWidth - knobWidth - 3) - knob.style.left = (sliderWidth - 3 - knobWidth) + 'px'; - else { - if (step == 0) - knob.style.left = x + 'px'; - else - knob.style.left = Math.round(x / (step * point)) * step * point - + 'px' - } - nextimeout = getValue(); - d.getElementById('toutid').value = nextimeout; - document.getElementById('toutid').innerHTML = nextimeout - } - function setValue2(x) { - if (x < range1 || x > range2) - alert('Value is not included into a slider range!'); - else - setValue((x - range1) * point); - nextimeout = getValue(); - d.getElementById('toutid').value = nextimeout; - document.getElementById('toutid').innerHTML = nextimeout - } - function getValue() { - return Math.round(parseInt(knob.style.left) / point) + range1 - } - function sliderClick(e) { - var x; - if (isIE) { - if (event.srcElement != slider) - return; - x = event.offsetX - Math.round(knobWidth / 2) - } else - x = e.pageX - sliderOffset - knobWidth / 2; - setValue(x) - } - function startCoord(e) { - if (isIE) { - offsX = event.clientX - parseInt(knob.style.left); - slider.onmousemove = mov - } else { - slider.addEventListener("mousemove", mov, true) - } - } - function mov(e) { - var x; - if (isIE) - x = event.clientX - offsX; - else - x = e.pageX - sliderOffset - knobWidth / 2; - setValue(x) - } - function endCoord() { - if (isIE) - slider.onmousemove = null; - else - slider.removeEventListener("mousemove", mov, true) - } - this.setValue = setValue2; - this.getValue = getValue -} -var mysl1 = new slider('sl', 333, 20, 10020, 0); -mysl1.setValue(500); -document.getElementById('toutid').innerHTML = mysl1.getValue(); \ No newline at end of file diff --git a/WEBFilesTCP2UART/grfx1.inc b/WEBFilesTCP2UART/grfx1.inc deleted file mode 100644 index 14fde81..0000000 --- a/WEBFilesTCP2UART/grfx1.inc +++ /dev/null @@ -1,13 +0,0 @@ - - - - ESP8266 - - - -~inc:menu.inc~ - -
\ No newline at end of file diff --git a/WEBFilesTCP2UART/grfx2.inc b/WEBFilesTCP2UART/grfx2.inc deleted file mode 100644 index 30b1323..0000000 --- a/WEBFilesTCP2UART/grfx2.inc +++ /dev/null @@ -1,6 +0,0 @@ -
-
GET TimeOuts ? ms'
-
- - -~inc:footer.inc~ diff --git a/WEBFilesTCP2UART/heap.htm b/WEBFilesTCP2UART/heap.htm deleted file mode 100644 index 1cf6850..0000000 --- a/WEBFilesTCP2UART/heap.htm +++ /dev/null @@ -1,9 +0,0 @@ -~inc:grfx1.inc~ -Heap Size: ? bytes -~inc:grfx2.inc~ diff --git a/WEBFilesTCP2UART/heap.xml b/WEBFilesTCP2UART/heap.xml deleted file mode 100644 index edc3199..0000000 --- a/WEBFilesTCP2UART/heap.xml +++ /dev/null @@ -1 +0,0 @@ -Heap Size~sys_heap~ \ No newline at end of file diff --git a/WEBFilesTCP2UART/help/webvars.files/filelist.xml b/WEBFilesTCP2UART/help/webvars.files/filelist.xml deleted file mode 100644 index 3483a55..0000000 --- a/WEBFilesTCP2UART/help/webvars.files/filelist.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/WEBFilesTCP2UART/help/webvars.files/sheet001.htm b/WEBFilesTCP2UART/help/webvars.files/sheet001.htm deleted file mode 100644 index f62d5a2..0000000 --- a/WEBFilesTCP2UART/help/webvars.files/sheet001.htm +++ /dev/null @@ -1,1986 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
inc:filename  (include). - 3-.
filename - , .
( )
startstart=hdhd 32- - dec hex . hex .
stopstop=hdhd 32- - dec hex . hex .
xml_mdb  16 - Modbus xml <maddr>data</maddr>. - start, stop. unsigned dec .
xml_mdbs  16 - Modbus xml <maddr>data</maddr>. - start, stop. signed dec - .
xml_mdbh  16 - Modbus xml <maddr>data</maddr>. - start, stop. hex - '0x'.
xml_mdbx  16 - Modbus xml <maddr>data</maddr>. - start, stop. hex - c '0x'.
xml_ram  32- - start start 4. hex .
hexdmpb  - hex . start, stop.
hexdmpd  - hex dword . start, stop.
 hexdmpbaddr=len - hex web.cgi. addr - , len -, 16. dec hex .
: - web.cgi?hexdmpb0x40000000=0x100
 hexdmpbaddr=len dword - web.cgi. addr - , len -, 16. dec hex .
: - web.cgi?hexdmpd0x40000000=0x100
bin_ram  ram - i/o. addr - , len - .
bin_flash  Flash. addr - , len - .
bin_flash_all  Flash
bin_flash_sec_num  num Flash (4)
bin_flash_disk  - Flash.
bin_flash_const  - Flash (128 )
sys_cid  hip ID. : 0099ad1d
sys_fid  Flash ID. : 001340c8
sys_fsize  Flash - dec .
sys_sdkver  - SDK. : 1.4.1
sys_sysver  . - : 0.5.1
sys_webver  Web. - : 0.1.4
sys_heap  - heap dec .
sys_adc  ADC 16 - dec .
sys_time  - , 32 , dec .
sys_rtctime  RTC, RTC - (~5.75us), 32 , dec .
sys_mactime  - , 64 , hex .
sys_vdd33  - , ADC. - . . - sys_uconst_0.
sys_wdt  WDT
sys_res_event  :
1 - power/ch_pd, 2 - reset, 3 - - software, 4 - wdt ...
sys_rst  : - system_get_rst_info()
sys_clkcpusys_clkcpu=XMHz CLK CPU MHz. XMHz 80 160 MHz.
 sys_sleep_option=nn - - deep-sleep.
. - system_deep_sleep_set_option(n)
 sys_sleep_us=x deep_sleep - x .
sys_sleep_old  - deep-sleep.
RTC - deep-sleep / - , ( ).
sys_resetsys_reset=12345 - CPU.
sys_restartsys_restart=12345 - system_restart().
sys_ramaddrsys_ramaddr=x,x,x, 32- - addr hex - . addr - 4-. addr - hex dec .
x 32- - hex dec .
sys_rdecaddr  32- - addr dec - . addr 4-. addr hex dec - .
sys_ip  IP , - .
sys_url  url, - , WiFi.
sys_debugsys_debug=x - TX UART1 (GPIO2).
x =0 - , =1 .
sys_vdd  - . ( sys_const_107).
sys_netbios  NETBIOS, AP - A, ST S.
sys_const_numsys_const_num=x - esp_init_data_default.bin. num - 0 127 - esp_init_data_default.bin. num hex dec . 8 dec .
x 8 - dec - hex
sys_const_faddr  - esp_init_data_default.bin. 0x00007C00
sys_ucnst_numsys_ucnst_num=x4- 32- - . num - hex dec 0 3 . dec .
x 32 - - dec hex
SNTP
sntp_time  SNTP. =0 - - SNTP .
WiFi
wifi_modewifi_mode=xwifi_get_opmode()
wifi_phywifi_phy=xwifi_get_phy_mode()
wifi_sleepwifi_sleep=xwifi_get_sleep_type()
wifi_maxpwwifi_maxpw=xsystem_phy_set_max_tpw()
wifi_vddpwwifi_vddpw=xsystem_phy_set_tpw_via_vdd33(x)
wifi_rfoptwifi_rfopt=xsystem_phy_set_rfoption(x)
wifi_scanwifi_scan=1 scan - xml, .
 wifi_aps_cnt=n - - wifi_station_ap_number_set(n)
wifi_aps_idwifi_aps_id=nwifi_station_get_current_ap_id(), - wifi_station_ap_change(n)
wifi_aps_xml  aps - xml
wifi_prrq_xml  Probe - Request xml
wifi_rdcfgwifi_rdcfg=mask WiFi - .
wifi_rdcfg .
wifi_newcfgwifi_newcfg=mask WiFi - flash .
wifi_newcfg , - flash .
 wifi_read=mask WiFi flash - .
 wifi_save=mask WiFi - WiFi flash.
WiFi STATION
wifi_st_aucnwifi_st_aucn=x/ - -
wifi_st_rectwifi_st_rect =sec -. 0..8192 -
wifi_st_dhcpwifi_st_dhcp=xDHCP /
wifi_st_ipwifi_st_sip=ipIP
wifi_st_mskwifi_st_msk=mask_ip IP
wifi_st_gwwifi_st_gw=gateway_ipGateway
wifi_st_macwifi_st_mac=macMAC
wifi_st_ssidwifi_st_ssid=ssidSSID
wifi_st_pswwifi_st_psw=password, 8
wifi_st_bssidwifi_st_bssid= bssidBSSID
wifi_st_sbsswifi_st_sbss=nBSSID on/off
wifi_st_hostnamewifi_st_hostname=hostnameHost Name
wifi_st_rssi RSSI
wifi_st_sta wifi_station_get_connect_status()
WiFi SOFT AP
wifi_ap_dhcpwifi_st_dhcp=xDNCP /
wifi_ap_sipwifi_st_sip=start_ipDHCP IP
wifi_ap_eipwifi_st_eip=end_ipDHCP IP
wifi_ap_mskwifi_st_msk=mask_ipDHCP IP
wifi_ap_gwwifi_st_gw=gateway_ipGateway
wifi_ap_macwifi_st_mac=macMAC
wifi_ap_ssidwifi_st_ssid=ssidSSID
wifi_ap_hssidwifi_ap_hssid=nSSID hidden
wifi_ap_pswwifi_st_psw=password, 8
wifi_ap_authwifi_ap_auth=nAuth mode
wifi_ap_bintwifi_ap_bint=nBeacon interval 100..60000 ms
wifi_ap_chlwifi_ap_chl=nChannel
wifi_ap_mcnswifi_ap_mcns=nMax connections
TCP2UART
tcp_remote  IP:Port , - closed
tcp_host  IP:Port, - none
WEB server
web_remote  IP:Port
web_host  IP:Port
Modbus
 mdbfini=__ - - modbus c web . init.ini.
mdb_remote  IP:Port , - closed
mdbudaddr  dword unsigned, addr - (dec hex)
mdbsdaddr  dword signed, addr - (dec hex)
mdbhdaddr  dword hex '0x', addr - (dec hex)
mdbxdaddr  dword hex c '0x', addr - (dec hex)
mdbuwaddr  word unsigned, addr - (dec hex)
mdbswaddr  word signed, addr - (dec hex)
mdbhwaddr  dword hex '0x', addr - (dec hex)
 mdbwaddr=x,x,x word x (dec hex) c addr (dec hex)
 mdbdaddr=x,x,x, dword x (dec hex) c addr (dec hex)
 mdbtn=x,x,x, - n, dec hex.
mdbaaddrmdbaaddr=stirng/ ( 32- ),
addr - - (dec hex)
Web File System
wfs_files -
wfs_addr 32- - Flash, hex
wfs_size 32- - Flash, dec
wfs_max_size 32- - Flash, dec
Wave UDP port
wdrv_freqwdrv_freq=srSample Rate, 1192000 , dec .
wdrv_portwdrv_port=n host 1..65535
wdrv_ipwdrv_ip=ipHost IP, 255.255.255.255 - broadcast
 wdrv_init=n remote 3..65535
 wdrv_start=sr , Sample Rate, - 1192000
 Wdrv_stop=any
test_adc  ADC - wave (mono, 14 , 22 )
GPIO
gpio_inpgpio_inp=x GPIO0..GPIO15 - 16 . dec - .
x 16 - - dec hex .
gpio_outgpio_out=x - GPIO0..GPIO15 16 . dec .
x 16 - - dec hex .
gpio_dirgpio_dir=x ( =1 , =0 - ) GPIO0..GPIO15 16 . dec .
x 16 - - dec hex .
 gpio_ena=x - GPIOn - .
x = 16 - - dec hex.
n - GPIO: 0..15
 gpio_dis=x - GPIOn .
x = 16 - - dec hex.
n - GPIO: 0..15
gpion_inp  GPIOn, 0 1.
n - GPIO: 0..15
gpion_outgpion_out=x/ - GPIOn.
x =0 - - 0, =1 - 1, =3 - .
n - GPIO: 0..15
 gpion_clr=x/ 0 - GPIOn,
x - 0 1.
n - GPIO: 0..15
 gpion_set=x/ 1 GPIOn,
x - 0 1.
n - GPIO: 0..15
gpion_dirgpion_dir=x/ - GPIOn.
x =1 - - , =0 - .
n - GPIO: 0..15
 gpion_ena=any - GPIOn
n - GPIO: 0..15
 gpion_dis=any - GPIOn
n - GPIO: 0..15
gpion_fungpion_fun=fun/ GPIOn.
fun = 0..5
n - GPIO: 0..15
gpion_pull  pull GPIOn.
x =0 - , - =2 - pullup, =1 pulldown ( )
n - GPIO: 0..15
gpion_opdgpion_opd=x/ - GPIOn.
x =0 - , - =1 , =3 - .
n - GPIO: 0..15
gpion_pugpion_pu=x/ pullup GPIOn.
x =0 - , - =1 , =3 - .
n - GPIO: 0..15
gpion_pdgpion_pd=x/ pulldown GPIOn ( ).
x =0 - , - =1 , =3 - .
n - GPIO: 0..15
 gpion_io=any GPIOn i/o port.
n - GPIO: 0..15
 gpion_def=any GPIOn SDK.
n - GPIO: 0..15
 gpion_sgs=duty GPIOn sigma-delta 312
duty - duty 0 255.
n - GPIO: 0..15
 gpion_sg=any GPIOn sigma-delta 312
n - GPIO: 0..15
 gpio_sgn=duty duty sigma-delta 312
duty - duty 0 255.
cfg_web_portcfg_web_port=n port Web . =0 -
cfg_web_twreccfg_web_twrec=n - Web , .
n =0 - -
cfg_web_twclscfg_web_twcls=n - Web , .
n =0 - -
cfg_web_twdcfg_web_twd=n TIME_WAIT - pcb
cfg_tcp_tcreccfg_tcp_tcrec=n - TCP , .
cfg_tcp_portcfg_tcp_port=nPort TCP2UART. =0
cfg_tcp_twreccfg_tcp_twrec=n - TCP2UART , .
n =0 - -
cfg_tcp_twclscfg_tcp_twcls=n - TCP2UART , .
n =0 - -
cfg_tcp_reopcfg_tcp_reop=n - TCP2UART . =1 , =0
cfg_tcp_urlcfg_tcp_url=ip ip. - none, 127.0.0.1, ip TCP2UART . - .
cfg_mdb_portcfg_mdb_port=nPort Modbus TCP. =0
cfg_mdb_twreccfg_mdb_twrec=n - Modbus TCP , .
n =0 - -
cfg_mdb_twclscfg_mdb_twcls=n - Modbus TCP , .
n =0 - -
cfg_mdb_reopcfg_mdb_reop=n - Modbus TCP . =1 , =0
cfg_udpcfg_udp=n port UDP. =0 -
cfg_wdrv_portcfg_wdrv_port=n port UDP Wave - ADC.
=0
cfg_overclkcfg_overclk=n CLK CPU 160 MHz. - =1 , =0
cfg_pinclrcfg_pinclr=n WiFi - RX. =1 , =0
cfg_debugcfg_debug=n - UART1. =1 , =0
cfg_netbioscfg_netbios=n NETBIOS. =1 , =0
cfg_sntpcfg_sntp=n SNTP. =1 , =0
cfg_cdnscfg_cdns=n Capture portal. =1 , =0
 cfg_save=n .
=1 , =2 - , .
UART0 & UART1
uart_n_bauduart_n_baud=xBaud rate UARTn.
x 300 - 10000000.
uart_n_bitsuart_n_bits=x- UARTn.
x =0 5 - , =3 8 .
uart_n_parityuart_n_parity=xEnable Parity UARTn.
x =0 disable, =1 enable.
uart_n_evenuart_n_even=xParity UARTn.
x =0 even, =1 odd.
uart_n_stopuart_n_stop=x- UARTn.
x =1 1 - , =2 1.5 , =3 2 .
uart_n_loopbackuart_n_loopback=xEnable loopback UARTn.
x =0 disable, =1 enable.
uart_n_swapuart_n_swap=xEnable swap pin RX<->CTS, - TX<->RTS UARTn.
x =0 disable, =1 enable.
uart_n_flowuart_n_flow=xEnable flow control UARTn.
x =0 disable, =1 enable.
uart_n_rts_invuart_n_rts_inv=x RTS UARTn.
x =0 disable, =1 enable.
uart_n_cts_invuart_n_cts_inv=x CTS UARTn.
x =0 disable, =1 enable.
uart_n_rxd_invuart_n_rxd_inv=x RXD UARTn.
x =0 disable, =1 enable.
uart_n_txd_invuart_n_txd_inv=x TXD UARTn.
x =0 disable, =1 enable.
uart_n_dtr_invuart_n_dtr_inv=x DTR UARTn.
x =0 disable, =1 enable.
uart_n_dsr_invuart_n_dsr_inv=x DSR UARTn.
x =0 disable, =1 enable.
 uart_save=n UARTx
n 0 =1 - UART0, 1 - =1 UART1.
 uart_read=n - UARTx UARTx.
n 0 =1 - UART0, 1 - =1 UART1.
- - - - diff --git a/WEBFilesTCP2UART/help/webvars.files/sheet002.htm b/WEBFilesTCP2UART/help/webvars.files/sheet002.htm deleted file mode 100644 index aa88b51..0000000 --- a/WEBFilesTCP2UART/help/webvars.files/sheet002.htm +++ /dev/null @@ -1,239 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- ( )
0..99u16BUF Modbus TCP <-> WEB
 
110016bitGPIO_IN : 0 = GPIO0, , 15 = GPIO15
110116bitGPIO_OUT : - 0 = GPIO0, , 15 = GPIO15
110216bitGPIO_OUT_SET : 1 GPIO_OUT
110316bitGPIO_OUT_CLEAR : 1 GPIO_OUT
110416bitGPIO_ENABLE 1 : 0 = GPIO0, - , 15 = GPIO15
1105u16GPIO_NUM - ( 0 15 )
1106u16GPIO_FUNC (0..4). - GPIO_NUM.
1107u16GPIO_PULLUP +VDD (= 0 - , =1 - ). - GPIO_NUM.
1108u16GPIO_OD" " (= 0 - , =1 - ) - GPIO_NUM.
1109u16GPIO_MUX . - GPIO_NUM.
1110u16ADC ADC
1111u16VDD VDD c ADC
1112u16arg_ UserFunc UserFunc
1113u16UserFunc UserFunc ( = 1 - deep_sleep(arg_ UserFunc ))
1112u32SNTP Time SNTP, = 0 - . - .
1114u64Mac Time Mac Time . - .
- RTC (256 / 512 )
1300u16Start RTC RAM 256 RTC RAM
1555u16End RTC RAM ( ) RTC RAM
- - - - diff --git a/WEBFilesTCP2UART/help/webvars.files/stylesheet.css b/WEBFilesTCP2UART/help/webvars.files/stylesheet.css deleted file mode 100644 index 423258d..0000000 --- a/WEBFilesTCP2UART/help/webvars.files/stylesheet.css +++ /dev/null @@ -1,499 +0,0 @@ -tr - {mso-height-source:auto;} -col - {mso-width-source:auto;} -br - {mso-data-placement:same-cell;} -.style0 - {mso-number-format:General; - text-align:general; - vertical-align:bottom; - white-space:nowrap; - mso-rotate:0; - mso-background-source:auto; - mso-pattern:auto; - color:black; - font-size:11.0pt; - font-weight:400; - font-style:normal; - text-decoration:none; - font-family:Calibri, sans-serif; - mso-font-charset:204; - border:none; - mso-protection:locked visible; - mso-style-name:; - mso-style-id:0;} -.font0 - {color:black; - font-size:11.0pt; - font-weight:400; - font-style:normal; - text-decoration:none; - font-family:Calibri, sans-serif; - mso-font-charset:204;} -.font5 - {color:black; - font-size:11.0pt; - font-weight:400; - font-style:normal; - text-decoration:none; - font-family:Calibri, sans-serif; - mso-font-charset:204;} -.font8 - {color:black; - font-size:11.0pt; - font-weight:700; - font-style:normal; - text-decoration:none; - font-family:Calibri, sans-serif; - mso-font-charset:204;} -.font9 - {color:#0070C0; - font-size:11.0pt; - font-weight:700; - font-style:normal; - text-decoration:none; - font-family:Calibri, sans-serif; - mso-font-charset:204;} -.font10 - {color:#00B050; - font-size:11.0pt; - font-weight:400; - font-style:normal; - text-decoration:none; - font-family:Calibri, sans-serif; - mso-font-charset:204;} -.font11 - {color:#215968; - font-size:11.0pt; - font-weight:700; - font-style:normal; - text-decoration:none; - font-family:Calibri, sans-serif; - mso-font-charset:204;} -.font12 - {color:black; - font-size:9.0pt; - font-weight:400; - font-style:normal; - text-decoration:none; - font-family:Tahoma, sans-serif; - mso-font-charset:204;} -.font13 - {color:black; - font-size:10.5pt; - font-weight:400; - font-style:normal; - text-decoration:none; - font-family:Tahoma, sans-serif; - mso-font-charset:204;} -.font14 - {color:#215868; - font-size:11.0pt; - font-weight:700; - font-style:normal; - text-decoration:none; - font-family:Calibri, sans-serif; - mso-font-charset:204;} -.font15 - {color:#366092; - font-size:11.0pt; - font-weight:700; - font-style:normal; - text-decoration:none; - font-family:Calibri, sans-serif; - mso-font-charset:204;} -.font16 - {color:#215968; - font-size:11.0pt; - font-weight:400; - font-style:normal; - text-decoration:none; - font-family:Calibri, sans-serif; - mso-font-charset:204;} -.font17 - {color:#215967; - font-size:11.0pt; - font-weight:700; - font-style:normal; - text-decoration:none; - font-family:Calibri, sans-serif; - mso-font-charset:204;} -td - {mso-style-parent:style0; - padding-top:1px; - padding-right:1px; - padding-left:1px; - mso-ignore:padding; - color:black; - font-size:11.0pt; - font-weight:400; - font-style:normal; - text-decoration:none; - font-family:Calibri, sans-serif; - mso-font-charset:204; - mso-number-format:General; - text-align:general; - vertical-align:bottom; - border:none; - mso-background-source:auto; - mso-pattern:auto; - mso-protection:locked visible; - white-space:nowrap; - mso-rotate:0;} -.xl65 - {mso-style-parent:style0; - text-align:center;} -.xl66 - {mso-style-parent:style0; - color:white; - font-weight:700; - text-align:center; - vertical-align:middle; - border:1.0pt solid windowtext; - background:black; - mso-pattern:black none; - white-space:normal;} -.xl67 - {mso-style-parent:style0; - color:white; - font-weight:700; - text-align:center; - vertical-align:middle; - border-top:1.0pt solid windowtext; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:none; - background:black; - mso-pattern:black none; - white-space:normal;} -.xl68 - {mso-style-parent:style0; - vertical-align:middle; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:none; - border-left:none; - white-space:normal;} -.xl69 - {mso-style-parent:style0; - color:#0070C0; - font-weight:700; - vertical-align:middle; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:none; - white-space:normal;} -.xl70 - {mso-style-parent:style0; - font-weight:700; - text-align:center; - vertical-align:middle; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:1.0pt solid windowtext; - white-space:normal;} -.xl71 - {mso-style-parent:style0; - font-weight:700; - text-align:center; - vertical-align:middle; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:none; - white-space:normal;} -.xl72 - {mso-style-parent:style0; - text-align:center; - vertical-align:middle; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:none; - white-space:normal;} -.xl73 - {mso-style-parent:style0; - vertical-align:middle; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:none; - white-space:normal;} -.xl74 - {mso-style-parent:style0; - color:#215868; - font-weight:700; - vertical-align:middle; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:none; - border-left:none; - white-space:normal;} -.xl75 - {mso-style-parent:style0; - color:#215868; - font-weight:700; - vertical-align:middle; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:none; - white-space:normal;} -.xl76 - {mso-style-parent:style0; - color:#215968; - font-weight:700; - vertical-align:middle; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:none; - white-space:normal;} -.xl77 - {mso-style-parent:style0; - text-align:center; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:none; - border-left:1.0pt solid windowtext;} -.xl78 - {mso-style-parent:style0; - color:#215968; - font-weight:700; - vertical-align:middle; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:none; - border-left:none; - white-space:normal;} -.xl79 - {mso-style-parent:style0; - text-align:center; - vertical-align:middle;} -.xl80 - {mso-style-parent:style0; - font-style:italic; - vertical-align:middle; - border-top:1.0pt solid windowtext; - border-right:none; - border-bottom:1.0pt solid windowtext; - border-left:1.0pt solid windowtext; - white-space:normal;} -.xl81 - {mso-style-parent:style0; - font-style:italic; - vertical-align:middle; - border-top:1.0pt solid windowtext; - border-right:none; - border-bottom:1.0pt solid windowtext; - border-left:none; - white-space:normal;} -.xl82 - {mso-style-parent:style0; - font-style:italic; - vertical-align:middle; - border-top:1.0pt solid windowtext; - border-right:1.0pt solid black; - border-bottom:1.0pt solid windowtext; - border-left:none; - white-space:normal;} -.xl83 - {mso-style-parent:style0; - font-weight:700; - text-align:center; - vertical-align:middle; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:none; - border-left:1.0pt solid windowtext; - white-space:normal;} -.xl84 - {mso-style-parent:style0; - font-weight:700; - text-align:center; - vertical-align:middle; - border-top:1.0pt solid windowtext; - border-right:1.0pt solid windowtext; - border-bottom:none; - border-left:1.0pt solid windowtext; - white-space:normal;} -.xl85 - {mso-style-parent:style0; - text-align:center; - vertical-align:middle; - border-top:1.0pt solid windowtext; - border-right:1.0pt solid windowtext; - border-bottom:none; - border-left:1.0pt solid windowtext; - white-space:normal;} -.xl86 - {mso-style-parent:style0; - text-align:center; - vertical-align:middle; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:1.0pt solid windowtext; - white-space:normal;} -.xl87 - {mso-style-parent:style0; - font-weight:700; - text-align:center; - vertical-align:middle; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid black; - border-left:1.0pt solid windowtext; - white-space:normal;} -.xl88 - {mso-style-parent:style0; - font-weight:700; - text-align:center; - vertical-align:middle; - border-top:1.0pt solid black; - border-right:1.0pt solid windowtext; - border-bottom:none; - border-left:1.0pt solid windowtext; - white-space:normal;} -.xl89 - {mso-style-parent:style0; - text-align:center; - vertical-align:middle; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid black; - border-left:1.0pt solid windowtext; - white-space:normal;} -.xl90 - {mso-style-parent:style0; - vertical-align:middle; - border-top:1.0pt solid windowtext; - border-right:none; - border-bottom:1.0pt solid windowtext; - border-left:1.0pt solid windowtext; - white-space:normal;} -.xl91 - {mso-style-parent:style0; - vertical-align:middle; - border-top:1.0pt solid windowtext; - border-right:none; - border-bottom:1.0pt solid windowtext; - border-left:none; - white-space:normal;} -.xl92 - {mso-style-parent:style0; - vertical-align:middle; - border-top:1.0pt solid windowtext; - border-right:1.0pt solid black; - border-bottom:1.0pt solid windowtext; - border-left:none; - white-space:normal;} -.xl93 - {mso-style-parent:style0; - color:white; - font-weight:700; - text-align:center; - border:1.0pt solid windowtext; - background:black; - mso-pattern:black none;} -.xl94 - {mso-style-parent:style0; - color:white; - font-weight:700; - text-align:center; - border-top:1.0pt solid windowtext; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:none; - background:black; - mso-pattern:black none;} -.xl95 - {mso-style-parent:style0; - font-style:italic; - text-align:left; - border-top:1.0pt solid windowtext; - border-right:none; - border-bottom:1.0pt solid windowtext; - border-left:1.0pt solid windowtext;} -.xl96 - {mso-style-parent:style0; - font-style:italic; - text-align:left; - border-top:1.0pt solid windowtext; - border-right:none; - border-bottom:1.0pt solid windowtext; - border-left:none;} -.xl97 - {mso-style-parent:style0; - font-style:italic; - text-align:left; - border-top:1.0pt solid windowtext; - border-right:1.0pt solid black; - border-bottom:1.0pt solid windowtext; - border-left:none;} -.xl98 - {mso-style-parent:style0; - text-align:center; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:none; - border-left:none;} -.xl99 - {mso-style-parent:style0; - text-align:left; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:none; - border-left:none;} -.xl100 - {mso-style-parent:style0; - text-align:left; - border-top:1.0pt solid windowtext; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:none;} -.xl101 - {mso-style-parent:style0; - text-align:center; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:1.0pt solid windowtext;} -.xl102 - {mso-style-parent:style0; - text-align:center; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:none;} -.xl103 - {mso-style-parent:style0; - text-align:left; - border-top:none; - border-right:1.0pt solid windowtext; - border-bottom:1.0pt solid windowtext; - border-left:none;} -.xl104 - {mso-style-parent:style0; - text-align:center; - border-top:1.0pt solid windowtext; - border-right:1.0pt solid windowtext; - border-bottom:none; - border-left:1.0pt solid windowtext;} -.xl105 - {mso-style-parent:style0; - text-align:center; - border-top:1.0pt solid windowtext; - border-right:1.0pt solid windowtext; - border-bottom:none; - border-left:none;} -.xl106 - {mso-style-parent:style0; - text-align:left; - border-top:1.0pt solid windowtext; - border-right:1.0pt solid windowtext; - border-bottom:none; - border-left:none;} diff --git a/WEBFilesTCP2UART/help/webvars.files/tabstrip.htm b/WEBFilesTCP2UART/help/webvars.files/tabstrip.htm deleted file mode 100644 index 577ef7b..0000000 --- a/WEBFilesTCP2UART/help/webvars.files/tabstrip.htm +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - -
 WebVars  ModBus 
- - diff --git a/WEBFilesTCP2UART/help/webvars.htm b/WEBFilesTCP2UART/help/webvars.htm deleted file mode 100644 index 01e3242..0000000 --- a/WEBFilesTCP2UART/help/webvars.htm +++ /dev/null @@ -1,330 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - <body> - <p> , .</p> - </body> - - - diff --git a/WEBFilesTCP2UART/index.htm b/WEBFilesTCP2UART/index.htm deleted file mode 100644 index cb45cd5..0000000 --- a/WEBFilesTCP2UART/index.htm +++ /dev/null @@ -1,23 +0,0 @@ - - - - ESP8266 - - -~inc:menu.inc~ -
-

✯Info✯

-

-Name: ~wifi_ap_ssid~ Password: ~wifi_ap_psw~
-TCP2UART connect: ~tcp_remote~, Web connect: ~web_remote~,
-Modbus TCP Connection: ~mdb_remote~
-WEB ver: ~sys_webver~, SDK ver: ~sys_sdkver~.
-Power: ? V
-ChipID: ~sys_cid~.

-DevTime: SNTP disable
-PowerStartTime: ?

-

-~inc:footer.inc~ -~inc:vdd.inc~ -~inc:time.inc~ - \ No newline at end of file diff --git a/WEBFilesTCP2UART/led.xml b/WEBFilesTCP2UART/led.xml deleted file mode 100644 index c0865c9..0000000 --- a/WEBFilesTCP2UART/led.xml +++ /dev/null @@ -1,6 +0,0 @@ - -~gpio1_inp~ -~gpio1_out~ -~gpio1_dir~ -~gpio1_fun~ - \ No newline at end of file diff --git a/WEBFilesTCP2UART/leds.xml b/WEBFilesTCP2UART/leds.xml deleted file mode 100644 index 756c3c8..0000000 --- a/WEBFilesTCP2UART/leds.xml +++ /dev/null @@ -1,5 +0,0 @@ - -~gpio_inp~ -~gpio_out~ -~gpio_dir~ - \ No newline at end of file diff --git a/WEBFilesTCP2UART/logo.gif b/WEBFilesTCP2UART/logo.gif deleted file mode 100644 index b930b2a..0000000 Binary files a/WEBFilesTCP2UART/logo.gif and /dev/null differ diff --git a/WEBFilesTCP2UART/menu.inc b/WEBFilesTCP2UART/menu.inc deleted file mode 100644 index a32bb1a..0000000 --- a/WEBFilesTCP2UART/menu.inc +++ /dev/null @@ -1,26 +0,0 @@ -

ESP8266 Built-in Web server ©

-
-
- Main - TCP-UART Settings - WiFi settings - WiFi Scan - WebFS Upload - System Setup -
-
- GPIO - HexDump Bytes - HexDump DWord - Download Bin - Deep Sleep - Debug and Test -
-
- \ No newline at end of file diff --git a/WEBFilesTCP2UART/protect/10leds.ini b/WEBFilesTCP2UART/protect/10leds.ini deleted file mode 100644 index ee91d03..0000000 --- a/WEBFilesTCP2UART/protect/10leds.ini +++ /dev/null @@ -1,25 +0,0 @@ -cfg_pinclr=0 -cfg_debug=0 -cfg_tcp_port=0 -cfg_cdns=1 -cfg_save=1 -gpio0_out=1 -gpio0_dir=1 -gpio1_out=1 -gpio1_dir=1 -gpio2_out=1 -gpio2_dir=1 -gpio3_out=1 -gpio3_dir=1 -gpio4_out=1 -gpio4_dir=1 -gpio5_out=1 -gpio5_dir=1 -gpio12_out=1 -gpio12_dir=1 -gpio13_out=1 -gpio13_dir=1 -gpio14_out=1 -gpio14_dir=1 -gpio15_out=0 -gpio15_dir=1 \ No newline at end of file diff --git a/WEBFilesTCP2UART/protect/aps.xml b/WEBFilesTCP2UART/protect/aps.xml deleted file mode 100644 index 14154a2..0000000 --- a/WEBFilesTCP2UART/protect/aps.xml +++ /dev/null @@ -1 +0,0 @@ -~wifi_aps_xml~ diff --git a/WEBFilesTCP2UART/protect/chiprams.xml b/WEBFilesTCP2UART/protect/chiprams.xml deleted file mode 100644 index 5cad0a9..0000000 --- a/WEBFilesTCP2UART/protect/chiprams.xml +++ /dev/null @@ -1,4 +0,0 @@ - -~start~ -~xml_ram~ - diff --git a/WEBFilesTCP2UART/protect/cookie.js b/WEBFilesTCP2UART/protect/cookie.js deleted file mode 100644 index ea8a307..0000000 --- a/WEBFilesTCP2UART/protect/cookie.js +++ /dev/null @@ -1,70 +0,0 @@ -function getCookie(name) { - var prefix = name + "="; - var cookieStartIndex = document.cookie.indexOf(prefix); - if (cookieStartIndex == -1) - return null; - var cookieEndIndex = document.cookie.indexOf(";", cookieStartIndex - + prefix.length); - if (cookieEndIndex == -1) - cookieEndIndex = document.cookie.length; - return unescape(document.cookie.substring(cookieStartIndex + prefix.length, - cookieEndIndex)); -} -function setCookie(name, value) { - document.cookie = name + "=" + escape(value) + "; path=/"; -} -function setCookieElem(name, defv) { - var val = getCookie(name); - if (val == null || val.charAt(0) != '0' || val.charAt(1) != 'x') { - val = defv; - setCookie(name, val); - } - document.getElementById(name).value = val; -} -function NewCookie(add) { - var val = parseInt(document.getElementById('start').value, 16) & 0xFFFFFFF0; - if (val == NaN) - setCookieElem('start', '0x40000000'); - else { - val += add; - setCookie('start', '0x' + val.toString(16)); - var nval = val + 256; - setCookie('stop', '0x' + nval.toString(16)); - document.getElementById('start').value = '0x' + val.toString(16); - document.getElementById('pmem').contentWindow.location.reload(); - } -} -setCookieElem('start', '0x40000000'); -setCookieElem('set_ramaddr', '0x3FFF0000'); -setCookieElem('set_ramdata', '0x12345678'); -function UpTxt(xD, n, v) { - var x = getXMLValue(xD, n, v); - if (x == '?') - document.getElementById("id_" + n).style.color = "#833"; - else - document.getElementById("id_" + n).style.color = "#333"; - document.getElementById("id_" + n).innerHTML = x + v; -} -function UpdateValuesRam(xD) { - if (xD) { - UpTxt(xD, "ramaddr", ""); - UpTxt(xD, "ramdata", ""); - } -} -function SendRamVal(x) { - var addr = parseInt(document.getElementById('set_ramaddr').value, 16); - var val = parseInt(document.getElementById('set_ramdata').value, 16); - if (addr != NaN && val != NaN) { - document.getElementById('set_ramaddr').value = '0x' + addr.toString(16); - setCookie('set_ramaddr','0x' + addr.toString(16)); - document.getElementById('set_ramdata').value = '0x' + val.toString(16); - setCookie('set_ramdata','0x' + val.toString(16)); - if (x != 0) - newAJAXCommand('chiprams.xml?start=0x' + addr.toString(16), - UpdateValuesRam, 0); - else - newAJAXCommand('chiprams.xml?sys_ram0x' + addr.toString(16) + '=0x' - + val.toString(16) + '&start=0x' + addr.toString(16), - UpdateValuesRam, 0); - } -} \ No newline at end of file diff --git a/WEBFilesTCP2UART/protect/debug.htm b/WEBFilesTCP2UART/protect/debug.htm deleted file mode 100644 index a9b1fef..0000000 --- a/WEBFilesTCP2UART/protect/debug.htm +++ /dev/null @@ -1,46 +0,0 @@ - - - - ESP8266 Debug and Tests - - -~inc:menu.inc~ -
-

Debug and Tests

-

-Chart 'heap', ADC, Vdd, ST-AP RSSI

-Save Test WAV, UDP Wave Port

-Page Modbus Data, Vars Sample, Websock Sample

-Get system.xml, aps.xml, pr_request.xml, mdb.bin


-SoftWare Reset, System Restart

-Counter erase the last flash sector in the Chinese SDK, to save 28 bytes: ~sys_rdec0x4027F008~!

-

-
-
-

System constants

- - - - - - - - - - - - -
Sys_const 107:
Divided readvdd33():
-

-Power: ? V, readvdd33() = ~sys_vdd33~00
-system_adc_read() = ~sys_adc~, system_get_vdd33() = ~sys_vdd~

-

-Select esp_init_data_default.bin file... Next constants

-

-Download esp_init_data_default.bin -
-

-
-~inc:footer.inc~ -~inc:vdd.inc~ - \ No newline at end of file diff --git a/WEBFilesTCP2UART/protect/dsleep.htm b/WEBFilesTCP2UART/protect/dsleep.htm deleted file mode 100644 index fc451dc..0000000 --- a/WEBFilesTCP2UART/protect/dsleep.htm +++ /dev/null @@ -1,51 +0,0 @@ - - - - ESP8266 - - - - - ~inc:menu.inc~ -
-

Test DeepSleep

- - - - - - - - - - - - - - - -
DeepSleep Time(us):
DeepSleep Mode:
Sys_const 108:
-

- Old sleep_mode = ~sys_sleep_old~
- Start event = ~sys_rst~ (0-power, 1-wdt, 2-exception, 3-soft wdt, 4-software, 5-deep-sleep, 6-external)
- Reset event = ~sys_res_event~ (1-power, 2-reset, 3-software, 4-wdt)
-

-
-~inc:footer.inc~ - - - - diff --git a/WEBFilesTCP2UART/protect/esp_init_data_default.bin b/WEBFilesTCP2UART/protect/esp_init_data_default.bin deleted file mode 100644 index 5c9f022..0000000 --- a/WEBFilesTCP2UART/protect/esp_init_data_default.bin +++ /dev/null @@ -1 +0,0 @@ -~bin_flash_const~ \ No newline at end of file diff --git a/WEBFilesTCP2UART/protect/fullflash.bin b/WEBFilesTCP2UART/protect/fullflash.bin deleted file mode 100644 index 7bf721b..0000000 --- a/WEBFilesTCP2UART/protect/fullflash.bin +++ /dev/null @@ -1 +0,0 @@ -~bin_flash_all~ \ No newline at end of file diff --git a/WEBFilesTCP2UART/protect/gpio.htm b/WEBFilesTCP2UART/protect/gpio.htm deleted file mode 100644 index a55fe7c..0000000 --- a/WEBFilesTCP2UART/protect/gpio.htm +++ /dev/null @@ -1,53 +0,0 @@ - - - - ESP8266 GPIOs - - - -~inc:menu.inc~ -
-

GPIO

- - -
PinInpOutDirFuncPUPDOD
-GPIO13(CTS0), GPIO15(RTS0) - Flow enable: Off,
-GPIO1(TX0), GPIO3(RX0) - Close TCP-UART: 'TCP port' = 0,
-GPIO2(TX1) - Disable: 'GPIO2 debug UART TX Enable'. -
-~inc:footer.inc~ - - \ No newline at end of file diff --git a/WEBFilesTCP2UART/protect/gpio.xml b/WEBFilesTCP2UART/protect/gpio.xml deleted file mode 100644 index 6b14191..0000000 --- a/WEBFilesTCP2UART/protect/gpio.xml +++ /dev/null @@ -1,53 +0,0 @@ - -~gpio_inp~ -~gpio_out~ -~gpio_dir~ -~gpio0_fun~ -~gpio1_fun~ -~gpio2_fun~ -~gpio3_fun~ -~gpio4_fun~ -~gpio5_fun~ -~gpio6_fun~ -~gpio7_fun~ -~gpio8_fun~ -~gpio9_fun~ -~gpio10_fun~ -~gpio11_fun~ -~gpio12_fun~ -~gpio13_fun~ -~gpio14_fun~ -~gpio15_fun~ -~gpio0_pull~ -~gpio1_pull~ -~gpio2_pull~ -~gpio3_pull~ -~gpio4_pull~ -~gpio5_pull~ -~gpio6_pull~ -~gpio7_pull~ -~gpio8_pull~ -~gpio9_pull~ -~gpio10_pull~ -~gpio11_pull~ -~gpio12_pull~ -~gpio13_pull~ -~gpio14_pull~ -~gpio15_pull~ -~gpio0_opd~ -~gpio1_opd~ -~gpio2_opd~ -~gpio3_opd~ -~gpio4_opd~ -~gpio5_opd~ -~gpio6_opd~ -~gpio7_opd~ -~gpio8_opd~ -~gpio9_opd~ -~gpio10_opd~ -~gpio11_opd~ -~gpio12_opd~ -~gpio13_opd~ -~gpio14_opd~ -~gpio15_opd~ - \ No newline at end of file diff --git a/WEBFilesTCP2UART/protect/hexdmpb.htm b/WEBFilesTCP2UART/protect/hexdmpb.htm deleted file mode 100644 index 01f4244..0000000 --- a/WEBFilesTCP2UART/protect/hexdmpb.htm +++ /dev/null @@ -1,41 +0,0 @@ - - - - ESP8266 HexDump Byte - - - - ~inc:menu.inc~ -
-

HexDump Bytes

- - - - - - - - -
RAM Start addr
- - - - - - - - - - - - - - -
Write addr, value:
Read addr, value:??
-
-
- Protected area: 0..0x20000000, 0x60002000..0x60008000 !
- HEX Dump Flash 512k -
- - \ No newline at end of file diff --git a/WEBFilesTCP2UART/protect/hexdmpb.txt b/WEBFilesTCP2UART/protect/hexdmpb.txt deleted file mode 100644 index 0331abd..0000000 --- a/WEBFilesTCP2UART/protect/hexdmpb.txt +++ /dev/null @@ -1 +0,0 @@ -~hexdmpb~ \ No newline at end of file diff --git a/WEBFilesTCP2UART/protect/hexdmpd.htm b/WEBFilesTCP2UART/protect/hexdmpd.htm deleted file mode 100644 index e522b0b..0000000 --- a/WEBFilesTCP2UART/protect/hexdmpd.htm +++ /dev/null @@ -1,41 +0,0 @@ - - - - ESP8266 HexDump DWord - - - - ~inc:menu.inc~ -
-

HexDump DWord

- - - - - - - - -
RAM Start addr   
- - - - - - - - - - - - - - -
Write addr, value:
Read addr, value:??
-
-
- Protected area: 0..0x20000000, 0x60002000..0x60008000 !
- HEX Dump Flash 512k -
- - \ No newline at end of file diff --git a/WEBFilesTCP2UART/protect/hexdmpd.txt b/WEBFilesTCP2UART/protect/hexdmpd.txt deleted file mode 100644 index 8d03bdc..0000000 --- a/WEBFilesTCP2UART/protect/hexdmpd.txt +++ /dev/null @@ -1 +0,0 @@ -~hexdmpd~ \ No newline at end of file diff --git a/WEBFilesTCP2UART/protect/init.ini b/WEBFilesTCP2UART/protect/init.ini deleted file mode 100644 index 6c093d6..0000000 --- a/WEBFilesTCP2UART/protect/init.ini +++ /dev/null @@ -1,7 +0,0 @@ -mdbfini=protect/mdbini.bin -sys_ram0x60000f00=0x48 -sys_ram0x60000f00=0x65 -sys_ram0x60000f00=0x6c -sys_ram0x60000f00=0x6c -sys_ram0x60000f00=0x6f -sys_ram0x60000f00=0x21 \ No newline at end of file diff --git a/WEBFilesTCP2UART/protect/mdb.bin b/WEBFilesTCP2UART/protect/mdb.bin deleted file mode 100644 index e466497..0000000 --- a/WEBFilesTCP2UART/protect/mdb.bin +++ /dev/null @@ -1 +0,0 @@ -~bin_mdb~ \ No newline at end of file diff --git a/WEBFilesTCP2UART/protect/mdb.htm b/WEBFilesTCP2UART/protect/mdb.htm deleted file mode 100644 index be8e46a..0000000 --- a/WEBFilesTCP2UART/protect/mdb.htm +++ /dev/null @@ -1,66 +0,0 @@ - - - - ESP8266 Modbus data - - - -~inc:menu.inc~ -
-

Modbus data

- - -
Index0123456789
-

- - - - - - - - - - - - - - - - - - - -
Write addr, word:
Write addr, dword:
Write addr, string:
-

-
-~inc:footer.inc~ - - \ No newline at end of file diff --git a/WEBFilesTCP2UART/protect/mdb.xml b/WEBFilesTCP2UART/protect/mdb.xml deleted file mode 100644 index f0cae6d..0000000 --- a/WEBFilesTCP2UART/protect/mdb.xml +++ /dev/null @@ -1,2 +0,0 @@ -~xml_mdb~ - diff --git a/WEBFilesTCP2UART/protect/mdbh.xml b/WEBFilesTCP2UART/protect/mdbh.xml deleted file mode 100644 index 00f5967..0000000 --- a/WEBFilesTCP2UART/protect/mdbh.xml +++ /dev/null @@ -1,2 +0,0 @@ -~xml_mdbh~ - diff --git a/WEBFilesTCP2UART/protect/pr_request.xml b/WEBFilesTCP2UART/protect/pr_request.xml deleted file mode 100644 index 1045642..0000000 --- a/WEBFilesTCP2UART/protect/pr_request.xml +++ /dev/null @@ -1 +0,0 @@ -~wifi_prrq_xml~ \ No newline at end of file diff --git a/WEBFilesTCP2UART/protect/ram.bin b/WEBFilesTCP2UART/protect/ram.bin deleted file mode 100644 index cca0930..0000000 --- a/WEBFilesTCP2UART/protect/ram.bin +++ /dev/null @@ -1 +0,0 @@ -~bin_ram~ \ No newline at end of file diff --git a/WEBFilesTCP2UART/protect/rfinit1.htm b/WEBFilesTCP2UART/protect/rfinit1.htm deleted file mode 100644 index 5bbcaa2..0000000 --- a/WEBFilesTCP2UART/protect/rfinit1.htm +++ /dev/null @@ -1,109 +0,0 @@ - - - - ESP8266EX RF Data Setup 1 - - -~inc:menu.inc~ -
-

RF Data Setup 1

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
spur_freq_cfg [26]:
spur_freq_cfg_div [27]:
spur_freq_en_h [28]:
spur_freq_en_l [29]:
target_power_qdb_0 [34]:
target_power_qdb_1 [35]:
target_power_qdb_2 [36]:
target_power_qdb_3 [37]:
target_power_qdb_4 [38]:
target_power_qdb_5 [39]:
target_power_index_mcs0 [40]:
target_power_index_mcs1 [41]:
target_power_index_mcs2 [42]:
target_power_index_mcs3 [43]:
target_power_index_mcs4 [44]:
target_power_index_mcs5 [45]:
target_power_index_mcs6 [46]:
target_power_index_mcs7 [47]:
* Next >>
-
-~inc:footer.inc~ - \ No newline at end of file diff --git a/WEBFilesTCP2UART/protect/rfinit2.htm b/WEBFilesTCP2UART/protect/rfinit2.htm deleted file mode 100644 index 1bcc589..0000000 --- a/WEBFilesTCP2UART/protect/rfinit2.htm +++ /dev/null @@ -1,143 +0,0 @@ - - - - ESP8266EX RF Data Setup 2 - - -~inc:menu.inc~ -
-

RF Data Setup 2

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
crystal_26m_en [48]:
gpio0_3_func [49]:
sdio_configure [50]:
bt_configure [51]:
bt_protocol [52]:
dual_ant_configure [53]:
gpio1_2_func [54]:
share_xtal [55]:
spur_freq_cfg_2 [64]:
spur_freq_cfg_div_2 [65]:
spur_freq_en_h_2 [66]:
spur_freq_cfg_msb [68]:
spur_freq_cfg_2_msb [69]:
spur_freq_cfg_3_low [70]:
spur_freq_cfg_3_high [71]:
spur_freq_cfg_4_low [72]:
spur_freq_cfg_4_high [73]:
<< Prev * * Next >>
-
-~inc:footer.inc~ - - \ No newline at end of file diff --git a/WEBFilesTCP2UART/protect/rfinit3.htm b/WEBFilesTCP2UART/protect/rfinit3.htm deleted file mode 100644 index 7853ef5..0000000 --- a/WEBFilesTCP2UART/protect/rfinit3.htm +++ /dev/null @@ -1,91 +0,0 @@ - - - - ESP8266EX RF Data Setup 3 - - -~inc:menu.inc~ -
-

RF Data Setup 3

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
low_power_en [93]:
lp_rf_stg10 [94]:
lp_bb_att_ext [95]:
lp_rf_stg10 [96]:
pwr_ind_11b_0 [97]:
pwr_ind_11b_1 [98]:
vdd33_const [107]:
deep_sleep_mode [108]:
freq_correct_en [112]:
force_freq_offset [113]:
phy_powerup_option[114]:
<< Prev *
-
-~inc:footer.inc~ - - \ No newline at end of file diff --git a/WEBFilesTCP2UART/protect/scan.htm b/WEBFilesTCP2UART/protect/scan.htm deleted file mode 100644 index 4d30082..0000000 --- a/WEBFilesTCP2UART/protect/scan.htm +++ /dev/null @@ -1,98 +0,0 @@ - - - - -WiFi Scan - - - - ~inc:menu.inc~ -
-

-
Stations scanning...
-

- - -
SSIDBSSIDAuthChRSSIHd
- -
-
- ~inc:footer.inc~ - - - - - diff --git a/WEBFilesTCP2UART/protect/scan.xml b/WEBFilesTCP2UART/protect/scan.xml deleted file mode 100644 index fc7188e..0000000 --- a/WEBFilesTCP2UART/protect/scan.xml +++ /dev/null @@ -1 +0,0 @@ -~wifi_scan~ diff --git a/WEBFilesTCP2UART/protect/setup.htm b/WEBFilesTCP2UART/protect/setup.htm deleted file mode 100644 index 634e7e2..0000000 --- a/WEBFilesTCP2UART/protect/setup.htm +++ /dev/null @@ -1,177 +0,0 @@ - - - - ESP8266EX Setup - - - - -~inc:menu.inc~ -
-

System Setup

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
WEB (HTTP) port:
WEB recved timeout:
WEB close timeout:
Modbus DevID:
Modbus TCP port:
Modbus TCP recved timeout:
Modbus TCP close timeout:
Modbus TCP connect reopen:
UDP Test port:
UDP Wave Sample Feq:
UDP Wave host IP:
UDP Wave host port:
UDP Wave remote port:
Debug UART BAUD:
Debug UART Bits:
Debug UART Stop Bits:
Debug UART Parity:
Debug UART Parity enable: - - -
GPIO2 debug UART TX enable: - - -
☭ 160MHz CPU enable: - - -
Web pcb close enable: - - -
Checking pin WiFi cfg reset: - - -
NetBIOS enable: - - -
SNTP enable: - - -
Captive Portal AP: - - -
-

- - - -

-
-
-~inc:footer.inc~ - - \ No newline at end of file diff --git a/WEBFilesTCP2UART/protect/tstfuncs.htm b/WEBFilesTCP2UART/protect/tstfuncs.htm deleted file mode 100644 index 159b47d..0000000 --- a/WEBFilesTCP2UART/protect/tstfuncs.htm +++ /dev/null @@ -1,96 +0,0 @@ - - - - ESP8266 Download bin - - - -~inc:menu.inc~ -
-

Download bin

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
I/O 1:0x3FF00000..0x3FF00100128 bytes
I/O 2:0x3FF20000..0x3FF218006 kbytes
RAM:0x3FFE8000..0x4000000096 kbytes
ROM-BIOS:0x40000000..0x4001000064 kbytes
IRAM:0x40100000..0x4011000064 kbytes
FLASH Bus:0x40200000..0x403000001 Mbytes
I/O 3:0x60000000..0x600018006 kbytes
I/O 4:0x60009800..0x6000A0002 kbytes
- - - - - - - - - - -
Start addr
End addr
-

-
-~inc:footer.inc~ - - - diff --git a/WEBFilesTCP2UART/protect/uart.htm b/WEBFilesTCP2UART/protect/uart.htm deleted file mode 100644 index 02194be..0000000 --- a/WEBFilesTCP2UART/protect/uart.htm +++ /dev/null @@ -1,153 +0,0 @@ - - - - ESP8266EX TCP2UART - - - - -~inc:menu.inc~ -
-

TCP2UART0

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Baud:
Bits:
Stop Bits:
Parity:
Parity enable: - - -
LoopBack enable: - - -
Flow enable: - - -
RTS inverse: - - -
CTS inverse: - - -
RXD inverse: - - -
TXD inverse: - - -
Swap TXD<>RTS, RXD<>CTS: - - -
Client/Server IP:
TCP Port:
TCP recved timeout:
TCP close timeout:
Client reconnect timeout:
Server connect reopen: - - -
-

- - - -

- -
-~inc:footer.inc~ - - - \ No newline at end of file diff --git a/WEBFilesTCP2UART/protect/udpwave.htm b/WEBFilesTCP2UART/protect/udpwave.htm deleted file mode 100644 index 6bcfeed..0000000 --- a/WEBFilesTCP2UART/protect/udpwave.htm +++ /dev/null @@ -1,38 +0,0 @@ - - - - -UDP Wave Port - - - -~inc:menu.inc~ -
-

UDP Wave Port

- - - - - - - - - - - - - -
UDP host IP:
UDP host port:
UDP remote port:
Sample Feq: -
- -
-

UDP send:

- - - - - -

-
'?'WDRV: ver
'F=fx'WDRV: freg fx Hz
'A'WDRV: set remote ip , remote port
'S'WDRV: stop
'G'Start wave
-~inc:footer.inc~ - diff --git a/WEBFilesTCP2UART/protect/upload.htm b/WEBFilesTCP2UART/protect/upload.htm deleted file mode 100644 index 6d4aa9b..0000000 --- a/WEBFilesTCP2UART/protect/upload.htm +++ /dev/null @@ -1,23 +0,0 @@ - - - - ESP8266 WebFS Image Upload - - -~inc:menu.inc~ -
-

WebFS Image Upload

-

- Select WEBFiles.bin file...

-

- -

-
-

-Curent Disk has ~wfs_files~ files, Disk Size: ~wfs_size~ bytes.
-Disk Addres: ~wfs_addr~, Max Disk Size: ~wfs_max_size~ bytes, Max 250 files.

-Flash ID: ~sys_fid~, Size: ~sys_fsize~ bytes.
-Download fullflash.bin

-

-~inc:footer.inc~ - \ No newline at end of file diff --git a/WEBFilesTCP2UART/protect/wifi.htm b/WEBFilesTCP2UART/protect/wifi.htm deleted file mode 100644 index 0fb2522..0000000 --- a/WEBFilesTCP2UART/protect/wifi.htm +++ /dev/null @@ -1,185 +0,0 @@ - - - - ESP8266 WiFi - - - - ~inc:menu.inc~ -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

WiFi SoftAP

WiFi Station

WiFi Mode:SSID:
AP SSID:Password:
Hidden SSID: - - - BSSID:
AP Password:Use BSSID: - - -
Channel:Status:
IEEE PHY:IP:
Auth Mode:Subnet Mask:
IP:Gateway:
Subnet Mask:AutoConnect: - - -
Gateway:ReConnect:
MAC:MAC:
DHCP: - - - DHCP: - - -
Start IP:RSSI:~wifi_st_rssi~ dB
End IP:Sleep Mode:
Max connections:Beacon (ms):
RF Tx Power:ST Host Name:
-

- - -

-
-
-~inc:footer.inc~ - - - \ No newline at end of file diff --git a/WEBFilesTCP2UART/sample.htm b/WEBFilesTCP2UART/sample.htm deleted file mode 100644 index 830083f..0000000 --- a/WEBFilesTCP2UART/sample.htm +++ /dev/null @@ -1,49 +0,0 @@ - - - - ESP8266 FWEB Image Upload - - -~inc:menu.inc~ -
-Out UART1(debug port): 'Hello!'
-~sys_ram0x60000f00=0x48~ -~sys_ram0x60000f00=0x65~ -~sys_ram0x60000f00=0x6c~ -~sys_ram0x60000f00=0x6c~ -~sys_ram0x60000f00=0x6f~ -~sys_ram0x60000f00=0x21~ -~sys_ram0x60000f00=0x0d~ -~sys_ram0x60000f00=0x0a~ -
-Out UART0 tx: 'Hello!'
-~sys_ram0x60000000=0x48~ -~sys_ram0x60000000=0x65~ -~sys_ram0x60000000=0x6c~ -~sys_ram0x60000000=0x6c~ -~sys_ram0x60000000=0x6f~ -~sys_ram0x60000000=0x21~ -~sys_ram0x60000000=0x0d~ -~sys_ram0x60000000=0x0a~ -Read UART0 rx:~sys_ram0x60000000~
-
-Variant 2
-~start=0x60000000~ -Read UART0 regs:
-~start~=~xml_ram~
-~start~=~xml_ram~
-~start~=~xml_ram~
-~start~=~xml_ram~
-
-~start=0x40200000~ -Read RAM:
-~start~=~xml_ram~
-~start~=~xml_ram~
-~start~=~xml_ram~
-~start~=~xml_ram~
-
-Variant 2
-RAM0x40200000=~sys_ram0x40200000~
-
-~inc:footer.inc~ - diff --git a/WEBFilesTCP2UART/scripts.js b/WEBFilesTCP2UART/scripts.js deleted file mode 100644 index a9cadab..0000000 --- a/WEBFilesTCP2UART/scripts.js +++ /dev/null @@ -1,33 +0,0 @@ -var setFormValues = function(form, cfg) { - var name, field; - for (name in cfg){ - if (form[name]) { - field = form[name]; - if (field[1] && field[1].type === 'checkbox') { - field = field[1]; - } - if (field.type === 'checkbox'){ - field.checked = cfg[name] === '1' ? true : false; - } else { - field.value = cfg[name]; - } - } - } -} -var $ = function(id) { - return document.getElementById(id); -} -var reloadTimer={ - s:10, - reload:function(start) { - if(start) { - this.s = start; - } - $('timer').innerHTML = this.s < 10 ? '0' + this.s : this.s; - if (this.s == 0){ - document.location.href = document.referrer != '' ? document.referrer : '/'; - } - this.s--; - setTimeout('reloadTimer.reload()', 1000); - } -} diff --git a/WEBFilesTCP2UART/site.js b/WEBFilesTCP2UART/site.js deleted file mode 100644 index c083aaa..0000000 --- a/WEBFilesTCP2UART/site.js +++ /dev/null @@ -1,95 +0,0 @@ -/* Java for WEB device */ -var ajaxList = new Array(); // Stores a queue of AJAX events to process -var nextimeout = 500; -function newAJAXCommand(url, container, repeat, data) { - // Set up our object - var newAjax = new Object(); - var theTimer = new Date(); - newAjax.url = url; - newAjax.container = container; - newAjax.repeat = repeat; - newAjax.ajaxReq = null; - // Create and send the request - if (window.XMLHttpRequest) { - newAjax.ajaxReq = new XMLHttpRequest(); - newAjax.ajaxReq.open((data == null) ? "GET" : "POST", newAjax.url, true); - newAjax.ajaxReq.send(data); - // If we're using IE6 style (maybe 5.5 compatible too) - } else if (window.ActiveXObject) { - newAjax.ajaxReq = new ActiveXObject("Microsoft.XMLHTTP"); - if (newAjax.ajaxReq) { - newAjax.ajaxReq.open((data == null) ? "GET" : "POST", newAjax.url, true); - newAjax.ajaxReq.send(data); - } - } - newAjax.lastCalled = theTimer.getTime(); - // Store in our array - ajaxList.push(newAjax); -} -function pollAJAX() { - var curAjax = new Object(); - var theTimer = new Date(); - var elapsed; - // Read off the ajaxList objects one by one - for (i = ajaxList.length; i > 0; i--) { - curAjax = ajaxList.shift(); - if (!curAjax) - continue; - elapsed = theTimer.getTime() - curAjax.lastCalled; - // If we suceeded - if (curAjax.ajaxReq.readyState == 4 && curAjax.ajaxReq.status == 200) { - // If it has a container, write the result - if (typeof (curAjax.container) == 'function') - curAjax.container(curAjax.ajaxReq.responseXML.documentElement); - else if (typeof (curAjax.container) == 'string') - document.getElementById(curAjax.container).innerHTML = curAjax.ajaxReq.responseText; - // (otherwise do nothing for null values) - curAjax.ajaxReq.abort(); - curAjax.ajaxReq = null; - // If it's a repeatable request, then do so - if (curAjax.repeat) { - if (elapsed >= curAjax.repeat) - elapsed = 100; - else - elapsed = curAjax.repeat - elapsed; - setTimeout("newAJAXCommand('" + curAjax.url + "'," - + curAjax.container + "," + curAjax.repeat + ")", - elapsed); - } - continue; - } - // If we've waited over 4 second, then we timed out - if ((curAjax.ajaxReq.readyState == 4 && curAjax.ajaxReq.status == 404) - || (elapsed > 4000)) { - // Invoke the user function with null input - if (typeof (curAjax.container) == 'function') - curAjax.container(null); - else - // Alert the user - alert("Command failed.\nConnection to device was lost."); - curAjax.ajaxReq.abort(); - curAjax.ajaxReq = null; - // If it's a repeatable request, then do so - if (curAjax.repeat) - setTimeout("newAJAXCommand('" + curAjax.url + "'," - + curAjax.container + "," + curAjax.repeat + ")", 200); - continue; - } - // Otherwise, just keep waiting - ajaxList.push(curAjax); - } - // Call ourselves again in 10ms? - setTimeout("pollAJAX()", nextimeout); -}// End pollAjax -function getXMLValue(xmlData, field) { - try { - if (xmlData.getElementsByTagName(field)[0].firstChild.nodeValue) - return xmlData.getElementsByTagName(field)[0].firstChild.nodeValue; - else - return null; - } catch (err) { - return null; - } -} -//kick off the AJAX Updater -setTimeout("pollAJAX()", nextimeout); diff --git a/WEBFilesTCP2UART/style.css b/WEBFilesTCP2UART/style.css deleted file mode 100644 index 64e291b..0000000 --- a/WEBFilesTCP2UART/style.css +++ /dev/null @@ -1,235 +0,0 @@ -body{ -margin:4px auto; -width:640px; -color:black; -background:#fff; -font-size:14px; -font-family:"Lucida Grande", Tahoma, sans-serif; -} -img,table{ -border:0; -} -.top{ -color:#888; -background:url(logo.gif) no-repeat 0 0; -padding:3px 0 0 45px; -margin:0 0 10px 0; -} -.top img{ -vertical-align:middle; -} -h2.error{ -color:red; -} -h2.ok{ -color:green; -} -h2.title{ -text-align:center; -} -.menu{ -border-top:#fab548 5px solid; -background:#f1f1ed url(esp.gif) no-repeat 10px 10px; -padding:5px 5px 5px 120px; -margin:0 0 10px 0; -min-height:120px; -border-radius:5px; -} -.menu div{ -width:220px; -float:left; -margin-right:10px; -} -.menu a, -.menu a:link{ -display:block; -font-weight:bold; -text-decoration:none; -color:#1486ba; -padding:0 5px 1px 10px; -font-size:13px; -border-radius:5px; -margin:0 0 1px 0; -border-bottom:#d6d9da 1px solid; -} -.menu a:visited{ -color:#777; -} -.menu a.active{ -color:#777; -background:#d6d9da; -} -.menu a:hover{ -color:#842; -background:#d6d9da; -} -table.form select{ -width:143px; -} -table.form{ -width:100%; -} -table.form td{ -font-size:13px; -padding:0; -} -table.form .label{ -width:45%; -font-weight:bold; -text-align:right; -padding-right:10px; -} -table.form .left{ -width:45%; -font-weight:bold; -text-align:left; -padding-left:10px; -} -table.scan{ -border-collapse:separate; -border-spacing: 0; -border:#aaa 2px solid; -text-align:center; -font-size:14px; -width:100%; -margin:0 0 10px 0; -background:#fff; -border-radius:5px; -} -table.scan th{ -color:#247; -border:#aaa 1px solid; -font-size:15px; -padding:2px 2px; -background:#fec; -} -table.scan td{ -border:#aaa 1px solid; -padding:2px 2px; -} -table.scan td.s:hover{ -background:#eef; -} -table.scan a:link{ -display:block; -font-weight:bold; -text-decoration:none; -color:#444; -border-radius:5px; -} -table.scan a:visited{ -color:#444; -} -table.scan a.active, -table.scan a:hover{ -color:#21e; -background:#d6d9da; -} -table.mdbtab{ -border-collapse:separate; -border-spacing: 0; -border:#aaa 2px solid; -text-align:center; -font-size:12px; -width:100%; -margin:0 0 10px 0; -background:#fff; -border-radius:5px; -} -table.mdbtab th{ -color:#247; -border:#aaa 1px solid; -font-size:12px; -padding:2px 2px; -background:#fec; -} -table.mdbtab td{ -border:#aaa 1px solid; -padding:2px 2px; -} -table.mdbtab td.s:hover{ -background:#eef; -} -table.mdbtab a:link{ -display:block; -font-weight:bold; -text-decoration:none; -color:#444; -border-radius:5px; -} -table.mdbtab a:visited{ -color:#444; -} -table.mdbtab a.active, -table.mdbtab a:hover{ -color:#21e; -background:#d6d9da; -} -.content{ -background:#f1f1ed; -border-radius:5px; -border-top:#1486ba 5px solid; -padding:10px; -margin:0 0 10px 0; -} -.footer{ -border-top:#75be45 5px solid;; -background:#d6d9da; -border-radius:5px; -padding:10px; -font-size:12px; -margin:0 0 5px 0; -} -.copyright{ -font-size:11px; -padding:0 0 0 10px; -text-align:right; -} -.button:visited, -.button{ -cursor:pointer; -display:inline-block; -font-weight:bold; -text-align:center; -text-decoration:none; -white-space:nowrap; -border-radius:5px; -background-image: linear-gradient(rgba(255,255,255,.1), rgba(255,255,255,.05) 49%, rgba(0,0,0,.05) 51%, rgba(0,0,0,.1)); -background-color:#f0f0eb; -color:#312c2a; -border:1px solid #aaa; -border-color: rgba(0,0,0,0.3); -border-bottom-color: #777; -border-bottom-color: rgba(0,0,0,0.5); -box-shadow: inset 0 0.08em 0 rgba(255,255,255,0.7), inset 0 0 0.08em rgba(255,255,255,0.5); -text-shadow: 0 1px 0 rgba(255,255,255,0.8); -padding:3px 15px; -} -.button:focus, -.button:hover{ -background-color:#ffffff; -background-image: linear-gradient(rgba(255,255,255,0.5), rgba(255,255,255,0.2) 49%, rgba(0,0,0,0.05) 51%, rgba(0,0,0,0.15)); -} -#timer{ -color:red; -} -.center{ -text-align:center; -} -hr{ -border:0; -height:1px; -background:#333; -background-image:-webkit-linear-gradient(left, #ccc, #333, #ccc); -background-image:-moz-linear-gradient(left, #ccc, #333, #ccc); -background-image:-ms-linear-gradient(left, #ccc, #333, #ccc); -background-image: -o-linear-gradient(left, #ccc, #333, #ccc); -} -select, -input, -iframe{ -border-collapse:separate; -border-spacing: 0; -background:#fff; -border-radius:5px; -} \ No newline at end of file diff --git a/WEBFilesTCP2UART/system.xml b/WEBFilesTCP2UART/system.xml deleted file mode 100644 index 37fea79..0000000 --- a/WEBFilesTCP2UART/system.xml +++ /dev/null @@ -1,138 +0,0 @@ - - -~hellomsg~ -~gpio_inp~ -~gpio_out~ -~gpio_dir~ -~gpio0_fun~,~gpio1_fun~,~gpio2_fun~,~gpio3_fun~,~gpio4_fun~,~gpio5_fun~,~gpio6_fun~,~gpio7_fun~,~gpio8_fun~,~gpio9_fun~,~gpio10_fun~,~gpio11_fun~,~gpio12_fun~,~gpio13_fun~,~gpio14_fun~,~gpio15_fun~ - - ~uart_0_baud~ - ~uart_0_bits~,~uart_0_stop~,~uart_0_parity~,~uart_0_even~ - ~uart_0_loopback~,~uart_0_flow~ - ~uart_0_txd_inv~,~uart_0_rxd_inv~,~uart_0_cts_inv~,~uart_0_rts_inv~ - - - ~uart_1_baud~ - ~uart_1_bits~,~uart_1_stop~,~uart_1_parity~,~uart_1_even~ - ~uart_1_loopback~,~uart_1_flow~ - ~uart_1_txd_inv~,~uart_1_rxd_inv~,~uart_1_cts_inv~,~uart_1_rts_inv~ - - - ~sys_cid~ - ~sys_fid~ - ~sys_fsize~ - ~sys_sysver~ - ~sys_sdkver~ - ~sys_webver~ - ~sys_clkcpu~ - ~sys_adc~ - ~sys_vdd33~ - ~sys_ucnst_0~ - - ~sys_rtctime~ - ~sys_mactime~ - ~sntp_time~ - ~sys_heap~ - ~sys_wdt~ - ~sys_rst~ - ~sys_res_event~ - ~sys_sleep_old~ - ~sys_ip~ - ~sys_url~ - ~sys_netbios~ - ~sys_ucnst_1~ - ~sys_ucnst_2~ - ~sys_ucnst_3~ - ~sys_test~ - - - ~web_host~ - ~web_remote~ - - - ~tcp_host~ - ~tcp_remote~ - - - ~mdb_host~ - ~mdb_remote~ - - - ~cfg_web_port~ - ~cfg_web_twd~ - ~cfg_tcp_tcrec~ - ~cfg_tcp_port~ - ~cfg_tcp_twrec~ - ~cfg_tcp_twcls~ - ~cfg_tcp_reop~ - ~cfg_mdb_port~ - ~cfg_mdb_twrec~ - ~cfg_mdb_twcls~ - ~cfg_mdb_reop~ - ~cfg_udp_port~ - ~cfg_wdrv_port~ - ~cfg_overclk~ - ~cfg_pinclr~ - ~cfg_debug~ - ~cfg_netbios~ - ~cfg_sntp~ - ~cfg_cdns~ - - - ~wdrv_freq~ - ~wdrv_ip~ - ~wdrv_port~ - - - ~wifi_mode~ - ~wifi_phy~ - ~wifi_maxpw~ - ~wifi_vddpw~ - ~wifi_rfopt~ - - ~wifi_ap_ssid~ - ~wifi_ap_psw~ - ~wifi_ap_chl~ - ~wifi_ap_auth~ - ~wifi_ap_hssid~ - ~wifi_ap_mcns~ - ~wifi_ap_ip~ - ~wifi_ap_gw~ - ~wifi_ap_msk~ - ~wifi_ap_mac~ - ~wifi_ap_dhcp~ - ~wifi_ap_sip~ - ~wifi_ap_eip~ - ~wifi_ap_bint~ - ~wifi_maxpw~ - - - ~wifi_st_sta~ - ~wifi_st_ssid~ - ~wifi_st_psw~ - ~wifi_st_bssid~ - ~wifi_st_sbss~ - ~wifi_st_ip~ - ~wifi_st_gw~ - ~wifi_st_msk~ - ~wifi_st_mac~ - ~wifi_st_dhcp~ - ~wifi_st_rssi~ - ~wifi_st_aucn~ - ~wifi_st_hostname~ - - - - ~wfs_addr~ - ~wfs_files~ - ~wfs_size~ - ~wfs_max_size~ - - -~wifi_aps_id~ -~wifi_aps_xml~ - - -~wifi_scan~ - - diff --git a/WEBFilesTCP2UART/time.inc b/WEBFilesTCP2UART/time.inc deleted file mode 100644 index dfef378..0000000 --- a/WEBFilesTCP2UART/time.inc +++ /dev/null @@ -1,9 +0,0 @@ - \ No newline at end of file diff --git a/WEBFilesTCP2UART/timeout.htm b/WEBFilesTCP2UART/timeout.htm deleted file mode 100644 index 45d1245..0000000 --- a/WEBFilesTCP2UART/timeout.htm +++ /dev/null @@ -1,16 +0,0 @@ - - - - ESP8266 WIFI - - - -

ESP8266 Built-in Web server ©

-
-

Timeout ? sec...

- * Redirect: http://~sys_url~/ *

- Main -
-~inc:footer.inc~ - - diff --git a/WEBFilesTCP2UART/timer.inc b/WEBFilesTCP2UART/timer.inc deleted file mode 100644 index a7c41c1..0000000 --- a/WEBFilesTCP2UART/timer.inc +++ /dev/null @@ -1,12 +0,0 @@ - - - - ESP8266 - - - -

ESP8266 Built-in Web server ©

-
-

Timeout ? sec...

- Redirect: Main - diff --git a/WEBFilesTCP2UART/tst.htm b/WEBFilesTCP2UART/tst.htm deleted file mode 100644 index bc74021..0000000 --- a/WEBFilesTCP2UART/tst.htm +++ /dev/null @@ -1,9 +0,0 @@ -~inc:grfx1.inc~ -Test: ? -~inc:grfx2.inc~ \ No newline at end of file diff --git a/WEBFilesTCP2UART/tst.xml b/WEBFilesTCP2UART/tst.xml deleted file mode 100644 index 88a35c1..0000000 --- a/WEBFilesTCP2UART/tst.xml +++ /dev/null @@ -1 +0,0 @@ -Test-1*~wifi_st_rssi~? diff --git a/WEBFilesTCP2UART/vdd.htm b/WEBFilesTCP2UART/vdd.htm deleted file mode 100644 index 2d30036..0000000 --- a/WEBFilesTCP2UART/vdd.htm +++ /dev/null @@ -1,10 +0,0 @@ -~inc:grfx1.inc~ -Vdd: ?V -~inc:grfx2.inc~ - diff --git a/WEBFilesTCP2UART/vdd.inc b/WEBFilesTCP2UART/vdd.inc deleted file mode 100644 index ebf9f81..0000000 --- a/WEBFilesTCP2UART/vdd.inc +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file diff --git a/WEBFilesTCP2UART/vdd.xml b/WEBFilesTCP2UART/vdd.xml deleted file mode 100644 index 55c138e..0000000 --- a/WEBFilesTCP2UART/vdd.xml +++ /dev/null @@ -1 +0,0 @@ -Vdd(eval(~sys_vdd33~*100.0/~sys_ucnst_0~.0)).toFixed(3) diff --git a/WEBFilesTCP2UART/websock.htm b/WEBFilesTCP2UART/websock.htm deleted file mode 100644 index 8fe8419..0000000 --- a/WEBFilesTCP2UART/websock.htm +++ /dev/null @@ -1,54 +0,0 @@ - - -WebSocket Test - -

WebSocket Test

-
diff --git a/WebSocket/ws2.css b/WebSocket/ws2.css deleted file mode 100644 index 2ef69d9..0000000 --- a/WebSocket/ws2.css +++ /dev/null @@ -1,12 +0,0 @@ -#consoleLog { - overflow-y: scroll; - width: 480px; - height: 200px; - border: solid 1px #aaaaaa; - background-color: #ffffff; - padding-left: 5px; } -#consoleLog > pre { - margin-top: 0; - margin-bottom: 0; } -#consoleLog > pre:nth-child(even) { - background-color: #fafafa; } diff --git a/WebSocket/ws2.htm b/WebSocket/ws2.htm deleted file mode 100644 index d086630..0000000 --- a/WebSocket/ws2.htm +++ /dev/null @@ -1,115 +0,0 @@ - - - - -WebSocket Test -

WebSocket Test

-
- - -
-
-
- Log messages -
- -
- - diff --git a/webvars_tcp2uart.xlsx b/WebVars.xlsx similarity index 50% rename from webvars_tcp2uart.xlsx rename to WebVars.xlsx index 341667a..899e615 100644 Binary files a/webvars_tcp2uart.xlsx and b/WebVars.xlsx differ diff --git a/app/driver/rs485drv.c b/app/driver/rs485drv.c index 231e9b4..6192d51 100644 --- a/app/driver/rs485drv.c +++ b/app/driver/rs485drv.c @@ -490,14 +490,8 @@ void ICACHE_FLASH_ATTR rs485_drv_start(void) UART0_INT_ENA = 0; // включение приема // tx как i/o порт ввода - if(rs485cfg.flg.b.swap != 0) { - MUX_TX15_UART0 = VAL_MUX_TX15_UART0_OFF; - MUX_RX13_UART0 = VAL_MUX_RX13_UART0_ON; // настроить пин RX - } - else { - MUX_TX1_UART0 = VAL_MUX_TX1_UART0_OFF; - MUX_RX3_UART0 = VAL_MUX_RX3_UART0_ON; // настроить пин RX - } + if(rs485cfg.flg.b.swap != 0) MUX_TX15_UART0 = VAL_MUX_TX15_UART0_OFF; + else MUX_TX1_UART0 = VAL_MUX_TX1_UART0_OFF; // переключение шины/драйвера на режим rx rs485_rx_enable(); diff --git a/app/include/flash_eep.h b/app/include/flash_eep.h index 5ba6591..fe45ce0 100644 --- a/app/include/flash_eep.h +++ b/app/include/flash_eep.h @@ -129,12 +129,12 @@ bool flash_save_cfg(void *ptr, uint16 id, uint16 size) ICACHE_FLASH_ATTR; extern struct SystemCfg syscfg; #if defined(USE_TCP2UART) || defined(USE_MODBUS) extern uint8 * tcp_client_url; +bool new_tcp_client_url(uint8 *url) ICACHE_FLASH_ATTR; +bool read_tcp_client_url(void) ICACHE_FLASH_ATTR; #endif bool sys_write_cfg(void) ICACHE_FLASH_ATTR; // пишет из struct SystemCfg *scfg bool sys_read_cfg(void) ICACHE_FLASH_ATTR; // читет в struct SystemCfg *scfg -bool new_tcp_client_url(uint8 *url) ICACHE_FLASH_ATTR; -bool read_tcp_client_url(void) ICACHE_FLASH_ATTR; #define MAX_IDX_USER_CONST 4 diff --git a/app/sdklib/Makefile b/app/sdklib/Makefile index b3b8a3a..e133a5a 100644 --- a/app/sdklib/Makefile +++ b/app/sdklib/Makefile @@ -81,6 +81,7 @@ APPDIR = . # its parent path, and not its siblings # # Required for each makefile to inherit from the parent +# # INCLUDES := $(INCLUDES) -I $(PDIR)include PDIR := ../$(PDIR) diff --git a/app/web/flash_eep.c b/app/web/flash_eep.c index ce3b840..9caf63f 100644 --- a/app/web/flash_eep.c +++ b/app/web/flash_eep.c @@ -359,6 +359,7 @@ bool ICACHE_FLASH_ATTR sys_write_cfg(void) { //------------------------------------------------------------------------------- // new_tcp_client_url() //------------------------------------------------------------------------------- + bool ICACHE_FLASH_ATTR new_tcp_client_url(uint8 *url) { if(tcp_client_url != NULL) { @@ -399,8 +400,8 @@ bool ICACHE_FLASH_ATTR read_tcp_client_url(void) tcp_client_url = NULL; return false; } -#endif +#endif /* * Чтение пользовательских констант (0 < idx < 4) */ diff --git a/app/web/web_int_callbacks.c b/app/web/web_int_callbacks.c index a111d81..ef223f4 100644 --- a/app/web/web_int_callbacks.c +++ b/app/web/web_int_callbacks.c @@ -622,7 +622,6 @@ void ICACHE_FLASH_ATTR web_int_callback(TCP_SERV_CONN *ts_conn, uint8 *cstr) tcp_puts("0x%08x%08x", ux.dw[1], ux.dw[0]); } else ifcmp("vdd33") tcp_puts("%u", readvdd33()); // system_get_vdd33() phy_get_vdd33(); - else ifcmp("vdd") tcp_puts("%u", system_get_vdd33()); // phy_get_vdd33(); else ifcmp("wdt") tcp_puts("%u", ets_wdt_get_mode()); else ifcmp("res_event") tcp_puts("%u", rtc_get_reset_reason()); // 1 - power/ch_pd, 2 - reset, 3 - software, 4 - wdt ... else ifcmp("rst") tcp_puts("%u", system_get_rst_info()->reason); @@ -651,6 +650,7 @@ void ICACHE_FLASH_ATTR web_int_callback(TCP_SERV_CONN *ts_conn, uint8 *cstr) else tcp_puts("%u", read_sys_const(ahextoul(cstr))); } else ifcmp("ucnst_") tcp_puts("%u", read_user_const(ahextoul(cstr+6))); + else ifcmp("vdd") tcp_puts("%u", system_get_vdd33()); // phy_get_vdd33(); #ifdef USE_NETBIOS else ifcmp("netbios") { if(syscfg.cfg.b.netbios_ena) tcp_strcpy(netbios_name); diff --git a/app/web/web_utils.c b/app/web/web_utils.c index e196d72..2517f0b 100644 --- a/app/web/web_utils.c +++ b/app/web/web_utils.c @@ -515,6 +515,7 @@ void ICACHE_FLASH_ATTR print_hex_dump(uint8 *buf, uint32 len, uint8 k) ets_printf((uint8 *)&ss[0], *ptr++); } } + //============================================================================= #define LowerCase(a) ((('A' <= a) && (a <= 'Z')) ? a + 32 : a) @@ -527,6 +528,7 @@ char* ICACHE_FLASH_ATTR word_to_lower_case(char* text) { return text; } #if 0 + //============================================================================= /* char UpperCase(char ch) { return (('a' <= ch) && (ch <= 'z')) ? ch - 32 : ch; }*/ @@ -534,10 +536,11 @@ char* ICACHE_FLASH_ATTR word_to_lower_case(char* text) { char* ICACHE_FLASH_ATTR str_to_upper_case(char* text) { char* p = text; - for (; *p; ++p) { + for (; *p < ' '; ++p) { *p = UpperCase(*p); } return text; } + #endif diff --git a/app/web/web_websocket.c b/app/web/web_websocket.c index 043ac4c..f57611c 100644 --- a/app/web/web_websocket.c +++ b/app/web/web_websocket.c @@ -19,9 +19,6 @@ #define MAX_RX_BUF_SIZE 8192 -const char txt_wsping[] ICACHE_RODATA_ATTR = "ws:ping"; -const char txt_wspong[] ICACHE_RODATA_ATTR = "ws:pong"; - //============================================================================= // websock_tx_frame() - передача фрейма //============================================================================= @@ -123,14 +120,12 @@ websock_rx_data(TCP_SERV_CONN *ts_conn) case sw_frs_text: #if DEBUGSOO > 1 os_printf("ws:txt "); -#if DEBUGSOO > 2 if(ws->frame_len != 0) { uint8 tt = pstr[len]; pstr[len] = 0; os_printf("'%s' ", pstr); pstr[len] = tt; } -#endif #endif if(ws->frame_len == ws->cur_len + len && ws->frame_len != 0) { // полное соо web_conn->msgbufsize = tcp_sndbuf(ts_conn->pcb); // сколько можем выввести сейчас? @@ -142,60 +137,52 @@ websock_rx_data(TCP_SERV_CONN *ts_conn) SetSCB(SCB_FCLOSE|SCB_DISCONNECT); return false; } - if(ws->frame_len == (sizeof(txt_wsping)-1) && rom_xstrcmp(pstr, txt_wsping) != 0){ - copy_s4d1(pstr, (void *)txt_wspong, sizeof(txt_wspong) - 1); - if(websock_tx_frame(ts_conn, WS_OPCODE_TEXT | WS_FRAGMENT_FIN, pstr, sizeof(txt_wspong) - 1) != ERR_OK) { - return false; // не докачивать, ошибка или закрытие + web_conn->msgbuf = (uint8 *) os_malloc(web_conn->msgbufsize); + if (web_conn->msgbuf == NULL) { +#if DEBUGSOO > 0 + os_printf("ws:mem!\n"); +#endif + websock_tx_close_err(ts_conn, WS_CLOSE_UNEXPECTED_ERROR); + SetSCB(SCB_FCLOSE|SCB_DISCONNECT); + return false; + }; + web_conn->msgbuflen = 0; + uint32 opcode; + if(CheckSCB(SCB_RETRYCB)) { // повторный callback? да + if(web_conn->func_web_cb != NULL) web_conn->func_web_cb(ts_conn); + if(!CheckSCB(SCB_RETRYCB)) { + ClrSCB(SCB_FCLOSE | SCB_DISCONNECT); + opcode = WS_OPCODE_CONTINUE | WS_FRAGMENT_FIN; } + else opcode = WS_OPCODE_CONTINUE; } else { - web_conn->msgbuf = (uint8 *) os_malloc(web_conn->msgbufsize); - if (web_conn->msgbuf == NULL) { -#if DEBUGSOO > 0 - os_printf("ws:mem!\n"); -#endif - websock_tx_close_err(ts_conn, WS_CLOSE_UNEXPECTED_ERROR); - SetSCB(SCB_FCLOSE|SCB_DISCONNECT); - return false; - }; - web_conn->msgbuflen = 0; - uint32 opcode; - if(CheckSCB(SCB_RETRYCB)) { // повторный callback? да - if(web_conn->func_web_cb != NULL) web_conn->func_web_cb(ts_conn); - if(!CheckSCB(SCB_RETRYCB)) { - ClrSCB(SCB_FCLOSE | SCB_DISCONNECT); - opcode = WS_OPCODE_CONTINUE | WS_FRAGMENT_FIN; - } - else opcode = WS_OPCODE_CONTINUE; + pstr[len] = '\0'; + uint8 *vstr = os_strchr(pstr, '='); + if(vstr != NULL) { + *vstr++ = '\0'; + web_int_vars(ts_conn, pstr, vstr); } else { - pstr[len] = '\0'; - uint8 *vstr = os_strchr(pstr, '='); - if(vstr != NULL) { - *vstr++ = '\0'; - web_int_vars(ts_conn, pstr, vstr); - } - else { - web_conn->msgbuf[0] = 0; - web_int_callback(ts_conn, pstr); - } - if(CheckSCB(SCB_RETRYCB)) opcode = WS_OPCODE_TEXT; - else { - ClrSCB(SCB_FCLOSE | SCB_DISCONNECT); - opcode = WS_OPCODE_TEXT | WS_FRAGMENT_FIN; - } + web_conn->msgbuf[0] = 0; + web_int_callback(ts_conn, pstr); } - if(web_conn->msgbuflen != 0) { - if(websock_tx_frame(ts_conn, opcode, web_conn->msgbuf, web_conn->msgbuflen) != ERR_OK) { - os_free(web_conn->msgbuf); - web_conn->msgbuf = NULL; - return false; // не докачивать, ошибка или закрытие - } + if(CheckSCB(SCB_RETRYCB)) opcode = WS_OPCODE_TEXT; + else { + ClrSCB(SCB_FCLOSE | SCB_DISCONNECT); + opcode = WS_OPCODE_TEXT | WS_FRAGMENT_FIN; + } + } + if(web_conn->msgbuflen != 0) { + if(websock_tx_frame(ts_conn, opcode, web_conn->msgbuf, web_conn->msgbuflen) != ERR_OK) { + os_free(web_conn->msgbuf); + web_conn->msgbuf = NULL; + return false; // не докачивать, ошибка или закрытие } - os_free(web_conn->msgbuf); - web_conn->msgbuf = NULL; - if(CheckSCB(SCB_RETRYCB)) return false; } + os_free(web_conn->msgbuf); + web_conn->msgbuf = NULL; + if(CheckSCB(SCB_RETRYCB)) return false; } /* if(0) { diff --git a/app/web/websock.c b/app/web/websock.c index 69a5937..50f4336 100644 --- a/app/web/websock.c +++ b/app/web/websock.c @@ -154,7 +154,7 @@ WebsocketHead(WS_FRSTAT *ws, uint8 *raw_data, uint32 raw_len) ws->flg |= WS_FLG_FIN; } #if DEBUGSOO > 1 - os_printf("ws#%02xrx[%u] ", raw_data[0], data_len); + os_printf("ws#%02xrx[%u] ", raw_data[0], raw_len); #endif return 1; /* @@ -205,7 +205,7 @@ WebsocketTxFrame(TCP_SERV_CONN *ts_conn, uint32 opcode, uint8 *raw_data, uint32 err_t err = 1; // ERR_BUF; if(len >= raw_len + head_len) { #if DEBUGSOO > 1 - os_printf("ws#%02xtx[%u] ", head.uc[0], raw_len); + os_printf("ws#%02xtx[%u] ", head.uc, raw_len); #endif ts_conn->flag.nagle_disabled = 0; tcp_nagle_disable(ts_conn->pcb); diff --git a/bin/0.bin b/bin/0.bin new file mode 100644 index 0000000..a08f7c9 Binary files /dev/null and b/bin/0.bin differ diff --git a/bin/0x00000.bin b/bin/0x00000.bin index 6edfded..f244c1b 100644 Binary files a/bin/0x00000.bin and b/bin/0x00000.bin differ diff --git a/bin/0x07000.bin b/bin/0x07000.bin index 493ddc6..c2d900a 100644 Binary files a/bin/0x07000.bin and b/bin/0x07000.bin differ diff --git a/bin/esp_init_data_default.bin b/bin/esp_init_data_default.bin index 3db53cc..08e0e77 100644 Binary files a/bin/esp_init_data_default.bin and b/bin/esp_init_data_default.bin differ diff --git a/bin/readme.txt b/bin/readme.txt index b03453d..584bda7 100644 --- a/bin/readme.txt +++ b/bin/readme.txt @@ -1,7 +1,8 @@ Addr - file name - Info -------------------------------------------------------- 0x00000 - bin/0x00000.bin - Program codes IRAM/RAM -0x07000 - bin/0x07000.bin - Program codes Cache Flash +0x06000 - bin/0x06000.bin - Program codes Cache Flash +0x39000 - webbin/WEBFiles.bin - WebFileSystem (if 512 kbytes Flash) 0x79000 - bin/clear_eep.bin - Clear settings EEP area 0x7C000 - bin/esp_init_data_default.bin - RF SDK options 0x7E000 - bin/blank.bin - Default SDK WiFi config diff --git a/include/lwipopts.h b/include/lwipopts.h index c33c1f8..a500c69 100644 --- a/include/lwipopts.h +++ b/include/lwipopts.h @@ -985,7 +985,7 @@ * an upper limit on the MSS advertised by the remote host. */ #ifndef TCP_MSS -#define TCP_MSS 1460 +#define TCP_MSS 1400 #endif #endif diff --git a/include/user_config.h b/include/user_config.h index 48497bf..14c1320 100644 --- a/include/user_config.h +++ b/include/user_config.h @@ -3,108 +3,54 @@ #include "sdk/sdk_config.h" -#define SYS_VERSION "0.5.6" +#define SYS_VERSION "0.5.5" //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + #define WEB_DEFAULT_SOFTAP_IP DEFAULT_SOFTAP_IP // ip 192.168.4.1 #define WEB_DEFAULT_SOFTAP_MASK DEFAULT_SOFTAP_MASK // mask 255.255.255.0 #define WEB_DEFAULT_SOFTAP_GW DEFAULT_SOFTAP_IP // gw 192.168.4.1 + #define WEB_DEFAULT_STATION_IP 0x3201A8C0 // ip 192.168.1.50 #define WEB_DEFAULT_STATION_MASK 0x00FFFFFF // mask 255.255.255.0 #define WEB_DEFAULT_STATION_GW 0x0101A8C0 // gw 192.168.1.1 -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -#define PROGECT_NUMBER 0 -// 0 -> проект "TCP2UART" -// 1 -> проект MODBUS-"RS485" -// 2 -> пустой web+websocket -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -#if PROGECT_NUMBER == 0 -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// Конфигурация для проекта TCP2UART + //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #define USE_WEB 80 // включить в трансялцию порт Web, если =0 - по умолчанию выключен #define WEBSOCKET_ENA // включить WEBSOCKET -#define USE_TCP2UART 12345 // включить в трансялцию драйвер TCP2UART, номер порта по умолчанию (=0 - отключен) +//#define USE_TCP2UART 12345 // включить в трансялцию драйвер TCP2UART, номер порта по умолчанию (=0 - отключен) #if DEBUGSOO > 0 -#define UDP_TEST_PORT 1025 // включить в трансялцию контрольный порт UDP, (=0 - отключен) +#ifndef USE_TCP2UART +// #define USE_GDBSTUB // UDK пока не поддерживает GDB #endif - -#define USE_CPU_SPEED 160 // установить частоту CPU по умолчанию 80 или 160 MHz - -#define USE_NETBIOS 1 // включить в трансялцию драйвер NETBIOS, если =0 - по умолчанию выключен. - -#define USE_SNTP 1 // включить в трансялцию драйвер SNTP, если =0 - по умолчанию выключен, = 1 - по умолчанию включен. - -#define USE_MODBUS 502 // включить в трансялцию Modbus TCP, если =0 - по умолчанию выключен -#define MDB_ID_ESP 50 // номер устройства ESP на шине modbus - -#define USE_WDRV 10201 // включить в трансялцию вывод Wave ADC по UDP, номер порта управления по умолчанию (=0 - отключен) - -#define USE_CAPTDNS 0 // включить в трансялцию NDS отвечающий на всё запросы клиента при соединении к AP модуля - // указанием на данный WebHttp (http://aesp8266/), если =0 - по умолчанию выключен - -//#define USE_GPIOs_intr // включение примера с счетчиками срабатывания прерываний на GPOIs (использует ~sys_ucnst_1~ и ~sys_ucnst_2~ для сохранения в flash) - // смотреть переменные ~count1~, ~count2~, ~sys_ucnst_1~, ~sys_ucnst_2~ и их запись... - // файлы: \app\web\gpios_intr.c \app\include\gpios_intr.h - -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -#elif PROGECT_NUMBER == 1 -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// Конфигурация для проекта MODBUS-RS-485 -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -#define USE_WEB 80 // включить в трансялцию порт Web, если =0 - по умолчанию выключен -#define WEBSOCKET_ENA // включить WEBSOCKET - -#if DEBUGSOO > 0 //#define UDP_TEST_PORT 1025 // включить в трансялцию контрольный порт UDP, (=0 - отключен) #endif #define USE_CPU_SPEED 160 // установить частоту CPU по умолчанию 80 или 160 MHz -#define USE_NETBIOS 1 // включить в трансялцию драйвер NETBIOS, если =0 - по умолчанию выключен. +//#define USE_NETBIOS 1 // включить в трансялцию драйвер NETBIOS, если =0 - по умолчанию выключен. #define USE_SNTP 1 // включить в трансялцию драйвер SNTP, если =0 - по умолчанию выключен, = 1 - по умолчанию включен. #ifndef USE_TCP2UART -#define USE_RS485DRV // использовать RS-485 драйвер -#define MDB_RS485_MASTER // Modbus RTU RS-485 master & slave +//#define USE_RS485DRV // использовать RS-485 драйвер +//#define MDB_RS485_MASTER // Modbus RTU RS-485 master & slave #endif -#define USE_MODBUS 502 // включить в трансялцию Modbus TCP, если =0 - по умолчанию выключен -#define MDB_ID_ESP 50 // номер устройства ESP на шине modbus - +//#define USE_MODBUS 502 // включить в трансялцию Modbus TCP, если =0 - по умолчанию выключен +//#define MDB_ID_ESP 50 // номер устройства ESP на шине modbus -// #define USE_WDRV 10201 // включить в трансялцию вывод Wave ADC по UDP, номер порта управления по умолчанию (=0 - отключен) +//#define USE_WDRV 10201 // включить в трансялцию вывод Wave ADC по UDP, номер порта управления по умолчанию (=0 - отключен) -#define USE_CAPTDNS 0 // включить в трансялцию DNS отвечающий на всё запросы клиента при соединении к AP модуля +//#define USE_CAPTDNS 0 // включить в трансялцию NDS отвечающий на всё запросы клиента при соединении к AP модуля // указанием на данный WebHttp (http://aesp8266/), если =0 - по умолчанию выключен //#define USE_GPIOs_intr // включение примера с счетчиками срабатывания прерываний на GPOIs (использует ~sys_ucnst_1~ и ~sys_ucnst_2~ для сохранения в flash) // смотреть переменные ~count1~, ~count2~, ~sys_ucnst_1~, ~sys_ucnst_2~ и их запись... // файлы: \app\web\gpios_intr.c \app\include\gpios_intr.h -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -#elif PROGECT_NUMBER == 2 -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// Конфигурация для проекта WEB+WEBSOCEK -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -#define USE_WEB 80 // включить в трансялцию порт Web, если =0 - по умолчанию выключен -#define WEBSOCKET_ENA // включить WEBSOCKET -#define USE_NETBIOS 1 // включить в трансялцию драйвер NETBIOS, если =0 - по умолчанию выключен. -#define USE_SNTP 1 // включить в трансялцию драйвер SNTP, если =0 - по умолчанию выключен, = 1 - по умолчанию включен. - -//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -#endif // PROGECT_NAME - -#if DEBUGSOO > 0 -#if !(defined(USE_RS485DRV) || defined(USE_TCP2UART)) -// #define USE_GDBSTUB // UDK пока не поддерживает GDB -#endif -#endif - #endif // _user_config_h_ diff --git a/lib/libsdk.a b/lib/libsdk.a new file mode 100644 index 0000000..82781ca Binary files /dev/null and b/lib/libsdk.a differ diff --git a/make_webfs.bat b/make_webfs.bat new file mode 100644 index 0000000..1f35eea --- /dev/null +++ b/make_webfs.bat @@ -0,0 +1 @@ +WEBFS22.exe -h "*.htm, *.html, *.cgi, *.xml, *.bin, *.txt, *.wav" -z "mdbini.bin, *.inc, *.ini, snmp.bib" .\WEBFiles .\webbin WEBFiles.bin diff --git a/webbin/WEBFiles.bin b/webbin/WEBFiles.bin index fd8856e..7217d6e 100644 Binary files a/webbin/WEBFiles.bin and b/webbin/WEBFiles.bin differ diff --git a/webvars_rs485.xlsx b/webvars_rs485.xlsx deleted file mode 100644 index ba6882f..0000000 Binary files a/webvars_rs485.xlsx and /dev/null differ