mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-09-01 02:21:46 +02:00
Code Issues Releases Wiki Activity

trying set_rpm override

Browse Source
This commit is contained in:
me
2021-04-21 06:29:07 -07:00
parent 28dcf0bd51
commit 6c029d8f98
2 changed files with 72 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
Grbl_Esp32/src/Spindles/TecoL510.cpp
View File

@@ -190,4 +190,74 @@ namespace Spindles {
return true;
};
}
void start_spindle(){
if(!spindle_started){
// send start to VFD
ModbusCommand start_cmd;
start_cmd[0] = VFD_RS485_ADDR;
start_command(start_cmd);
if (xQueueSend(vfd_cmd_queue, &start_cmd, 0) != pdTRUE) {
grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, "VFD Queue Full");
}
}
}
uint32_t LF510::set_rpm(uint32_t rpm){
if (!vfd_ok) {
return 0;
}
// Hack to start spindle running
SpindleState sstate = get_state();
if(sstate != SpindleState::Disabled){
start_spindle();
}
// apply override
rpm = rpm * sys.spindle_speed_ovr / 100; // Scale by spindle speed override value (uint8_t percent)
if (rpm != 0 && (rpm < _min_rpm || rpm > _max_rpm)) {
// NOTE: Don't add a info message here; this method is called from the stepper_pulse_func ISR method, so
// emitting debug information could crash the ESP32.
rpm = constrain(rpm, _min_rpm, _max_rpm);
}
// apply limits
// if ((_min_rpm >= _max_rpm) || (rpm >= _max_rpm)) {
// rpm = _max_rpm;
// } else if (rpm != 0 && rpm <= _min_rpm) {
// rpm = _min_rpm;
// }
sys.spindle_speed = rpm;
if (rpm == _current_rpm) { // prevent setting same RPM twice
return rpm;
}
#ifdef VFD_DEBUG_MODE2
grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, "Setting spindle speed to %d rpm (%d, %d)", int(rpm), int(_min_rpm), int(_max_rpm));
#endif
_current_rpm = rpm;
// TODO add the speed modifiers override, linearization, etc.
ModbusCommand rpm_cmd;
rpm_cmd.msg[0] = VFD_RS485_ADDR;
set_speed_command(rpm, rpm_cmd);
// Sometimes sync_rpm is retained between different set_speed_command's. We don't want that - we want
// spindle sync to kick in after we set the speed. This forces that.
_sync_rpm = UINT32_MAX;
rpm_cmd.critical = (rpm == 0);
if (xQueueSend(vfd_cmd_queue, &rpm_cmd, 0) != pdTRUE) {
grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, "VFD Queue Full");
}
return rpm;
}
}

2
Grbl_Esp32/src/Spindles/TecoL510.h
View File

@@ -37,6 +37,8 @@ namespace Spindles {
bool safety_polling() const override { return false; }
uint16_t rpm_to_frequency(uint32_t rpm);
uint32_t freq_to_rpm(uint16_t);
uint32_t set_rpm(uint32_t rpm) override;
void start_spindle();
public:
L510();