Skip to content

Commit 490d3f1

Browse files
committed
Removed classic GUI interface. Fixed typo with line number support.
- [config] Permanently removed classic GUI interface support. This unintentionally created a problem where some users/GUI devs used this compatibility mode and did not update to the new interface. So, there were two interfaces in use, rather than just one like it was intended. This removal should help everyone by forcing all GUIs to update and updated GUI not having to support yet another interface. - Fixed typo with line number support in jog mode.
1 parent 94083e8 commit 490d3f1

File tree

6 files changed

+266
-589
lines changed

6 files changed

+266
-589
lines changed

doc/log/commit_log_v1.1.txt

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
----------------
2+
Date: 2016-12-04
3+
Author: chamnit
4+
Subject: Fixed unintended laser mode pausing. Updated documentation. Min SS OVR lowered to 10%.
5+
6+
- [laser] Tested a working version and pushed the wrong one for the
7+
last! 20161203 was pausing upon every spindle speed change. That’s not
8+
right. Fixed so nearly all motions are passed through and does not stop.
9+
10+
- Minimum spindle speed override lower from 50% to 10%. Lasers could
11+
use the lower speeds.
12+
13+
- Fixed a very minor bug related to G80 error checking. Allowed no
14+
error with non-modal motions with axis words. Not correct and fixed.
15+
16+
- Fixed a compile error when disabling VARIABLE_SPINDLE
17+
18+
- [doc] Updated some obsolete documentation.
19+
20+
- [doc] Started a “Laser Mode” document that summarizes how Grbl’s new
21+
laser mode works.
22+
23+
124
----------------
225
Date: 2016-12-03
326
Author: Sonny Jeon

grbl/config.h

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -287,22 +287,6 @@
287287
#define REPORT_WCO_REFRESH_BUSY_COUNT 30 // (2-255)
288288
#define REPORT_WCO_REFRESH_IDLE_COUNT 10 // (2-255) Must be less than or equal to the busy count
289289

290-
// ----- COMPATIBILITY OPTIONS: ------
291-
// The following options enabled the old-style v0.9 Grbl interface.
292-
// WARNING: DO NOT USE these compatibility options unless there is a really good reason to. If you are
293-
// trying to use Grbl v1.1 with a GUI that supports a v0.9-style interface, it will still not likely work.
294-
// A few things have been added, like override and accessory data and a new sleep state. These things will
295-
// still likely require the GUI to be updated to handle these. In other words, IT WILL STILL NOT WORK!
296-
// IT'S HIGHLY RECOMMENDED FOR GUIs TO UPDATE TO THE NEW INTERFACE FOR v1.1. Don't try to make it
297-
// compatible with this old v0.9 style. It will be dropped in the near future. You have been warned.
298-
// NOTE: The compiled size of Grbl with these options enabled will exceed the flash limit of FTDI-based
299-
// Arduinos, like the Duemilanove and Nano. This will only fit on an Uno with the Optiboot bootloader.
300-
// #define USE_CLASSIC_GRBL_INTERFACE // Default disabled. Uncomment to enable.
301-
// #define REPORT_ALL_PIN_STATES // Default disabled. Uncomment to enable. Option obsolete in v1.1.
302-
// #define REPORT_REALTIME_RATE // Disabled by default. Uncomment to enable. Option obsolete in v1.1.
303-
// Enables minimal reporting feedback mode for GUIs, where human-readable strings are not as important.
304-
// -----------------------------------
305-
306290
// The temporal resolution of the acceleration management subsystem. A higher number gives smoother
307291
// acceleration, particularly noticeable on machines that run at very high feedrates, but may negatively
308292
// impact performance. The correct value for this parameter is machine dependent, so it's advised to

grbl/grbl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
// Grbl versioning system
2525
#define GRBL_VERSION "1.1e"
26-
#define GRBL_VERSION_BUILD "20161204"
26+
#define GRBL_VERSION_BUILD "20161208"
2727

2828
// Define standard libraries used by Grbl.
2929
#include <avr/io.h>

grbl/jog.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ uint8_t jog_execute(plan_line_data_t *pl_data, parser_block_t *gc_block)
2929
pl_data->feed_rate = gc_block->values.f;
3030
pl_data->condition |= PL_COND_FLAG_NO_FEED_OVERRIDE;
3131
#ifdef USE_LINE_NUMBERS
32-
pl_data->line_number = gc_block.values.n;
32+
pl_data->line_number = gc_block->values.n;
3333
#endif
3434

3535
if (bit_istrue(settings.flags,BITFLAG_SOFT_LIMIT_ENABLE)) {

0 commit comments

Comments
 (0)