windows and linux emulator changes

Author: Paciente8159

uCNC/src/hal/mcus/virtual/mcu_virtual.c

@@ -353,7 +353,7 @@ extern "C"
 #endif
 
 #if defined(MCU_HAS_ONESHOT_TIMER)
-	MCU_CALLBACK mcu_timeout_delgate mcu_timeout_cb = NULL;
+	extern MCU_CALLBACK mcu_timeout_delgate mcu_timeout_cb;
 	static uint32_t virtual_oneshot_counter;
 	static FORCEINLINE void mcu_gen_oneshot(void)
 	{

uCNC/src/hal/mcus/virtual/mcu_virtual.dev

@@ -29,7 +29,7 @@ IncludeVersionInfo=0
 SupportXPThemes=0
 CompilerSet=1
 CompilerSettings=10000000a0000000001000000
-UnitCount=114
+UnitCount=115
 
 [VersionInfo]
 Major=1
@@ -1190,3 +1190,13 @@ Priority=1000
 OverrideBuildCmd=0
 BuildCmd=
 
+[Unit115]
+FileName=virtual_windows.c
+CompileCpp=0
+Folder=
+Compile=1
+Link=1
+Priority=1000
+OverrideBuildCmd=0
+BuildCmd=
+

uCNC/src/hal/mcus/virtual/mcumap_virtual.h

@@ -39,6 +39,7 @@
 #define MCU_WEAK __attribute__((weak, weakref))
 
 /* 7.18.2.1  Limits of exact-width integer types */
+#ifndef INT8_MIN
 #define INT8_MIN (-128)
 #define INT16_MIN (-32768)
 #define INT32_MIN (-2147483647 - 1)
@@ -53,6 +54,7 @@
 #define UINT16_MAX 65535
 #define UINT32_MAX 0xffffffffU			 /* 4294967295U */
 #define UINT64_MAX 0xffffffffffffffffULL /* 18446744073709551615ULL */
+#endif
 
 // needed by software delays
 #ifndef MCU_CLOCKS_PER_CYCLE
@@ -65,9 +67,13 @@
 #define MCU_CYCLES_PER_LOOP_OVERHEAD 0
 #endif
 
-#define MCU_HAS_UART
+// #define MCU_HAS_UART
 #ifndef UART_PORT_NAME
+#ifndef __unix__
 #define UART_PORT_NAME "\\\\.\\COM14"
+#else
+#define UART_PORT_NAME "/dev/ttyS0"
+#endif
 #endif
 
 #define MCU_HAS_UART2
@@ -520,4 +526,10 @@ extern const tool_t vfd_pwm;
 
 #define asm __asm__
 
+// #ifdef __unix__
+// // #ifndef sqrtf
+// // #define sqrtf sqrt
+// // #endif
+// #endif
+
 #endif

uCNC/src/hal/mcus/virtual/virtual.ini

@@ -24,18 +24,31 @@ extra_scripts = uCNC/src/hal/mcus/virtual/win_compiler.py
 [env:EMULATOR_LINUX]
 platform = native
 framework =
-platform_packages = platformio/linux_x86_64
-; build_src_filter = 
-;   +<*>
+; platform_packages = platformio/linux_x86_64@^1.2.0
+build_src_filter = 
+  +<*>
+  -<src/hal/mcus/avr>
+  -<src/hal/mcus/esp32>
+  -<src/hal/mcus/esp32c3>
+  -<src/hal/mcus/esp32s3>
+  -<src/hal/mcus/esp32common>
+  -<src/hal/mcus/esp8266>
+  -<src/hal/mcus/lpc176x>
+  -<src/hal/mcus/rp2040>
+  -<src/hal/mcus/rp2350>
+  -<src/hal/mcus/stm32f0x>
+  -<src/hal/mcus/stm32f1x>
+  -<src/hal/mcus/stm32f4x>
+  -<src/hal/mcus/stm32h7x>
 ;   +<../makefiles/virtual/>
 ;   -<src/tinyusb>
-;   -<src/hal/mcus/avr>
+  ; -<src/hal/mcus/avr>
 ;   -<../makefiles/virtual/clib>
 debug_tool = native
 build_type = debug
 debug_build_flags = -Og -g3
 debug_init_cmds =
   run
-build_flags = ${env.build_flags} -std=gnu99 -Wall -fdata-sections -ffunction-sections -fno-exceptions -Wl,--gc-sections -D MCU=MCU_VIRTUAL_LINUX -D BOARD=BOARD_CUSTOM -g -O0
+build_flags = ${env.build_flags} -std=gnu99 -Wall -fdata-sections -ffunction-sections -fno-exceptions -Wl,--gc-sections -D MCU=MCU_VIRTUAL_LINUX -D BOARD=BOARD_CUSTOM -lm -g -O0
 ; -D WIN_COM_NAME=COM1 -D SOCKET_PORT=34000 -lws2_32
 ; extra_scripts = uCNC/src/hal/mcus/virtual/win_compiler.py

uCNC/src/hal/mcus/virtual/virtual_linux.c

@@ -66,7 +66,6 @@ typedef struct serial_port_
 serial_port_t g_uart = {0};
 
 /* Forward declarations for callbacks referenced in ioserver code */
-extern VIRTUAL_MAP virtualmap;
 extern void mcu_limits_changed_cb(void);
 extern void mcu_probe_changed_cb(void);
 extern void mcu_controls_changed_cb(void);
@@ -267,7 +266,7 @@ void *ioserver(void *args)
     /* Ensure old socket removed */
     unlink(UCNCCIO_SOCKET_PATH);
 
-    server_fd = socket(AF_UNIX, SOCK_STREAM, 0);
+    server_fd = socket(AF_UNIX, 1, 0);
     if (server_fd < 0)
     {
         perror("Create socket failed");
@@ -638,7 +637,7 @@ void get_current_dir(char *cwd, size_t len)
 
 #if defined(ENABLE_SOCKETS)
 
-typedef int socklen_t;
+// typedef int socklen_t;
 
 /* socket_init: nothing to do on Linux; return 0 on success */
 int socket_init(void)

uCNC/src/modules/net/socket.c

@@ -273,10 +273,10 @@ void socket_server_dotasks(void)
 			{
 				remove_client(socket, c);
 			}
-			else if (errno != EAGAIN && errno != EWOULDBLOCK)
-			{
-				remove_client(socket, c);
-			}
+//			else if (errno != EAGAIN && errno != EWOULDBLOCK)
+//			{
+//				remove_client(socket, c);
+//			}
 			else
 			{
 				if (socket->client_onidle_cb)