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

Remove doubled settings (#799)

Browse Source 
* Initial release with custom machine

* initial release

* Wrong addition corrected. AmoutOfToolChanges counts up now.

* pressing Z probe button once is fine, not a second time. reporting not in sequence to function flow

* First working FreeRTOS task with static text. Send "471" every second to all outputs

* Z Probe triggered correctly at button pressed. Can read out all values

* gitignore

* running with state machine, repeatable results in test environment

* works, except that function "user_tool_change" starts the tool change and it will interfer with further g code running in parallel. tbd

* typo

* back to without RTOS.But doesnt move

* RTOS but only with "T1 m06". not with g code program

* hold is better than door

* initial wifi settings

* umlaute

* gitignore

* Fehler bei Limit_Mask

* Spindle_Type angepasst

* lower debounding after adding capacitor

* Revert "lower debounding after adding capacitor"

This reverts commit eadbec2359.

* remove customized gitignore

* Revert "remove customized gitignore"

This reverts commit ce44131c7a.

* reduce debounding period due to adding capacitor

* uncomment all tool change source code

* Tets Fräse 2.6 ok

* Fräse 2.6

* Falscher GPIO Pin für Fräse

* test

* Revert "test"

This reverts commit 1265435786.

* No Bluetooth necessary

* OTA update (watch Windows firewall!)

* - rename custom machine file name
-added "4axis_xyza.txt" to store Grbl_ESP32 config parameters.
So programming fits to parameters
- added 2 buttons (#1 hold/resume), #2 homing and tool change position

* new Z probe button

* Z probe corretion

* Z probe correction

* Z probe correction

* Fixed Grbl.h

- I think I deleted the GRBL_VERSION line by accident when using the web based conflict editor

* Revert "Merge branch 'Devt' of https://github.com/bdring/Grbl_Esp32 into Devt"

This reverts commit 361558b6b7, reversing
changes made to 811646f5e7.

* Revert "Merge remote-tracking branch 'Grbl_Esp32_JH/master' into Devt"

This reverts commit 811646f5e7, reversing
changes made to a61ab51c0b.

* Update SettingsDefinitions.cpp

- Double definition of direction_delay_microseconds & enable_delay_microseconds

* Update Grbl.h

Co-authored-by: Jens Hauser <44340656+JensHauser@users.noreply.github.com>
Co-authored-by: Mitch Bradley <wmb@firmworks.com>
Co-authored-by: JensHauser <jens@hauser-digital.de>
This commit is contained in:
bdring
2021-03-06 19:00:19 -06:00
committed by GitHub
parent bf0d0bfa17
commit f04be7e341
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Grbl_Esp32/src/SettingsDefinitions.cpp
View File

@@ -400,9 +400,6 @@ void make_settings() {
step_invert_mask = new AxisMaskSetting(GRBL, WG, "2", "Stepper/StepInvert", DEFAULT_STEPPING_INVERT_MASK, postMotorSetting);
stepper_idle_lock_time = new IntSetting(GRBL, WG, "1", "Stepper/IdleTime", DEFAULT_STEPPER_IDLE_LOCK_TIME, 0, 255);
pulse_microseconds = new IntSetting(GRBL, WG, "0", "Stepper/Pulse", DEFAULT_STEP_PULSE_MICROSECONDS, 3, 1000);
direction_delay_microseconds = new IntSetting(EXTENDED, WG, NULL, "Stepper/Direction/Delay", 0, 0, 1000);
enable_delay_microseconds = new IntSetting(EXTENDED, WG, NULL, "Stepper/Enable/Delay", 0, 0, 1000); // microseconds
direction_delay_microseconds = new IntSetting(EXTENDED, WG, NULL, "Stepper/Direction/Delay", STEP_PULSE_DELAY, 0, 1000);
enable_delay_microseconds = new IntSetting(EXTENDED, WG, NULL, "Stepper/Enable/Delay", DEFAULT_STEP_ENABLE_DELAY, 0, 1000); // microseconds