diff --git a/.vscode/launch.json b/.vscode/launch.json index 41e852ac..87b3124a 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -12,22 +12,22 @@ "type": "platformio-debug", "request": "launch", "name": "PIO Debug", - "executable": "c:/Repo/GRBLHAL_Expatria/Etherhal_work/STM32F4xx/.pio/build/f446re_flexi_cnc_ygang_eth_sd_prb_4x/firmware.elf", - "projectEnvName": "f446re_flexi_cnc_ygang_eth_sd_prb_4x", + "executable": "c:/Repo/GRBLHAL_Expatria/Etherhal_work/STM32F4xx/.pio/build/f446re_flexi_cnc_xgang_eth_sd_prb/firmware.elf", + "projectEnvName": "f446re_flexi_cnc_xgang_eth_sd_prb", "toolchainBinDir": "C:/Users/andrew/.platformio/packages/toolchain-gccarmnoneeabi@1.70201.0/bin", "internalConsoleOptions": "openOnSessionStart", "svdPath": "C:/Users/andrew/.platformio/platforms/ststm32/misc/svd/STM32F446x.svd", "preLaunchTask": { "type": "PlatformIO", - "task": "Pre-Debug" + "task": "Pre-Debug (f446re_flexi_cnc_xgang_eth_sd_prb)" } }, { "type": "platformio-debug", "request": "launch", "name": "PIO Debug (skip Pre-Debug)", - "executable": "c:/Repo/GRBLHAL_Expatria/Etherhal_work/STM32F4xx/.pio/build/f446re_flexi_cnc_ygang_eth_sd_prb_4x/firmware.elf", - "projectEnvName": "f446re_flexi_cnc_ygang_eth_sd_prb_4x", + "executable": "c:/Repo/GRBLHAL_Expatria/Etherhal_work/STM32F4xx/.pio/build/f446re_flexi_cnc_xgang_eth_sd_prb/firmware.elf", + "projectEnvName": "f446re_flexi_cnc_xgang_eth_sd_prb", "toolchainBinDir": "C:/Users/andrew/.platformio/packages/toolchain-gccarmnoneeabi@1.70201.0/bin", "internalConsoleOptions": "openOnSessionStart", "svdPath": "C:/Users/andrew/.platformio/platforms/ststm32/misc/svd/STM32F446x.svd" @@ -36,8 +36,8 @@ "type": "platformio-debug", "request": "launch", "name": "PIO Debug (without uploading)", - "executable": "c:/Repo/GRBLHAL_Expatria/Etherhal_work/STM32F4xx/.pio/build/f446re_flexi_cnc_ygang_eth_sd_prb_4x/firmware.elf", - "projectEnvName": "f446re_flexi_cnc_ygang_eth_sd_prb_4x", + "executable": "c:/Repo/GRBLHAL_Expatria/Etherhal_work/STM32F4xx/.pio/build/f446re_flexi_cnc_xgang_eth_sd_prb/firmware.elf", + "projectEnvName": "f446re_flexi_cnc_xgang_eth_sd_prb", "toolchainBinDir": "C:/Users/andrew/.platformio/packages/toolchain-gccarmnoneeabi@1.70201.0/bin", "internalConsoleOptions": "openOnSessionStart", "svdPath": "C:/Users/andrew/.platformio/platforms/ststm32/misc/svd/STM32F446x.svd", diff --git a/grbl b/grbl index c5a834f7..f4d34ac6 160000 --- a/grbl +++ b/grbl @@ -1 +1 @@ -Subproject commit c5a834f78ab9fd818562fbeae8d640da4c08f3fd +Subproject commit f4d34ac647bcc5939487f428556e53335d9a5e11 diff --git a/platformio.ini b/platformio.ini index 9b25d082..12403182 100644 --- a/platformio.ini +++ b/platformio.ini @@ -91,6 +91,7 @@ build_flags = -D DEFAULT_CONTROL_SIGNALS_INVERT_MASK=79 -D DEFAULT_DOOR_IGNORE_WHEN_IDLE=1 #-D DEFAULT_DOOR_KEEP_COOLANT_ON=1 + -D DEFAULT_JOG_LIMIT_ENABLE=1 #Uncomment below if enabling http/webdav #-D LWIP_HTTPD_SUPPORT_POST=1 @@ -393,6 +394,27 @@ lib_deps = ${common.lib_deps} eeprom lib_extra_dirs = ${common.lib_extra_dirs} +[env:f446re_flexi_cnc_xgang_eth_sd_prb] +board = genericSTM32F446RE +custom_prog_version = XGANG_ETH_SD_PRB +; change microcontroller +#board_build.mcu = stm32f446ret6 +#board_build.ldscript = FLEXI_STM32F446RETX_BL_FLASH.ld +build_flags = ${common.build_flags} + # See Inc/my_machine.h for options + -D VFD_ENABLE=-1 + -D MODBUS_ENABLE=1 + -D N_SPINDLE=12 + -D SDCARD_ENABLE=2 + -D _WIZCHIP_=5500 + -D KEYPAD_ENABLE=1 + -D X_GANGED=1 + -D X_AUTO_SQUARE=1 + -D PROBE_PROTECT_ENABLE=1 +lib_deps = ${common.lib_deps} + eeprom +lib_extra_dirs = ${common.lib_extra_dirs} + [env:f446re_flexi_cnc_eth_sd_emb] board = genericSTM32F446RE custom_prog_version = ETH_SD_EMB