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

Minor fixes

Browse Source 
Fixing typo
Include machine type MSG with $I response.
Stop using the laser mode flag. You don't need it if laser is select by class.
This commit is contained in:
bdring
2020-04-22 16:01:05 -05:00
parent 6fdafc1d41
commit 84d185e672
5 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Grbl_Esp32/Grbl_Esp32.ino
View File

@@ -56,7 +56,7 @@ void setup() {
#else #else
#define MACHINE_STRING MACHINE_NAME #define MACHINE_STRING MACHINE_NAME
#endif #endif
grbl_msg_sendf(CLIENT_SERIAL, MSG_LEVEL_INFO, "Using machine:%s", MACHINE_STRING); report_machine_type(CLIENT_SERIAL);
#endif #endif
settings_init(); // Load Grbl settings from EEPROM settings_init(); // Load Grbl settings from EEPROM
stepper_init(); // Configure stepper pins and interrupt timers stepper_init(); // Configure stepper pins and interrupt timers

5
Grbl_Esp32/report.cpp
View File

@@ -549,6 +549,7 @@ void report_build_info(char* line, uint8_t client) {
// These will likely have a comma delimiter to separate them. // These will likely have a comma delimiter to separate them.
strcat(build_info, "]\r\n"); strcat(build_info, "]\r\n");
grbl_send(client, build_info); // ok to send to all grbl_send(client, build_info); // ok to send to all
report_machine_type(client);
#if defined (ENABLE_WIFI) #if defined (ENABLE_WIFI)
grbl_send(client, (char*)wifi_config.info()); grbl_send(client, (char*)wifi_config.info());
#endif #endif
@@ -775,6 +776,10 @@ void report_gcode_comment(char* comment) {
} }
} }
void report_machine_type(uint8_t client) {
grbl_msg_sendf(client, MSG_LEVEL_INFO, "Using machine:%s", MACHINE_NAME);
}
/* /*
Print a message in hex format Print a message in hex format

2
Grbl_Esp32/report.h
View File

@@ -170,6 +170,8 @@ void report_gcode_comment(char* comment);
void report_realtime_debug(); void report_realtime_debug();
#endif #endif
void report_machine_type(uint8_t client);
void report_hex_msg(char* buf, const char *prefix, int len); void report_hex_msg(char* buf, const char *prefix, int len);
char report_get_axis_letter(uint8_t axis); char report_get_axis_letter(uint8_t axis);

3
Grbl_Esp32/tools/Laser.cpp
View File

@@ -27,8 +27,7 @@
bool Laser :: isRateAdjusted() { bool Laser :: isRateAdjusted() {
// must be in $32=1 (laser mode) return true; // can use M4 (CCW) laser mode.
return (settings.flags & BITFLAG_LASER_MODE);
} }
void Laser :: config_message() { void Laser :: config_message() {

2
Grbl_Esp32/tools/PWMSpindle.cpp
View File

@@ -107,7 +107,7 @@ float PWMSpindle::set_rpm(float rpm) {
// apply override // apply override
rpm *= (0.010 * sys.spindle_speed_ovr); // Scale by spindle speed override value (percent) rpm *= (0.010 * sys.spindle_speed_ovr); // Scale by spindle speed override value (percent)
// apply limits limits // apply limits
if ((_min_rpm >= _max_rpm) || (rpm >= _max_rpm)) { if ((_min_rpm >= _max_rpm) || (rpm >= _max_rpm)) {
rpm = _max_rpm; rpm = _max_rpm;
} else if (rpm != 0.0 && rpm <= _min_rpm) { } else if (rpm != 0.0 && rpm <= _min_rpm) {