diff --git a/uCNC/src/hal/boards/esp8266/esp8266.ini b/uCNC/src/hal/boards/esp8266/esp8266.ini index 7f3af7bcf..8d9cca9b6 100644 --- a/uCNC/src/hal/boards/esp8266/esp8266.ini +++ b/uCNC/src/hal/boards/esp8266/esp8266.ini @@ -6,7 +6,7 @@ platform = espressif8266 framework = arduino board = d1 -; build_src_filter = +<*>- +build_src_filter = +<*>- ; lib_deps = ; https://github.com/tzapu/WiFiManager/archive/refs/heads/master.zip build_flags = -DBOARD=BOARD_WEMOS_D1 -DENABLE_WIFI diff --git a/uCNC/src/hal/mcus/virtual/mcu_virtual.cpp b/uCNC/src/hal/mcus/virtual/mcu_virtual.cpp index 23e71e30e..828ddfd32 100644 --- a/uCNC/src/hal/mcus/virtual/mcu_virtual.cpp +++ b/uCNC/src/hal/mcus/virtual/mcu_virtual.cpp @@ -15,11 +15,13 @@ Also without the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. */ +#include "../../../cnc.h" +#if (BOARD == BOARD_VIRTUAL) +#ifdef __cplusplus extern "C" { -#include "../../../cnc.h" -#if (MCU == MCU_VIRTUAL_WIN) +#endif #include #include @@ -325,7 +327,7 @@ extern "C" static volatile VIRTUAL_MAP virtualmap; - void* ioserver(void *args) + void *ioserver(void *args) { HANDLE hPipe; TCHAR chBuf[sizeof(VIRTUAL_MAP)]; @@ -800,6 +802,7 @@ extern "C" } return 0; } - -#endif +#ifdef __cplusplus } +#endif +#endif