Paciente8159 · Paciente8159 · Aug 21, 2025 · Aug 21, 2025 · Aug 21, 2025 · Aug 22, 2025
diff --git a/data/index.html.gz b/data/index.html.gz
diff --git a/makefiles/virtual/mcu_virtual.cpp b/makefiles/virtual/mcu_virtual.cpp
@@ -1184,6 +1184,11 @@ extern "C"
 		return false;
 	}
 
+	/**
+	 * OTA emulation
+	 */
+	void ota_server_start(void);
+
 	/**
 	 * Initialize the MCU
 	 * **/

diff --git a/makefiles/virtual/uCNC-emulator.dev b/makefiles/virtual/uCNC-emulator.dev
@@ -9,8 +9,8 @@ Libs=C:\Users\jcmartins\Downloads\GitHub\uCNC\uCNC;C:\Users\JCEM\Documents\GitHu
 PrivateResource=
 ResourceIncludes=C:\Users\jcmartins\Downloads\GitHub\uCNC\uCNC;C:\Users\JCEM\Documents\GitHub\uCNC\uCNC
 MakeIncludes=
-Compiler=-DMCU=MCU_VIRTUAL_WIN_@@_
-CppCompiler=-DMCU=MCU_VIRTUAL_WIN_@@_
+Compiler=-DMCU=MCU_VIRTUAL_WIN_@@_-DBOARD=BOARD_CUSTOM_@@_
+CppCompiler=-DMCU=MCU_VIRTUAL_WIN_@@_-DBOARD=BOARD_CUSTOM_@@_
 Linker=-lws2_32_@@_
 IsCpp=1
 Icon=
@@ -29,7 +29,7 @@ IncludeVersionInfo=0
 SupportXPThemes=0
 CompilerSet=1
 CompilerSettings=000000e0g0000000001000000
-UnitCount=99
+UnitCount=111
 
 [VersionInfo]
 Major=1
@@ -871,7 +871,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit96]
-FileName=..\..\uCNC\src\hal\tools\tools\embroidery_stepper.c
+FileName=..\..\uCNC\src\buffer.c
 CompileCpp=1
 Folder=
 Compile=1
@@ -971,7 +971,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit97]
-FileName=..\..\uCNC\src\buffer.c
+FileName=..\..\uCNC\src\atomic.h
 CompileCpp=1
 Folder=
 Compile=1
@@ -981,7 +981,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit98]
-FileName=..\..\uCNC\src\atomic.h
+FileName=..\..\uCNC\src\buffer.h
 CompileCpp=1
 Folder=
 Compile=1
@@ -991,7 +991,7 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit99]
-FileName=..\..\uCNC\src\buffer.h
+FileName=..\..\uCNC\src\modules\net\http.c
 CompileCpp=1
 Folder=
 Compile=1
@@ -1041,7 +1041,117 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit100]
-FileName=..\..\uCNC\src\modules\atc\atc.c
+FileName=..\..\uCNC\src\modules\net\http.h
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit101]
+FileName=..\..\uCNC\src\modules\net\socket.c
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit102]
+FileName=..\..\uCNC\src\modules\net\socket.h
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit103]
+FileName=..\..\uCNC\src\modules\net\telnet.c
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit104]
+FileName=..\..\uCNC\src\modules\net\telnet.h
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit105]
+FileName=..\..\uCNC\src\modules\net\websocket.c
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit106]
+FileName=..\..\uCNC\src\modules\net\websocket.h
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit107]
+FileName=..\..\uCNC\src\modules\net\utils\base64.h
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit108]
+FileName=..\..\uCNC\src\modules\net\utils\bsd_socket.h
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit109]
+FileName=..\..\uCNC\src\modules\net\utils\http_request.c
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit110]
+FileName=..\..\uCNC\src\modules\net\utils\http_request.h
+CompileCpp=1
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+
+[Unit111]
+FileName=..\..\uCNC\src\modules\net\utils\sha1.h
 CompileCpp=1
 Folder=
 Compile=1

diff --git a/uCNC/cnc_config.h b/uCNC/cnc_config.h
@@ -35,8 +35,8 @@ extern "C"
 #define BAUDRATE 115200
 #endif
 
