mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-08-18 12:21:39 +02:00
Code Issues Releases Wiki Activity

fixing machine.h

Browse Source
This commit is contained in:
me
2021-04-21 10:14:47 -07:00
parent 9d16064c38
commit 3e6c5caedc
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Grbl_Esp32/src/Machine.h
View File

@@ -8,7 +8,7 @@
// !!! For initial testing, start with test_drive.h which disables // !!! For initial testing, start with test_drive.h which disables
// all I/O pins // all I/O pins
// #include "Machines/atari_1020.h" // #include "Machines/atari_1020.h"
# include "Machines/jesse_6pack.h" # include "Machines/test_drive.h"
// !!! For actual use, change the line above to select a board // !!! For actual use, change the line above to select a board
// from Machines/, for example: // from Machines/, for example:

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

@@ -28,8 +28,11 @@ namespace Spindles {
L510::L510() : VFD() { L510::L510() : VFD() {
_baudrate = 9600; _baudrate = 9600;
_parity = Uart::Parity::None; _parity = Uart::Parity::None;
// TODO: should defaults be set here? What happens if the motor settings in the VFD are wrong or default?
/*
_max_rpm = 24000; _max_rpm = 24000;
_max_freq = 40000; _max_freq = 40000;
*/
} }
void L510::direction_command(SpindleState mode, ModbusCommand& data) { void L510::direction_command(SpindleState mode, ModbusCommand& data) {
@@ -108,15 +111,17 @@ namespace Spindles {
if (index == -1) { if (index == -1) {
// NOTE: data length is excluding the CRC16 checksum. // NOTE: data length is excluding the CRC16 checksum.
data.tx_length = 6; data.tx_length = 6;
data.rx_length = 5; data.rx_length = 11;
// read parameters 02-03..02-06
// Send: // Send:
data.msg[1] = 0x03; // READ data.msg[1] = 0x03; // READ
data.msg[2] = 0x02; // 0x0203 = Get max rpm data.msg[2] = 0x02; // 0x0203 = Get max rpm
data.msg[3] = 0x03; data.msg[3] = 0x03;
data.msg[4] = 0x00; // Read 1 value data.msg[4] = 0x00; // Read 4 values
data.msg[5] = 0x01; data.msg[5] = 0x04;
@@ -124,10 +129,16 @@ namespace Spindles {
return [](const uint8_t* response, Spindles::VFD* vfd) -> bool { return [](const uint8_t* response, Spindles::VFD* vfd) -> bool {
uint32_t rpm = (response[3] << 8) | response[4]; uint32_t rpm = (response[3] << 8) | response[4];
//TODO also get max_frequency
vfd->_max_rpm = rpm;
grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, "L510 initialized: spindle max_rpm %d ", vfd->_max_rpm); // NOTE: the frequency is stored xxx.x but the input command is frequency * 100;
uint16_t freq = (response[9] << 8) | response[10];
freq = freq * 10;
auto l510 = static_cast<L510*>(vfd);
l510->_max_rpm = rpm;
l510->_max_freq = freq;
grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, "L510 initialized: spindle max_rpm %d max_freq %d", vfd->_max_rpm,l510->_max_freq);
return true; return true;
}; };
@@ -150,7 +161,6 @@ namespace Spindles {
return [](const uint8_t* response, Spindles::VFD* vfd) -> bool { return [](const uint8_t* response, Spindles::VFD* vfd) -> bool {
uint32_t vfd_state = (response[3] << 8) | response[4]; uint32_t vfd_state = (response[3] << 8) | response[4];
//TODO also get max_frequency
if(bitRead(vfd_state,3)){ if(bitRead(vfd_state,3)){
grbl_msg_sendf(CLIENT_SERIAL,MsgLevel::Info,"L510 Fault detected"); grbl_msg_sendf(CLIENT_SERIAL,MsgLevel::Info,"L510 Fault detected");