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

Fixed number_axis->get() in Custom/

Browse Source
This commit is contained in:
Mitch Bradley
2021-05-21 09:03:19 -10:00
parent 684457bf42
commit 181b81a66b
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Grbl_Esp32/Custom/CoreXY.cpp
View File

@@ -81,7 +81,8 @@ bool user_defined_homing(uint8_t cycle_mask) {
// check for multi axis homing per cycle ($Homing/Cycle0=XY type)...not allowed in CoreXY
bool setting_error = false;
auto n_axis = number_axis->get();
auto n_axis = MachineConfig::instance()->_axes->_numberAxis;
;
for (int cycle = 0; cycle < n_axis; cycle++) {
if (numberOfSetBits(homing_cycle[cycle]->get()) > 1) {
grbl_msg_sendf(CLIENT_SERIAL,
@@ -258,7 +259,7 @@ static void transform_cartesian_to_motors(float* motors, float* cartesian) {
motors[X_AXIS] = geometry_factor * cartesian[X_AXIS] + cartesian[Y_AXIS];
motors[Y_AXIS] = geometry_factor * cartesian[X_AXIS] - cartesian[Y_AXIS];
auto n_axis = number_axis->get();
auto n_axis = MachineConfig::instance()->_axes->_numberAxis;
for (uint8_t axis = Z_AXIS; axis <= n_axis; axis++) {
motors[axis] = cartesian[axis];
}
@@ -276,7 +277,7 @@ bool cartesian_to_motors(float* target, plan_line_data_t* pl_data, float* positi
dz = target[Z_AXIS] - position[Z_AXIS];
float dist = sqrt((dx * dx) + (dy * dy) + (dz * dz));
auto n_axis = number_axis->get();
auto n_axis = MachineConfig::instance()->_axes->_numberAxis;
float motors[n_axis];
transform_cartesian_to_motors(motors, target);
@@ -308,7 +309,7 @@ bool kinematics_pre_homing(uint8_t cycle_mask) {
}
void kinematics_post_homing() {
auto n_axis = number_axis->get();
auto n_axis = MachineConfig::instance()->_axes->_numberAxis;
memcpy(gc_state.position, last_cartesian, n_axis * sizeof(last_cartesian[0]));
}

2
Grbl_Esp32/Custom/oled_basic.cpp
View File

@@ -129,7 +129,7 @@ void displayDRO() {
display.drawString(80, 14, "L"); // Limit switch
auto n_axis = number_axis->get();
auto n_axis = MachineConfig::instance()->_axes->_numberAxis;
AxisMask lim_pin_state = limits_get_state();
ControlPins ctrl_pin_state = system_control_get_state();
bool prb_pin_state = probe_get_state();