-#ifndef ENABLE_WIFI
-// #define ENABLE_WIFI
+#ifndef ENABLE_SOCKETS
+// #define ENABLE_SOCKETS
 #endif
 
 #ifndef ENABLE_BLUETOOTH

diff --git a/uCNC/src/cnc.c b/uCNC/src/cnc.c
@@ -1119,6 +1119,10 @@ static void cnc_io_dotasks(void)
 		}
 	}
 #endif
+
+#if defined(ENABLE_SOCKETS) && !defined(MCU_HAS_RTOS)
+	socket_server_dotasks();
+#endif
 }
 
 #ifdef ENABLE_MULTILINE_STARTUP_BLOCKS

diff --git a/uCNC/src/cnc.h b/uCNC/src/cnc.h
@@ -149,6 +149,10 @@ extern "C"
 #include "core/planner.h"
 #include "core/interpolator.h"
 #include "modules/encoder.h"
+#ifdef ENABLE_SOCKETS
+#include "modules/net/socket.h"
+#include "modules/net/telnet.h"
+#endif
 
 	/**
 	 *

diff --git a/uCNC/src/hal/boards/esp8266/boardmap_wemos_d1.h b/uCNC/src/hal/boards/esp8266/boardmap_wemos_d1.h
@@ -32,9 +32,6 @@ extern "C"
 #define BOARD_NAME "WEMOS D1"
 #endif
 
-#undef ENABLE_WIFI
-#define ENABLE_WIFI
-
 // SAME AS GRBL for test purposes
 // Setup step pins
 #define STEP2_BIT 4	 // assigns STEP2 pin

diff --git a/uCNC/src/hal/boards/esp8266/esp8266.ini b/uCNC/src/hal/boards/esp8266/esp8266.ini
@@ -7,17 +7,19 @@ platform = espressif8266
 board = d1
 lib_deps = 
     ${env.lib_deps}
-    SPI
-    EEPROM
+		; https://github.com/littlefs-project/littlefs/archive/refs/tags/v2.11.1.zip
+    ; SPI
+    ; EEPROM
     ESP8266WiFi
-    ESP8266WebServer
-    ESP8266HTTPUpdateServer
+    ; ESP8266WebServer
+    ; ESP8266HTTPUpdateServer
     LittleFS
-    Hash
-    https://github.com/Links2004/arduinoWebSockets/archive/refs/heads/master.zip
-build_flags = ${env.build_flags} -D BOARDMAP=\"src/hal/boards/esp8266/boardmap_wemos_d1.h\" -D ENABLE_WIFI
-;build_type=debug
-;monitor_filters = esp8266_exception_decoder
+    ; Hash
+    ; https://github.com/Links2004/arduinoWebSockets/archive/refs/heads/master.zip
+
+build_flags = ${env.build_flags} -D BOARDMAP=\"src/hal/boards/esp8266/boardmap_wemos_d1.h\" -D ENABLE_SOCKETS
+; build_type=debug
+; monitor_filters = esp8266_exception_decoder
 upload_speed = 256000
 board_build.f_flash = 80000000L
 board_build.f_cpu = 160000000L

diff --git a/uCNC/src/hal/boards/rp2040/rp2040.ini b/uCNC/src/hal/boards/rp2040/rp2040.ini
@@ -17,9 +17,15 @@ board_build.f_cpu = 133000000L
 build_flags = ${env.build_flags} -std=gnu99 -Wall -fdata-sections -ffunction-sections -fno-exceptions -Wl,--gc-sections
 debug_tool = cmsis-dap
 lib_deps = 
-    ${env.lib_deps}
+     ${env.lib_deps}
 	SPI	
 	Wire
+	EEPROM
+
+[common_rp2040w]
+extends = common_rp2040
+lib_deps = 
+    ${common_rp2040.lib_deps}
 	Wifi
 	WebServer
 	HTTPUpdatedServer
@@ -28,39 +34,25 @@ lib_deps =
 	DNSServer
 	SerialBT
 	LittleFS
-	EEPROM
 	https://github.com/Links2004/arduinoWebSockets/archive/refs/heads/master.zip
-
+	
 [env:RP2040-PICO]
 extends = common_rp2040
 board = rpipico
 build_flags = ${common_rp2040.build_flags} -D BOARDMAP=\"src/hal/boards/rp2040/boardmap_rpi_pico.h\"
-lib_deps = 
-    ${env.lib_deps}
-	SPI	
-	Wire
-	EEPROM
-lib_ignore = 
-	HTTPUpdateServer
-	LittleFS
-	WiFi
-	WebServer
-	SerialBT
-	DNSServer
-	Hash
-	BluetoothSerial
+lib_ignore = SerialBT
 
 [env:RP2040-PICO-W]
-extends = common_rp2040
+extends = common_rp2040w
 board = rpipicow
 build_flags = -D BOARDMAP=\"src/hal/boards/rp2040/boardmap_rpi_pico_w.h\" -D ENABLE_WIFI -D ENABLE_BLUETOOTH -D PIO_FRAMEWORK_ARDUINO_ENABLE_BLUETOOTH
 
 [env:RP2040-PICO-W-MULTICORE]
-extends = common_rp2040
+extends = common_rp2040w
 board = rpipicow
 build_flags = -D BOARDMAP=\"src/hal/boards/rp2040/boardmap_rpi_pico_w.h\" -D ENABLE_WIFI -D ENABLE_BLUETOOTH -D PIO_FRAMEWORK_ARDUINO_ENABLE_BLUETOOTH -DRP2040_RUN_MULTICORE
 
 [env:RP2040-CUSTOM]
-extends = common_rp2040
-build_flags = ${common_rp2040.build_flags} -DMCU=MCU_CUSTOM
+extends = common_rp2040w
+build_flags = ${common_rp2040w.build_flags} -DMCU=MCU_CUSTOM
 board = ${env.board}
diff --git a/uCNC/src/hal/boards/rp2350/rp2350.ini b/uCNC/src/hal/boards/rp2350/rp2350.ini
@@ -22,7 +22,6 @@ lib_deps =
 		EEPROM
 lib_ignore = 
 		HTTPUpdateServer
-		LittleFS
 		WiFi
 		WebServer
 		SerialBT

diff --git a/uCNC/src/hal/mcus/README.md b/uCNC/src/hal/mcus/README.md
@@ -926,14 +926,14 @@ Before creating a custom HAL for a custom board/microcontroller the microcontrol
 #endif
 #endif
 
-#ifdef MCU_HAS_WIFI
-	uint8_t mcu_wifi_getc(void);
-	uint8_t mcu_wifi_available(void);
-	void mcu_wifi_clear(void);
-	void mcu_wifi_putc(uint8_t c);
-	void mcu_wifi_flush(void);
-#ifdef DETACH_WIFI_FROM_MAIN_PROTOCOL
-	MCU_RX_CALLBACK void mcu_wifi_rx_cb(uint8_t c);
+#ifdef ENABLE_SOCKETS
+	uint8_t mcu_telnet_getc(void);
+	uint8_t mcu_telnet_available(void);
+	void mcu_telnet_clear(void);
+	void mcu_telnet_putc(uint8_t c);
+	void mcu_telnet_flush(void);
+#ifdef DETACH_TELNET_FROM_MAIN_PROTOCOL
+	MCU_RX_CALLBACK void mcu_telnet_rx_cb(uint8_t c);
 #endif
 #endif
 

diff --git a/uCNC/src/hal/mcus/esp32/esp32_bt.cpp b/uCNC/src/hal/mcus/esp32/esp32_bt.cpp
@@ -18,7 +18,11 @@
 */
 
 #include "../../../../cnc_config.h"
+
+#ifdef ESP32
 #include <Arduino.h>
+#endif
+
 #if CONFIG_IDF_TARGET_ESP32 && defined(ENABLE_BLUETOOTH)
 #include "esp_task_wdt.h"
 #include <stdint.h>
-Original file line number
+Diff line change
@@ Expand Up / @@ -1119,6 +1119,10 @@ static void cnc_io_dotasks(void) @@
     		}
     	}
     #endif
+    #if defined(ENABLE_SOCKETS) && !defined(MCU_HAS_RTOS)
+    	socket_server_dotasks();
+    #endif
     }
     #ifdef ENABLE_MULTILINE_STARTUP_BLOCKS
@@ Expand Down @@