Skip to content

Commit

Permalink
Updated for plugin changes.
Browse files Browse the repository at this point in the history
  • Loading branch information
terjeio committed Feb 25, 2025
1 parent 13f89c7 commit d7cc164
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 9 deletions.
21 changes: 14 additions & 7 deletions driver.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,20 @@
#endif
#endif

#if defined(WEBUI_ENABLE) && WEBUI_ENABLE
#ifndef WEBUI_INFLASH
#define WEBUI_INFLASH 1
#endif
#if WEBUI_INFLASH
#if defined(LITTLEFS_ENABLE) && LITTLEFS_ENABLE == 0
#undef LITTLEFS_ENABLE
#endif
#ifndef LITTLEFS_ENABLE
#define LITTLEFS_ENABLE 1
#endif
#endif
#endif

#include "grbl/driver_opts.h"

#if ETHERNET_ENABLE && WIFI_ENABLE
Expand Down Expand Up @@ -127,13 +141,6 @@
#define PPI_TIMER_IRQHandler timerHANDLER(PPI_TIMER_N)
*/

#if WEBUI_ENABLE && LITTLEFS_ENABLE
#ifdef WEBUI_INFLASH
#undef WEBUI_INFLASH
#endif
#define WEBUI_INFLASH 1
#endif

#ifdef BOARD_CNC_BOOSTERPACK
#include "cnc_boosterpack_map.h"
#elif defined(BOARD_PICO_CNC)
Expand Down
4 changes: 2 additions & 2 deletions my_machine.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Part of grblHAL
Copyright (c) 2021-2024 Terje Io
Copyright (c) 2021-2025 Terje Io
grblHAL is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -61,7 +61,7 @@
// Uncomment to enable W5500 chip, default is W5100S. Requires ethernet enabled in CMakeLists.txt.
//#define WEBUI_ENABLE 3 // Enable ESP3D-WEBUI plugin along with networking and SD card plugins. Requires WiFi enabled.
//#define WEBUI_AUTH_ENABLE 1 // Enable ESP3D-WEBUI authentication.
//#define WEBUI_INFLASH 1 // Store WebUI files in flash instead of on SD card.
//#define WEBUI_INFLASH 0 // Uncomment to store WebUI files on SD card instead of in flash (littlefs).
//#define SDCARD_ENABLE 2 // Run gcode programs from SD card. Set to 2 to enable YModem upload.
//#define MPG_ENABLE 1 // Enable MPG interface. Requires a serial stream and means to switch between normal and MPG mode.
// 1: Mode switching is by handshake pin.
Expand Down

0 comments on commit d7cc164

Please sign in to comment.