From 01f6be0cb03e642395aa207acdede752c501192e Mon Sep 17 00:00:00 2001 From: bdring Date: Wed, 19 May 2021 11:36:20 -0500 Subject: [PATCH] WIP...probe and coolant --- Grbl_Esp32/data/config.yaml | 5 ++- Grbl_Esp32/src/CoolantControl.cpp | 6 ++-- platformio.ini | 53 ++++++++++++++++++------------- 3 files changed, 39 insertions(+), 25 deletions(-) diff --git a/Grbl_Esp32/data/config.yaml b/Grbl_Esp32/data/config.yaml index def66afa..d0109c16 100644 --- a/Grbl_Esp32/data/config.yaml +++ b/Grbl_Esp32/data/config.yaml @@ -5,4 +5,7 @@ axes: number_axis: 3 coolant: - flood: gpio.2 + flood: gpio.26:low + +probe: + pin: gpio.12 diff --git a/Grbl_Esp32/src/CoolantControl.cpp b/Grbl_Esp32/src/CoolantControl.cpp index 3943d690..9496632b 100644 --- a/Grbl_Esp32/src/CoolantControl.cpp +++ b/Grbl_Esp32/src/CoolantControl.cpp @@ -28,8 +28,10 @@ void CoolantControl::init() { static bool init_message = true; // used to show messages only once. if (init_message) { - grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, "Flood coolant on pin %s", flood_.name().c_str()); - grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, "Mist coolant on pin %s", mist_.name().c_str()); + if (!flood_.undefined()) + grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, "Flood coolant on pin %s", flood_.name().c_str()); + if (!mist_.undefined()) + grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, "Mist coolant on pin %s", mist_.name().c_str()); init_message = false; } diff --git a/platformio.ini b/platformio.ini index cc2807df..8e85cd1e 100644 --- a/platformio.ini +++ b/platformio.ini @@ -1,14 +1,22 @@ +; PlatformIO Project Configuration File +; +; Build options: build flags, source filter +; Upload options: custom upload port, speed and extra flags +; Library options: dependencies, extra library storages +; Advanced options: extra scripting +; +; Please visit documentation for the other options and examples +; https://docs.platformio.org/page/projectconf.html + [platformio] -src_dir=Grbl_Esp32 -lib_dir=libraries -test_dir=Grbl_Esp32/test -data_dir=Grbl_Esp32/data -default_envs=release +src_dir = Grbl_Esp32 +lib_dir = libraries +data_dir = Grbl_Esp32/data +default_envs = release ;extra_configs=debug.ini -build_dir = Firmware [common_env_data] -lib_deps_builtin = +lib_deps_builtin = ArduinoOTA BluetoothSerial DNSServer @@ -25,40 +33,41 @@ lib_deps_builtin = WiFiClientSecure [common] -build_flags = - ;-DMACHINE_FILENAME=test_drive.h ;Remove ";" from the beginning of this line and specify the machine file +build_flags = + ;-DMACHINE_FILENAME=test_drive.h ;Remove ";" from the beginning of this line and specify the machine file -DCORE_DEBUG_LEVEL=0 -Wno-unused-variable -Wno-unused-function - [env] -lib_deps = - TMCStepper@>=0.7.0,<1.0.0 -platform = espressif32 +;lib_deps = +; TMCStepper@>=0.7.0,<1.0.0 +platform = espressif32@3.0.0 ; temporary fix for lost uart rx characters board = esp32dev framework = arduino upload_speed = 921600 board_build.partitions = min_spiffs.csv monitor_speed = 115200 -monitor_flags = +monitor_flags = --eol=CRLF --echo --filter=esp32_exception_decoder board_build.f_cpu = 240000000L -; set frequency to 80MHz board_build.f_flash = 80000000L board_build.flash_mode = qio build_flags = ${common.build_flags} -src_filter = - +<*.h> +<*.s> +<*.S> +<*.cpp> +<*.c> +<*.ino> + - -<.git/> - - - - +src_filter = + +<*.h> +<*.s> +<*.S> +<*.cpp> +<*.c> +<*.ino> + + -<.git/> - - - [env:release] +lib_deps = + TMCStepper@>=0.7.0,<1.0.0 + ESP8266 and ESP32 OLED driver for SSD1306 displays@^4.2.0 [env:debug] build_type = debug - -[env:test] -build_type = debug -test_build_project_src = true \ No newline at end of file +lib_deps = + TMCStepper@>=0.7.0,<1.0.0 + ESP8266 and ESP32 OLED driver for SSD1306 displays@^4.2.0 + \ No newline at end of file