small cleanup of ignore files etc

.gitignore

@@ -13,7 +13,6 @@ eagle.app.sym
 
 # Garbage added by CLion
 .idea/
-CMakeLists.txt
 cmake-build-debug/
 .sass-cache
 

CMakeLists.txt

@@ -0,0 +1,137 @@
+cmake_minimum_required(VERSION 3.7)
+
+###################################################################
+# This is a fake CMake config to make the project work in CLion   #
+# Do not attempt to build it with cmake, use make instead.        #
+###################################################################
+
+project(esp_vt100_firmware)
+
+set(CMAKE_CXX_STANDARD GNU99)
+
+set(SOURCE_FILES
+        libesphttpd/core/auth.c
+        libesphttpd/core/base64.c
+        libesphttpd/core/httpd.c
+        libesphttpd/core/httpdespfs.c
+        libesphttpd/core/httpd-freertos.c
+        libesphttpd/core/httpd-nonos.c
+        libesphttpd/core/sha1.c
+        libesphttpd/core/uptime.c
+        libesphttpd/core/httpd-platform.h
+
+        libesphttpd/espfs/heatshrink_decoder.c
+        libesphttpd/espfs/heatshrink_config_custom.h
+        libesphttpd/espfs/espfsformat.h
+        libesphttpd/espfs/espfs.c
+
+        libesphttpd/include/webpages-espfs.h
+        libesphttpd/include/user_config.h
+        libesphttpd/include/uptime.h
+        libesphttpd/include/sha1.h
+        libesphttpd/include/platform.h
+        libesphttpd/include/logging.h
+        libesphttpd/include/httpd.h
+        libesphttpd/include/httpdespfs.h
+        libesphttpd/include/espmissingincludes.h
+        libesphttpd/include/espfs.h
+        libesphttpd/include/esp8266.h
+        libesphttpd/include/cgiwifi.h
+        libesphttpd/include/cgiwebsocket.h
+        libesphttpd/include/cgiflash.h
+        libesphttpd/include/captdns.h
+        libesphttpd/include/base64.h
+        libesphttpd/include/auth.h
+        libesphttpd/lib/heatshrink/heatshrink_encoder.h
+        libesphttpd/lib/heatshrink/heatshrink_decoder.h
+        libesphttpd/lib/heatshrink/heatshrink_config.h
+        libesphttpd/lib/heatshrink/heatshrink_common.h
+        libesphttpd/lib/heatshrink/greatest.h
+        libesphttpd/lib/heatshrink/test_heatshrink_static.c
+        libesphttpd/lib/heatshrink/test_heatshrink_dynamic_theft.c
+        libesphttpd/lib/heatshrink/test_heatshrink_dynamic.c
+        libesphttpd/lib/heatshrink/heatshrink_encoder.c
+        libesphttpd/lib/heatshrink/heatshrink_decoder.c
+        libesphttpd/lib/heatshrink/heatshrink.c
+        libesphttpd/mkupgimg/mkupgimg.c
+        libesphttpd/util/cgiwifi.c
+        libesphttpd/util/cgiwebsocket.c
+        libesphttpd/util/cgiflash.c
+        libesphttpd/util/captdns.c
+
+        esp_iot_sdk_v1.5.2/include/user_interface.h
+        esp_iot_sdk_v1.5.2/include/upgrade.h
+        esp_iot_sdk_v1.5.2/include/uart_register.h
+        esp_iot_sdk_v1.5.2/include/spi_register.h
+        esp_iot_sdk_v1.5.2/include/spi_flash.h
+        esp_iot_sdk_v1.5.2/include/sntp.h
+        esp_iot_sdk_v1.5.2/include/smartconfig.h
+        esp_iot_sdk_v1.5.2/include/slc_register.h
+        esp_iot_sdk_v1.5.2/include/queue.h
+        esp_iot_sdk_v1.5.2/include/pwm.h
+        esp_iot_sdk_v1.5.2/include/ping.h
+        esp_iot_sdk_v1.5.2/include/os_type.h
+        esp_iot_sdk_v1.5.2/include/osapi.h
+        esp_iot_sdk_v1.5.2/include/mesh.h
+        esp_iot_sdk_v1.5.2/include/mem.h
+        esp_iot_sdk_v1.5.2/include/ip_addr.h
+        esp_iot_sdk_v1.5.2/include/gpio.h
+        esp_iot_sdk_v1.5.2/include/ets_sys.h
+        esp_iot_sdk_v1.5.2/include/esp_sdk_ver.h
+        esp_iot_sdk_v1.5.2/include/espnow.h
+        esp_iot_sdk_v1.5.2/include/espconn.h
+        esp_iot_sdk_v1.5.2/include/eagle_soc.h
+        esp_iot_sdk_v1.5.2/include/c_types.h
+        esp_iot_sdk_v1.5.2/include/at_custom.h
+        esp_iot_sdk_v1.5.2/include/airkiss.h
+        esp_iot_sdk_v1.5.2/include/json/jsontree.h
+        esp_iot_sdk_v1.5.2/include/json/jsonparse.h
+        esp_iot_sdk_v1.5.2/include/json/json.h
+
+        include/uart_hw.h
+        include/user_config.h
+        include/ets_sys_extra.h
+        user/io.c
+        user/io.h
+        user/cgi_ping.c
+        user/cgi_reset.c
+        user/uart_driver.c
+        user/uart_handler.c
+        user/ansi_parser.c
+        user/ansi_parser.h
+        user/ansi_parser.rl
+        user/screen.c
+        user/user_main.c
+        user/serial.c
+        user/serial.h
+        user/routes.c
+        user/routes.h
+        user/cgi_main.c
+        user/cgi_main.h
+        user/cgi_sockets.c
+        user/cgi_sockets.c
+        user/cgi_sockets.h
+        user/ansi_parser_callbacks.c
+        user/ansi_parser_callbacks.h
+        user/user_main.h)
+
+include_directories(include)
+include_directories(user)
+include_directories(libesphttpd/include)
+include_directories(libesphttpd/espfs)
+include_directories(libesphttpd/core)
+include_directories(libesphttpd/lib/heatshrink)
+
+include_directories(esp_iot_sdk_v1.5.2/include)
+
+add_definitions(
+        -D__ets__
+        -DICACHE_FLASH
+        -DHTTPD_MAX_CONNECTIONS=5
+        -DHTTPD_STACKSIZE=1000
+        -DICACHE_FLASH_ATTR=
+        -DICACHE_RODATA_ATTR=
+        -DFLAG_GZIP=2
+        -DESPFS_HEATSHRINK)
+
+add_executable(esp_vt100_firmware ${SOURCE_FILES})

