Skip to content

Commit 1ab87c5

Browse files
bdringmeMitchBradleymarcow1601atlaste
authored
Devt (#990)
* changing to EXTENDED type from GRBL type to prevent sender issues when running 1585 * Oled2 (#834) * WIP * WIP * Update platformio.ini * WIP * Cleanup * Update platformio.ini * Turn off soft limits with max travel (#836) #831 * Yalang YL620 VFD (#838) * New SpindleType YL620 Files for new SpindleType Yalang 620. So far the contents are a duplicate of H2ASpindle.h and H2ASpindle.cpp * Added register documentation and implemented read and write data packets * Some fixes, mostly regarding RX packet length * OLED and Other Updates (#844) * publish * Updates - CoreXY and OLED - Moved position calculation out of report_realtime_status(...) so other functions can access it. - Added a function to check if a limit switch is defined - CoreXY fixed bug in forward kinematics when midtbot is used. - Modified OLED display. * Cleanup for PR * Delete midtbot_x2.h * Incorporated PR 846 - Some OLED cleanup - verified correct forward kinematics on MidTbot * Pio down rev (#850) * Update platformio.ini * Update Grbl.h * Use local UART driver not HardwareSerial (#857) * Use local UART driver not HardwareSerial The HardwareSerial driver is broken in Arduino framework versions 1.0.5 and 1.0.6 . espressif/arduino-esp32#5005 Instead of waiting for a fix, I wrote a very simple UART driver that does exactly what we need with no unnecessary bells and whistles to cause problems. * Added missing files, changed method signatures The methods implemented by the UART class now have the same signatures as the HardwareSerial class, so it will be easy to switch back if we need to. * Incorporated suggestions from Stefan * Fixed TX_IDLE_NUM bug reported by mstrens * Quick test for Bf: problem This is not the final solution. * Fixed stupid typo in last commit * Another test - check for client_buffer space * Use the esp-idf uart driver You can revert to the direct driver for testing by defining DIRECT_UART * Uart class now supports VFD and TMC * data bits, stop bits, parity as enum classes The constants for data bits, stop bits, and parity were changed to enum classes so the compiler can check for argument order mismatches. * Set half duplex after uart init * Init TMC UART only once * rx/tx pin order mixup, missing _uart_started * Test: use Arduino Serial This reverts to the Arduino serial driver for UI communication, leaving the VFS comms on the Uart class on top of the esp_idf UART driver. You can switch back and forth with the define REVERT_TO_SERIAL line in Serial.cpp * REVERT_TO_ARDUINO_SERIAL off by default * Added debug messages * Update Grbl.h * Update platformio.ini Co-authored-by: bdring <[email protected]> * Fixed spindle sync for all VFD spindles (#868) * Implemented H2A spindle sync fix. Untested. * Changed the spindle sync fix to be in the VFD code. * Update Grbl.h Co-authored-by: Stefan de Bruijn <[email protected]> Co-authored-by: bdring <[email protected]> * New jog fix (#872) * Applied 741 to new Devt * Make kinematics routines weak to eliminate ifdefs * Fixed warning * Update build date Co-authored-by: bdring <[email protected]> * need to override set_rpm * trying set_rpm override * it turns on! * start/stop and set speed all working * cleanup * fixing machine.h * fix .gitignore *&vi .gitignore didn't work anyway * forgot to get rid of hard coded max_freq, fixed now * changed 'speed' to 'freq' * reverting platformio.ini * minor readme update * removed debug msg * Big kinematics cleanup (#875) * Applied 741 to new Devt * Make kinematics routines weak to eliminate ifdefs * Fixed warning * Big kinematics cleanup * Cleanup * no isCancelled arg for jog_execute; return it instead * WIP * Made OLED compliant with new kinematics * Added system_get_mpos * system_get_mpos() returns float* * WIP * Cleanup after testing - Had MPos and WPos text on OLED backwards. - Added my cartesian test def - Will remove test defs before merging to devt. * Cleanup of remaining user optional code. * Fixed delta kinematics loop ending early. * Account for jog cancel in saved motor positions * Update Grbl.h Co-authored-by: bdring <[email protected]> * Add the Root 4 Lite CNC machine to the Machines folder (#886) * update for the Root 4 Lite * Return machine.h to use test_drive.hy * Removed some machine definitions Co-authored-by: bdring <[email protected]> * YL620_Fix (#941) * YL620_Fix Fix per ... #926 (comment) Added CNC_xPro machine def * Update Grbl.h * Delete CNC_xPRO_V5_XYYZ_PWM_NO.h * fixes for RPM * note * fixed rx length * fix smell and update readme * clang format * trying to fix newlines * trying to fix newlines part 2 * fix cast issue * fixed spinup spindown swap. * Core xy soft limits (#960) * Soft limit fix * Update Grbl.h * Increase serial task stack size (#970) * Increase stack size - Also changed defaults of trinamic motor currents * Update Grbl.h * 5160 class fix (#981) * Fixed class inheritance * Update date * Update Machine.h * Update Grbl.h * Improved an example and added link to FluidNC * Update Grbl.h Co-authored-by: me <[email protected]> Co-authored-by: Mitch Bradley <[email protected]> Co-authored-by: marcosprojects <[email protected]> Co-authored-by: Stefan de Bruijn <[email protected]> Co-authored-by: Stefan de Bruijn <[email protected]> Co-authored-by: Pete <[email protected]> Co-authored-by: Jesse Schoch <[email protected]>
1 parent 28100bf commit 1ab87c5

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

Grbl_Esp32/src/Grbl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
// Grbl versioning system
2424
const char* const GRBL_VERSION = "1.3a";
25-
const char* const GRBL_VERSION_BUILD = "20211028";
25+
const char* const GRBL_VERSION_BUILD = "20211103";
2626

2727
//#include <sdkconfig.h>
2828
#include <Arduino.h>

Grbl_Esp32/src/Machines/6_pack_stepstick_v1.h

+5
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,9 @@ Socket #5
122122
#define Z_LIMIT_PIN GPIO_NUM_35
123123
#define PROBE_PIN GPIO_NUM_34
124124

125+
#define DEFAULT_INVERT_LIMIT_PINS 0
126+
#define DEFAULT_INVERT_PROBE_PIN 0
127+
125128

126129
// 5V output CNC module in socket #3
127130
// https://github.com/bdring/6-Pack_CNC_Controller/wiki/4x-5V-Buffered-Output-Module
@@ -133,3 +136,5 @@ Socket #5
133136

134137
// === Default settings
135138
#define DEFAULT_STEP_PULSE_MICROSECONDS I2S_OUT_USEC_PER_PULSE
139+
140+

README.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@
22

33
# Grbl (CNC Controller) For ESP32
44

5-
<img src="https://user-images.githubusercontent.com/189677/93836185-74c27500-fc47-11ea-8bed-5d419974c196.jpg" width="600">
5+
<img src="https://github.com/bdring/FluidNC/wiki/images/hardware/20200711_120633.png" width="600">
6+
7+
## Get the Next Generation!
8+
9+
The next generation of Grbl_ESP32 was such a massive upgrade we decided to change the name. It is called **FluidNC** and is [available here](https://github.com/bdring/FluidNC). Please check it out and give us a star. It is compatible with all Grbl_ESP32 hardware.
10+
11+
This version is only being maintained with existing features. All new features are targeted at FluidNC.
612

713
### Project Overview
814

0 commit comments

Comments
 (0)