pvvx · vad7 · Feb 9, 2016 · Feb 10, 2016 · Feb 10, 2016 · Feb 9, 2016
diff --git a/.gitignore b/.gitignore
diff --git a/CreateLib/Web_Base.lib b/CreateLib/Web_Base.lib
diff --git a/CreateLib/app/sdklib/lwip/api/api_lib.o b/CreateLib/app/sdklib/lwip/api/api_lib.o
diff --git a/CreateLib/app/sdklib/lwip/api/api_msg.o b/CreateLib/app/sdklib/lwip/api/api_msg.o
diff --git a/CreateLib/app/sdklib/lwip/api/err.o b/CreateLib/app/sdklib/lwip/api/err.o
diff --git a/CreateLib/app/sdklib/lwip/api/netbuf.o b/CreateLib/app/sdklib/lwip/api/netbuf.o
diff --git a/CreateLib/app/sdklib/lwip/api/netdb.o b/CreateLib/app/sdklib/lwip/api/netdb.o
diff --git a/CreateLib/app/sdklib/lwip/api/netifapi.o b/CreateLib/app/sdklib/lwip/api/netifapi.o
diff --git a/CreateLib/app/sdklib/lwip/api/sockets.o b/CreateLib/app/sdklib/lwip/api/sockets.o
diff --git a/CreateLib/app/sdklib/lwip/api/tcpip.o b/CreateLib/app/sdklib/lwip/api/tcpip.o
diff --git a/CreateLib/app/sdklib/lwip/app/dhcpserver.o b/CreateLib/app/sdklib/lwip/app/dhcpserver.o
diff --git a/CreateLib/app/sdklib/lwip/app/espconn.o b/CreateLib/app/sdklib/lwip/app/espconn.o
diff --git a/CreateLib/app/sdklib/lwip/app/espconn_mdns.o b/CreateLib/app/sdklib/lwip/app/espconn_mdns.o
diff --git a/CreateLib/app/sdklib/lwip/app/espconn_tcp.o b/CreateLib/app/sdklib/lwip/app/espconn_tcp.o
diff --git a/CreateLib/app/sdklib/lwip/app/espconn_udp.o b/CreateLib/app/sdklib/lwip/app/espconn_udp.o
diff --git a/CreateLib/app/sdklib/lwip/app/netio.o b/CreateLib/app/sdklib/lwip/app/netio.o
diff --git a/CreateLib/app/sdklib/lwip/app/ping.o b/CreateLib/app/sdklib/lwip/app/ping.o
diff --git a/CreateLib/app/sdklib/lwip/core/def.o b/CreateLib/app/sdklib/lwip/core/def.o
diff --git a/CreateLib/app/sdklib/lwip/core/dhcp.o b/CreateLib/app/sdklib/lwip/core/dhcp.o
diff --git a/CreateLib/app/sdklib/lwip/core/dns.o b/CreateLib/app/sdklib/lwip/core/dns.o
diff --git a/CreateLib/app/sdklib/lwip/core/init.o b/CreateLib/app/sdklib/lwip/core/init.o
diff --git a/CreateLib/app/sdklib/lwip/core/ipv4/autoip.o b/CreateLib/app/sdklib/lwip/core/ipv4/autoip.o
diff --git a/CreateLib/app/sdklib/lwip/core/ipv4/icmp.o b/CreateLib/app/sdklib/lwip/core/ipv4/icmp.o
diff --git a/CreateLib/app/sdklib/lwip/core/ipv4/igmp.o b/CreateLib/app/sdklib/lwip/core/ipv4/igmp.o
diff --git a/CreateLib/app/sdklib/lwip/core/ipv4/inet.o b/CreateLib/app/sdklib/lwip/core/ipv4/inet.o
diff --git a/CreateLib/app/sdklib/lwip/core/ipv4/inet_chksum.o b/CreateLib/app/sdklib/lwip/core/ipv4/inet_chksum.o
diff --git a/CreateLib/app/sdklib/lwip/core/ipv4/ip.o b/CreateLib/app/sdklib/lwip/core/ipv4/ip.o
diff --git a/CreateLib/app/sdklib/lwip/core/ipv4/ip_addr.o b/CreateLib/app/sdklib/lwip/core/ipv4/ip_addr.o
diff --git a/CreateLib/app/sdklib/lwip/core/ipv4/ip_frag.o b/CreateLib/app/sdklib/lwip/core/ipv4/ip_frag.o
diff --git a/CreateLib/app/sdklib/lwip/core/mdns.o b/CreateLib/app/sdklib/lwip/core/mdns.o
diff --git a/CreateLib/app/sdklib/lwip/core/mem.o b/CreateLib/app/sdklib/lwip/core/mem.o
diff --git a/CreateLib/app/sdklib/lwip/core/memp.o b/CreateLib/app/sdklib/lwip/core/memp.o
diff --git a/CreateLib/app/sdklib/lwip/core/netif.o b/CreateLib/app/sdklib/lwip/core/netif.o
diff --git a/CreateLib/app/sdklib/lwip/core/pbuf.o b/CreateLib/app/sdklib/lwip/core/pbuf.o
diff --git a/CreateLib/app/sdklib/lwip/core/raw.o b/CreateLib/app/sdklib/lwip/core/raw.o
diff --git a/CreateLib/app/sdklib/lwip/core/sntp.o b/CreateLib/app/sdklib/lwip/core/sntp.o
diff --git a/CreateLib/app/sdklib/lwip/core/stats.o b/CreateLib/app/sdklib/lwip/core/stats.o
diff --git a/CreateLib/app/sdklib/lwip/core/sys.o b/CreateLib/app/sdklib/lwip/core/sys.o
diff --git a/CreateLib/app/sdklib/lwip/core/tcp.o b/CreateLib/app/sdklib/lwip/core/tcp.o
diff --git a/CreateLib/app/sdklib/lwip/core/tcp_in.o b/CreateLib/app/sdklib/lwip/core/tcp_in.o
diff --git a/CreateLib/app/sdklib/lwip/core/tcp_out.o b/CreateLib/app/sdklib/lwip/core/tcp_out.o
diff --git a/CreateLib/app/sdklib/lwip/core/timers.o b/CreateLib/app/sdklib/lwip/core/timers.o
diff --git a/CreateLib/app/sdklib/lwip/core/udp.o b/CreateLib/app/sdklib/lwip/core/udp.o
diff --git a/CreateLib/app/sdklib/lwip/netif/etharp.o b/CreateLib/app/sdklib/lwip/netif/etharp.o
diff --git a/CreateLib/app/sdklib/phy/phy_chip_v6_unused.o b/CreateLib/app/sdklib/phy/phy_chip_v6_unused.o
diff --git a/CreateLib/app/sdklib/pp/pplibadd.o b/CreateLib/app/sdklib/pp/pplibadd.o
diff --git a/CreateLib/app/sdklib/system/app_main.o b/CreateLib/app/sdklib/system/app_main.o
diff --git a/CreateLib/app/sdklib/system/eagle_lwip_if.o b/CreateLib/app/sdklib/system/eagle_lwip_if.o
diff --git a/CreateLib/app/sdklib/system/ets_run_new.o b/CreateLib/app/sdklib/system/ets_run_new.o
diff --git a/CreateLib/app/sdklib/system/ets_timer.o b/CreateLib/app/sdklib/system/ets_timer.o
diff --git a/CreateLib/app/sdklib/system/main-vectors.o b/CreateLib/app/sdklib/system/main-vectors.o
diff --git a/CreateLib/app/sdklib/system/mem_manager.o b/CreateLib/app/sdklib/system/mem_manager.o
diff --git a/CreateLib/app/sdklib/system/os_printf.o b/CreateLib/app/sdklib/system/os_printf.o
diff --git a/CreateLib/app/sdklib/system/rom2ram.o b/CreateLib/app/sdklib/system/rom2ram.o
diff --git a/CreateLib/app/sdklib/system/spi_flash.o b/CreateLib/app/sdklib/system/spi_flash.o
diff --git a/CreateLib/app/sdklib/system/spi_overlap.o b/CreateLib/app/sdklib/system/spi_overlap.o
diff --git a/CreateLib/app/sdklib/system/wdt.o b/CreateLib/app/sdklib/system/wdt.o
diff --git a/CreateLib/app/sdklib/wpa/os_xtensa.o b/CreateLib/app/sdklib/wpa/os_xtensa.o
diff --git a/CreateLib/app/sdklib/wpa/wpa_debug.o b/CreateLib/app/sdklib/wpa/wpa_debug.o
diff --git a/ESP-01_RS-485_sch.gif b/ESP-01_RS-485_sch.gif
diff --git 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 <http://unlicense.org/>
+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
@@ -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
@@ -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 -<br>
 All I/O, Wifi, system, ... variables.<br>
 GET/POST/websocket, cookie, load/upload data/Flash, multipart/form-data,...<br>
 TCP2UART: 300..3000000 Baud, Flow Control On/Off, Inverse On/Of all signals, ...<br>