html_orig/.gitignore

@@ -0,0 +1 @@
+_test_env.php

html_orig/_test_env.php.example

@@ -0,0 +1,3 @@
+<?php
+
+define("ESP_IP", "192.168.0.19");

html_orig/term_test.php

@@ -1,8 +1,10 @@
 <?php
 
+require '_test_env.php';
+
 $f = file_get_contents('term.html');
 
-$f = str_replace('%screenData%', 
+$f = str_replace('%screenData%',
 '{
  "w": 26, "h": 10,
  "x": 0, "y": 0,
@@ -10,6 +12,6 @@ $f = str_replace('%screenData%',
  "screen": "70 t259"
 }', $f);
 
-$f = str_replace('window.location.host', '"192.168.0.18"', $f);
+$f = str_replace('window.location.host', json_encode(ESP_IP), $f);
 
 echo $f;

html_orig/wifi_test.php

@@ -1,13 +1,15 @@
 <?php
 
+require '_test_env.php';
+
 $f = file_get_contents('wifi.html');
 
 $f = str_replace('%StaSSID%', 'Chlivek', $f);
-$f = str_replace('%StaIP%', '192.168.0.15', $f);
+$f = str_replace('%StaIP%', json_encode(ESP_IP), $f);
 $f = str_replace('%WiFiModeNum%', '1', $f);
 $f = str_replace('%WiFiMode%', 'Client', $f);
 $f = str_replace('%WiFiChannel%', '1', $f);
 
-$f = str_replace('window.location.host', '"192.168.0.15"', $f);
+$f = str_replace('window.location.host', json_encode(ESP_IP), $f);
 
 echo $f;

user/ansi_parser.c

@@ -246,7 +246,7 @@ execFuncs:
 				csi_n[i] = 0;
 			}
 
-			{cs = 3; goto _again;}
+			{cs = 3;goto _again;}
 		}
 	break;
 	case 2:
@@ -277,14 +277,14 @@ execFuncs:
 
 			apars_handle_CSI(csi_leading, csi_n, csi_char);
 
-			{cs = 1; goto _again;}
+			{cs = 1;goto _again;}
 		}
 	break;
 	case 6:
 /* #line 97 "user/ansi_parser.rl" */
 	{
 			apars_handle_badseq();
-			{cs = 1; goto _again;}
+			{cs = 1;goto _again;}
 		}
 	break;
 	case 7:
@@ -297,14 +297,14 @@ execFuncs:
 				csi_n[i] = 0;
 			}
 
-			{cs = 5; goto _again;}
+			{cs = 5;goto _again;}
 		}
 	break;
 	case 8:
 /* #line 125 "user/ansi_parser.rl" */
 	{
 			apars_handle_OSC_FactoryReset();
-			{cs = 1; goto _again;}
+			{cs = 1;goto _again;}
 		}
 	break;
 	case 9:
@@ -312,7 +312,7 @@ execFuncs:
 	{
 			apars_handle_OSC_SetScreenSize(csi_n[0], csi_n[1]);
 
-			{cs = 1; goto _again;}
+			{cs = 1;goto _again;}
 		}
 	break;
 	case 10:
@@ -320,21 +320,21 @@ execFuncs:
 	{
 			// Reset screen
 			apars_handle_RESET_cmd();
-			{cs = 1; goto _again;}
+			{cs = 1;goto _again;}
 		}
 	break;
 	case 11:
 /* #line 147 "user/ansi_parser.rl" */
 	{
 			apars_handle_saveCursorAttrs();
-			{cs = 1; goto _again;}
+			{cs = 1;goto _again;}
 		}
 	break;
 	case 12:
 /* #line 152 "user/ansi_parser.rl" */
 	{
 			apars_handle_restoreCursorAttrs();
-			{cs = 1; goto _again;}
+			{cs = 1;goto _again;}
 		}
 	break;
 /* #line 341 "user/ansi_parser.c" */
@@ -358,10 +358,12 @@ _again:
 /* #line 97 "user/ansi_parser.rl" */
 	{
 			apars_handle_badseq();
-			{cs = 1; goto _again;}
+			{cs = 1;	if ( p == pe )
+		goto _test_eof;
+goto _again;}
 		}
 	break;
-/* #line 365 "user/ansi_parser.c" */
+/* #line 367 "user/ansi_parser.c" */
 		}
 	}
 	}