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

Small cleanups

Browse Source
This commit is contained in:
Mitch Bradley
2021-07-11 12:01:27 -10:00
parent e5610e7ab5
commit 433dfc5062
5 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Grbl_Esp32/src/Limits.cpp
View File

@@ -323,7 +323,7 @@ static AxisMask squaredAxes() {
for (int axis = 0; axis < n_axis; axis++) { for (int axis = 0; axis < n_axis; axis++) {
auto homing = axes->_axis[axis]->_homing; auto homing = axes->_axis[axis]->_homing;
if (homing && homing->_square) { if (homing && homing->_square) {
mask |= bit(axis); bitnum_true(mask, axis);
} }
} }
return mask; return mask;

3
Grbl_Esp32/src/Motors/Dynamixel2.h
View File

@@ -99,8 +99,6 @@ namespace Motors {
int _countMin = 1024; int _countMin = 1024;
int _countMax = 3072; int _countMax = 3072;
int _dynamixelFullTimeMove = 1000; // time in milliseconds to do a full DYNAMIXEL_FULL_MOVE_TIME
bool _disabled; bool _disabled;
bool _has_errors; bool _has_errors;
@@ -128,7 +126,6 @@ namespace Motors {
handler.item("count_min", _countMin); handler.item("count_min", _countMin);
handler.item("count_max", _countMax); handler.item("count_max", _countMax);
handler.item("full_time_move", _dynamixelFullTimeMove);
handler.section("uart", _uart); handler.section("uart", _uart);
int id = _id; int id = _id;

2
Grbl_Esp32/src/Motors/RcServoSettings.h
View File

@@ -21,5 +21,3 @@ const uint16_t SERVO_MAX_PULSE = (uint16_t)(SERVO_MAX_PULSE_SEC / SERVO_TIME_PER
const uint16_t SERVO_PULSE_RANGE = (SERVO_MAX_PULSE - SERVO_MIN_PULSE); const uint16_t SERVO_PULSE_RANGE = (SERVO_MAX_PULSE - SERVO_MIN_PULSE);
const double SERVO_TIMER_INT_FREQ = 50.0; // Hz This is the task frequency const double SERVO_TIMER_INT_FREQ = 50.0; // Hz This is the task frequency
const int SERVO_FULL_MOVE_TIME = 750; // rtos ticks

2
Grbl_Esp32/src/Uart.h
View File

@@ -84,7 +84,7 @@ public:
handler.item("txd_pin", _txd_pin); handler.item("txd_pin", _txd_pin);
handler.item("rxd_pin", _rxd_pin); handler.item("rxd_pin", _rxd_pin);
handler.item("rts_pin", _rts_pin); handler.item("rts_pin", _rts_pin);
handler.item("rts_pin", _cts_pin); handler.item("cts_pin", _cts_pin);
handler.item("baud", baud); handler.item("baud", baud);
handler.item("mode", dataBits, parity, stopBits); handler.item("mode", dataBits, parity, stopBits);

1
platformio.ini
View File

@@ -10,6 +10,7 @@
[platformio] [platformio]
src_dir = Grbl_Esp32 src_dir = Grbl_Esp32
include_dir = Grbl_Esp32
lib_dir = libraries lib_dir = libraries
test_dir = Grbl_Esp32/test test_dir = Grbl_Esp32/test
data_dir = Grbl_Esp32/data data_dir = Grbl_Esp32/data