Upgrade Sming and other.

.vscode/c_cpp_properties.json

@@ -24,7 +24,7 @@
                 "C:/ESP/Sming/Sming/Components/arch_driver/src/include",
                 "C:/ESP/Sming/Sming/Arch/Esp8266/Components/gdbstub",
                 "C:/ESP/Sming/Sming/Arch/Esp8266/Components/driver",
-                "C:/ESP/esp-quick-toolchain/xtensa-lx106-elf/include",
+                "C:/ESP/xtensa-lx106-elf/include",
                 "C:/ESP/Sming/Sming/Arch/Esp8266/Components/spi_flash/include",
                 "C:/ESP/Sming/Sming/Arch/Esp8266/Components/esp_wifi/include",
                 "C:/ESP/Sming/Sming/Components/FlashString/src/include",
@@ -106,6 +106,74 @@
                 "limitSymbolsToIncludedHeaders": true,
                 "databaseFilename": "${workspaceRoot}/.vscode/browse.vc.db"
             }
+        },
+        {
+            "name": "Esp8266",
+            "browse": {
+                "limitSymbolsToIncludedHeaders": true
+            },
+            "includePath": [
+                "d:/Projects/ESP8266/WallSegmentClock/**",
+                "${SMING_HOME}/Components",
+                "${SMING_HOME}/System/include",
+                "${SMING_HOME}/Wiring",
+                "${SMING_HOME}/Core",
+                "${SMING_HOME}",
+                "${SMING_HOME}/Components/Storage/src/include",
+                "${SMING_HOME}/Arch/Esp8266",
+                "${SMING_HOME}/Arch/Esp8266/Core",
+                "${SMING_HOME}/Arch/Esp8266/Components",
+                "${SMING_HOME}/Arch/Esp8266/Components/libc/include",
+                "${SMING_HOME}/Components/rboot/rboot",
+                "${SMING_HOME}/Components/rboot/rboot/appcode",
+                "${SMING_HOME}/Components/rboot/include",
+                "${SMING_HOME}/Arch/Esp8266/Components/esp8266/include",
+                "${SMING_HOME}/Arch/Esp8266/Components/esp8266",
+                "${SMING_HOME}/Arch/Esp8266/Components/driver/include",
+                "${SMING_HOME}/Components/arch_driver/src/include",
+                "${SMING_HOME}/Arch/Esp8266/Components/gdbstub",
+                "${SMING_HOME}/Arch/Esp8266/Components/driver",
+                "${ESP_HOME}/xtensa-lx106-elf/include",
+                "${SMING_HOME}/Arch/Esp8266/Components/spi_flash/include",
+                "${SMING_HOME}/Arch/Esp8266/Components/esp_wifi/include",
+                "${SMING_HOME}/Components/FlashString/src/include",
+                "${SMING_HOME}/Libraries/Spiffs/src/include",
+                "${SMING_HOME}/Components/IFS/src/include",
+                "${SMING_HOME}/Libraries/SPI/src",
+                "${SMING_HOME}/Libraries/SPI/src/Arch/Esp8266",
+                "${SMING_HOME}/Components/Network/src",
+                "${SMING_HOME}/Components/ssl/include",
+                "${SMING_HOME}/Components/crypto/include",
+                "${SMING_HOME}/Arch/Esp8266/Components/esp-open-lwip/esp-open-lwip/include",
+                "${SMING_HOME}/Libraries/ArduinoJson6/include",
+                "${SMING_HOME}/Libraries/ArduinoJson6/ArduinoJson/src"
+            ],
+            "defines": [
+                "ARCH_ESP8266=1"
+            ],
+            "compilerPath": "${env:ESP_HOME}/xtensa-lx106-elf/bin/xtensa-lx106-elf-g++.exe",
+            "cStandard": "c11",
+            "cppStandard": "c++17",
+            "intelliSenseMode": "gcc-x86",
+            "compilerArgs": [
+                "-DCOM_SPEED_SERIAL=115200",
+                "-DSERIAL_BAUD_RATE=115200",
+                "-DRBOOT_INTEGRATION",
+                "-DGDBSTUB_GDB_PATCHED=0",
+                "-DSMING_ARCH=Esp8266",
+                "-DSMING_SOC=esp8266",
+                "-DPROJECT_DIR=\\\"/d/Projects/ESP8266/WallSegmentClock\\\"",
+                "-DSMING_HOME=\\\"/C/ESP/Sming/Sming\\\"",
+                "-D${SMING_SOC_VAR}=1",
+                "-DDEBUG_PRINT_FILENAME_AND_LINE=0",
+                "-DCUST_FILE_BASE=${subst",
+                "/C/ESP/Sming/Sming/,,$<}",
+                "-DDEBUG_VERBOSE_LEVEL=2",
+                "-DSTRING_OBJECT_SIZE=12",
+                "-DUSE_US_TIMER",
+                "-DHTTP_SERVER_EXPOSE_NAME=1",
+                "-DHTTP_SERVER_EXPOSE_VERSION=0"
+            ]
         }
     ],
     "version": 4