-RS-485: half-duplex 300..1000000 Baud <br>
 HTTP-Web services to more than 10 simultaneous open connections.<br>
 Websocket open uri: '/web.cgi'<br>
 
@@ -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:<br>
  GPIOs, ADC, VDD.<br>
-RS-485 chematics: 
-![SCH](https://github.com/pvvx/esp8266web/blob/master/ESP-01_RS-485_sch.gif)
 
 Supported options 48 kbytes IRAM.<br>
 Supported '[Rapid Loader](https://github.com/pvvx/Rapid_Loader/)' and Flash 512 кbytes - 16 Mbytes.<br>
@@ -51,17 +48,12 @@ Upload WEBFS:<br>
 2) Explorer: http://192.168.4.1/fsupload (name and password from WiFi AP)<br>
 3) Select WEBFiles.bin file. Upload.<br>
 
-Для компиляции SDK используется [Unofficial Developer Kit](http://esp8266.ru/forum/forums/devkit/).<br><br>
 
-Переключение проекта с TCP2UART на MODBUS RS-485 производится в include/user_config.h.<br>
-Файлы для web-диска для проектов находятся в разных папках.<br> 
-Желательно переместить используемые для проекта в папку WEBFiles.<br>  
-Но возможно использование и make_webfs_rs485.bat или make_webfs_tcp2uart.bat.<br>
+[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/).<br>
 
 В Eclipse заданы 3 опции Manage Configurations:<br>
 1. AutoMake (собрать проект для прошивки, используются установки в Eclipse)<br>
 2. CreateLib (собрать библиотеку libsdk.a (meSDK), используются установки в Eclipse)<br>
 3. Default (собрать проект для прошивки, используя makefile)<br>
-
-[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
diff --git a/WEBFilesRS485/404.htm b/WEBFilesRS485/404.htm
diff --git a/WEBFilesRS485/adc.htm b/WEBFilesRS485/adc.htm
diff --git a/WEBFilesRS485/adc.xml b/WEBFilesRS485/adc.xml
diff --git a/WEBFilesRS485/disk_er1.htm b/WEBFilesRS485/disk_er1.htm
diff --git a/WEBFilesRS485/disk_er2.htm b/WEBFilesRS485/disk_er2.htm
diff --git a/WEBFilesRS485/disk_er3.htm b/WEBFilesRS485/disk_er3.htm
diff --git a/WEBFilesRS485/disk_ok.htm b/WEBFilesRS485/disk_ok.htm
diff --git a/WEBFilesRS485/esp.gif b/WEBFilesRS485/esp.gif
diff --git a/WEBFilesRS485/favicon.ico b/WEBFilesRS485/favicon.ico
diff --git a/WEBFilesRS485/footer.inc b/WEBFilesRS485/footer.inc