mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-08-29 17:19:50 +02:00
Code Issues Releases Wiki Activity

Add coolant pin messages to startup (#647)

Browse Source 
* Add coolant pin messages to startup

Help with user support.

* Removing incorrect STEPPER_RESET definition

* Fix laser mode startup message

* cleanup

- coolant_init() will behave as before
- update build date
- return default machine to test_drive
This commit is contained in:
bdring
2020-10-22 19:19:56 -05:00
committed by GitHub
parent b72cd4c727
commit 8c01797c3b
7 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Grbl_Esp32/src/CoolantControl.cpp
View File

@@ -24,12 +24,25 @@
#include "Grbl.h" #include "Grbl.h"
void coolant_init() { void coolant_init() {
static bool init_message = true; // used to show messages only once.
#ifdef COOLANT_FLOOD_PIN #ifdef COOLANT_FLOOD_PIN
pinMode(COOLANT_FLOOD_PIN, OUTPUT); pinMode(COOLANT_FLOOD_PIN, OUTPUT);
#endif #endif
#ifdef COOLANT_MIST_PIN #ifdef COOLANT_MIST_PIN
pinMode(COOLANT_MIST_PIN, OUTPUT); pinMode(COOLANT_MIST_PIN, OUTPUT);
#endif #endif
if (init_message) {
#ifdef COOLANT_FLOOD_PIN
grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, "Flood coolant on pin %s", pinName(COOLANT_FLOOD_PIN).c_str());
#endif
#ifdef COOLANT_MIST_PIN
grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, "Mist coolant on pin %s", pinName(COOLANT_MIST_PIN).c_str());
#endif
init_message = false;
}
coolant_stop(); coolant_stop();
} }

2
Grbl_Esp32/src/Grbl.h
View File

@@ -23,7 +23,7 @@
// Grbl versioning system // Grbl versioning system
const char* const GRBL_VERSION = "1.3a"; const char* const GRBL_VERSION = "1.3a";
const char* const GRBL_VERSION_BUILD = "20201015"; const char* const GRBL_VERSION_BUILD = "20201022";
//#include <sdkconfig.h> //#include <sdkconfig.h>
#include <Arduino.h> #include <Arduino.h>

2
Grbl_Esp32/src/Machines/6_pack_Lowrider_stepstick_v1.h
View File

@@ -45,8 +45,6 @@
#define X2_STEPPER_MS3 I2SO(14) // A_CS #define X2_STEPPER_MS3 I2SO(14) // A_CS
#define Y2_STEPPER_MS3 I2SO(19) // B_CS #define Y2_STEPPER_MS3 I2SO(19) // B_CS
#define STEPPER_RESET GPIO_NUM_19
// Motor Socket #1 // Motor Socket #1
#define X_DISABLE_PIN I2SO(0) #define X_DISABLE_PIN I2SO(0)
#define X_DIRECTION_PIN I2SO(1) #define X_DIRECTION_PIN I2SO(1)

2
Grbl_Esp32/src/Machines/6_pack_MPCNC_stepstick_v1.h
View File

@@ -45,8 +45,6 @@
#define X2_STEPPER_MS3 I2SO(14) // A_CS #define X2_STEPPER_MS3 I2SO(14) // A_CS
#define Y2_STEPPER_MS3 I2SO(19) // B_CS #define Y2_STEPPER_MS3 I2SO(19) // B_CS
#define STEPPER_RESET GPIO_NUM_19
// Motor Socket #1 // Motor Socket #1
#define X_DISABLE_PIN I2SO(0) #define X_DISABLE_PIN I2SO(0)
#define X_DIRECTION_PIN I2SO(1) #define X_DIRECTION_PIN I2SO(1)

3
Grbl_Esp32/src/Machines/6_pack_stepstick_XYZ_v1.h
View File

@@ -45,8 +45,6 @@
#define Y_STEPPER_MS3 I2SO(6) // Y_CS #define Y_STEPPER_MS3 I2SO(6) // Y_CS
#define Z_STEPPER_MS3 I2SO(11) // Z_CS #define Z_STEPPER_MS3 I2SO(11) // Z_CS
#define STEPPER_RESET GPIO_NUM_19
// Motor Socket #1 // Motor Socket #1
#define X_DISABLE_PIN I2SO(0) #define X_DISABLE_PIN I2SO(0)
#define X_DIRECTION_PIN I2SO(1) #define X_DIRECTION_PIN I2SO(1)
@@ -122,7 +120,6 @@ Socket #5
// #define CONTROL_SAFETY_DOOR_PIN GPIO_NUM_27 // #define CONTROL_SAFETY_DOOR_PIN GPIO_NUM_27
// //#define INVERT_CONTROL_PIN_MASK B0000 // //#define INVERT_CONTROL_PIN_MASK B0000
// ================= Setting Defaults ========================== // ================= Setting Defaults ==========================
#define DEFAULT_X_STEPS_PER_MM 800 #define DEFAULT_X_STEPS_PER_MM 800
#define DEFAULT_Y_STEPS_PER_MM 800 #define DEFAULT_Y_STEPS_PER_MM 800

2
Grbl_Esp32/src/Machines/6_pack_stepstick_v1.h
View File

@@ -47,8 +47,6 @@
#define B_STEPPER_MS3 I2SO(19) // B_CS #define B_STEPPER_MS3 I2SO(19) // B_CS
#define C_STEPPER_MS3 I2SO(22) // C_CS #define C_STEPPER_MS3 I2SO(22) // C_CS
#define STEPPER_RESET GPIO_NUM_19
// Motor Socket #1 // Motor Socket #1
#define X_DISABLE_PIN I2SO(0) #define X_DISABLE_PIN I2SO(0)
#define X_DIRECTION_PIN I2SO(1) #define X_DIRECTION_PIN I2SO(1)

4
Grbl_Esp32/src/Spindles/Laser.cpp
View File

@@ -31,11 +31,11 @@ namespace Spindles {
void Laser::config_message() { void Laser::config_message() {
grbl_msg_sendf(CLIENT_SERIAL, grbl_msg_sendf(CLIENT_SERIAL,
MsgLevel::Info, MsgLevel::Info,
"Laser spindle on Pin:%s, Freq:%.2fHz, Res:%dbits Laser mode:$32=%d", "Laser spindle on Pin:%s, Freq:%dHz, Res:%dbits Laser mode:%s",
pinName(_output_pin).c_str(), pinName(_output_pin).c_str(),
_pwm_freq, _pwm_freq,
_pwm_precision, _pwm_precision,
isRateAdjusted()); // the current mode laser_mode->getStringValue()); // the current mode
use_delays = false; // this will override the value set in Spindle::PWM::init() use_delays = false; // this will override the value set in Spindle::PWM::init()
} }