.vscode/launch.json

@@ -44,7 +44,7 @@
             "externalConsole": true,
             "MIMode": "gdb",
             "miDebuggerPath": "${env:ESP_HOME}/xtensa-lx106-elf/bin/xtensa-lx106-elf-gdb.exe",
-            "miDebuggerServerAddress": "COM3",
+            "miDebuggerServerAddress": "COM5",
             "miDebuggerArgs": "-x ${env:SMING_HOME}/Arch/Esp8266/Components/gdbstub/gdbcmds -b 115200"
         }
     ]

app/webserver.cpp

@@ -14,12 +14,12 @@ void onIndex(HttpRequest& request, HttpResponse& response)
 	TemplateFileStream* tmpl = new TemplateFileStream("index.html");
 	auto& vars = tmpl->variables();
 
-  vars["T"] = String(SensorT, 0);
-  vars["RH"] = String(SensorH, 0);
+  vars["T"] = String(SensorT, 1);
+  vars["RH"] = String(SensorH, 1);
   vars["HI"] = String(SensorHI, 0);
   vars["CR"] = String(SensorCR, 0);
   vars["CF"] = StrCF; // это первое место, где оно используется
-  vars["LUX"] = String(SensorLux, 0);
+  vars["LUX"] = String((float)SensorLux/1000, 3);
   vars["VDD"] = String(system_get_vdd33 ());
   vars["LASTNTP"] = String (SystemClock.now () - NTPLastUpdate);
 

component.mk

@@ -1,3 +1,7 @@
-ARDUINO_LIBRARIES := LiquidCrystal DHTesp ArduinoJson6
-HWCONFIG := spiffs-2m
-SPIFF_FILES = web
+ARDUINO_LIBRARIES := ArduinoJson6
+HWCONFIG := standard-4m
+HWCONFIG_OPTS := spiffs
+SPIFF_FILES := web
+COM_PORT := COM5
+SMING_RELEASE := 1
+SMING_ARCH := Esp8266

include/configuration.h

@@ -25,9 +25,9 @@ struct ClockConfig {
     AddTZ = 3;
     LightTrhLow = 341;
     LightTrhHigh = 683;
-    BrightnessLow = 0;
-    BrightnessMiddle = 3;
-    BrightnessHigh = 7;
+    BrightnessLow = LedBrightMin;
+    BrightnessMiddle = LedBrightMiddl;
+    BrightnessHigh = LedBrightMax;
   }
 
   String NetworkSSID;

make.cmd

@@ -1,9 +1,10 @@
 @echo off
 
-SET ESP_HOME=C:\ESP\esp-quick-toolchain
+SET ESP_HOME=C:\ESP
 SET SMING_HOME=C:\ESP\Sming\Sming
-rem SET PYTHON=C:\Python310-32\python.exe
+SET MSYSROOT=C:/ESP/MinGW/msys/1.0
+rem SET PYTHON=C:\Python312\python.exe
 
-SET PATH=C:\ESP\MinGW\bin;C:\ESP\MinGW\msys\1.0\bin;%PATH%
+SET PATH=C:\ESP\tools;C:\ESP\MinGW\bin;C:\ESP\MinGW\msys\1.0\bin;%PATH%
 
 make.exe %*

sming.code-workspace

@@ -23,6 +23,12 @@
                     "*.fwfs"
                 ],
                 "url": "file:///C/ESP/Sming/Sming/Components/IFS/fsbuild/schema.json"
+            },
+            {
+                "fileMatch": [
+                    "*.usbcfg"
+                ],
+                "url": "file:///C/ESP/Sming/Sming/Libraries/USB/schema.json"
             }
         ]
     }

web/config.html

@@ -80,16 +80,16 @@
 						</div>
 
 						<div class="form-group">
-						<label>Brightness Low level, 0 &mdash; 15</label>
-						<input type="number" min="0" max="15" name="BLow" class="form-control" value="{BLow}">
+						<label>Brightness Low level, 0 &mdash; 7</label>
+						<input type="number" min="0" max="7" name="BLow" class="form-control" value="{BLow}">
 						</div>
 						<div class="form-group">
-						<label>Brightness Middle level, 0 &mdash; 15</label>
-						<input type="number" min="0" max="15" name="BMid" class="form-control" value="{BMid}">
+						<label>Brightness Middle level, 0 &mdash; 7</label>
+						<input type="number" min="0" max="7" name="BMid" class="form-control" value="{BMid}">
 						</div>
 						<div class="form-group">
-						<label>Brightness High level, 0 &mdash; 14</label>
-						<input type="number" min="0" max="15" name="BHigh" class="form-control" value="{BHigh}">
+						<label>Brightness High level, 0 &mdash; 7</label>
+						<input type="number" min="0" max="7" name="BHigh" class="form-control" value="{BHigh}">
 						</div>
 
 						<div class="form-group">