From 28100bfc1c8fc39c25f39833c1eed98ef1648c82 Mon Sep 17 00:00:00 2001 From: bdring Date: Thu, 28 Oct 2021 12:17:04 -0500 Subject: [PATCH] Devt (#986) * 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) https://github.com/bdring/Grbl_Esp32/issues/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 . https://github.com/espressif/arduino-esp32/issues/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 * 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 Co-authored-by: bdring * 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 * 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 * 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 * YL620_Fix (#941) * YL620_Fix Fix per ... https://github.com/bdring/Grbl_Esp32/issues/926#issuecomment-867885248 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 Co-authored-by: me Co-authored-by: Mitch Bradley Co-authored-by: marcosprojects Co-authored-by: Stefan de Bruijn Co-authored-by: Stefan de Bruijn Co-authored-by: Pete Co-authored-by: Jesse Schoch --- Grbl_Esp32/src/Grbl.h | 2 +- Grbl_Esp32/src/Machine.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Grbl_Esp32/src/Grbl.h b/Grbl_Esp32/src/Grbl.h index 4d9ce8ab..ae9ac6b7 100644 --- a/Grbl_Esp32/src/Grbl.h +++ b/Grbl_Esp32/src/Grbl.h @@ -22,7 +22,7 @@ // Grbl versioning system const char* const GRBL_VERSION = "1.3a"; -const char* const GRBL_VERSION_BUILD = "20211016"; +const char* const GRBL_VERSION_BUILD = "20211028"; //#include #include diff --git a/Grbl_Esp32/src/Machine.h b/Grbl_Esp32/src/Machine.h index 15a146f9..11ab8406 100644 --- a/Grbl_Esp32/src/Machine.h +++ b/Grbl_Esp32/src/Machine.h @@ -8,7 +8,8 @@ // !!! For initial testing, start with test_drive.h which disables // all I/O pins // #include "Machines/atari_1020.h" -# include "Machines/6_pack_TMC2130_XYZ_Test.h" +# include "Machines/test_drive.h" + // !!! For actual use, change the line above to select a board // from Machines/, for example: // #include "Machines/3axis_v4.h"