Merging of development branch into master for v1.2.0 release.

.gitignore

@@ -2,3 +2,8 @@
 .piolibdeps
 .clang_complete
 .gcc-flags.json
+.vscode
+include/index_html.h
+.vscode/.browse.c_cpp.db*
+.vscode/c_cpp_properties.json
+.vscode/launch.json

DCCppESP32-partitions.csv

@@ -0,0 +1,6 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x5000,
+otadata,  data, ota,     0xe000,  0x2000,
+ota_0,     app, ota_0,   ,        0x190000,
+ota_1,     app, ota_1,   ,        0x190000,
+spiffs,   data, spiffs,  ,        0xD0000,

build_index_header.py

@@ -1,12 +1,29 @@
+#######################################################################
+# DCC COMMAND STATION FOR ESP32
+#
+# COPYRIGHT (c) 2017-2019 Mike Dunston
+#
+#  This program is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#  You should have received a copy of the GNU General Public License
+#  along with this program.  If not, see http://www.gnu.org/licenses
+#######################################################################
+
 Import("env")
 import gzip
 import os
 import struct
 import cStringIO
 
 def build_index_html_h(source, target, env):
-    if os.path.exists('%s/src/index_html.h' % env.subst('$PROJECT_DIR')):
-        if os.path.getmtime('%s/data/index.html' % env.subst('$PROJECT_DIR')) < os.path.getmtime('%s/src/index_html.h' % env.subst('$PROJECT_DIR')):
+    if os.path.exists('%s/include/index_html.h' % env.subst('$PROJECT_DIR')):
+        if os.path.getmtime('%s/data/index.html' % env.subst('$PROJECT_DIR')) < os.path.getmtime('%s/include/index_html.h' % env.subst('$PROJECT_DIR')):
             return
     print "Attempting to compress %s/data/index.html" % env.subst('$PROJECT_DIR')
     gzFile = cStringIO.StringIO()
@@ -16,7 +33,7 @@ def build_index_html_h(source, target, env):
     gzLen = gzFile.tell()
     gzFile.seek(0, os.SEEK_SET)
     print 'Compressed index.html.gz file is %d bytes' % gzLen
-    with open('%s/src/index_html.h' % env.subst('$PROJECT_DIR'), 'w') as f:
+    with open('%s/include/index_html.h' % env.subst('$PROJECT_DIR'), 'w') as f:
         f.write("#pragma once\n")
         f.write("const size_t indexHtmlGz_size = {};\n".format(gzLen))
         f.write("const uint8_t indexHtmlGz[] PROGMEM = {\n");