Mirrors_Framework/grblHAL
1
0
Fork 0
mirror of https://github.com/grblHAL/core.git synced 2026-02-05 08:34:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed bug in WHILE loop handling when first statement in macro.

Browse Source
This commit is contained in:
Terje Io
2023-07-24 10:30:56 +02:00
parent 4e1bba5e74
commit c886caedbf
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
changelog.md
View File

@@ -1,11 +1,25 @@
## grblHAL changelog ## grblHAL changelog
<a name="20230724"/>20230724
Core:
* Fixed bug in WHILE loop handling when first statement in macro.
Drivers:
* iMXRT1062: added [E5XMCS_T41](https://www.makerstore.com.au/product/elec-e5xmcst41/) board.
* RP2040: fix to allow ModBus VFDs with BTT SKR Pico board. Issue (#68)[https://github.com/grblHAL/RP2040/issues/68]
---
<a name="20230718"/>20230718 <a name="20230718"/>20230718
Core: Core:
* Some tweaks for new Web Builder options++ * Some tweaks for new Web Builder options++
* Fixed regression in VFS file system handling cauing hardfault when only one mount is present. * Fixed regression in VFS file system handling causing hardfault when only one mount is present.
Plugins: Plugins:

2
grbl.h
View File

@@ -42,7 +42,7 @@
#else #else
#define GRBL_VERSION "1.1f" #define GRBL_VERSION "1.1f"
#endif #endif
#define GRBL_BUILD 20230718 #define GRBL_BUILD 20230724
#define GRBL_URL "https://github.com/grblHAL" #define GRBL_URL "https://github.com/grblHAL"

2
ngc_flowctrl.c
View File

@@ -271,7 +271,7 @@ status_code_t ngc_flowctrl (uint32_t o_label, char *line, uint_fast8_t *pos, boo
case NGCFlowCtrl_While: case NGCFlowCtrl_While:
if(hal.stream.file) { if(hal.stream.file) {
char *expr = line + *pos; char *expr = line + *pos;
if(stack[stack_idx].brk) { if(stack_idx >= 0 && stack[stack_idx].brk) {
if(last_op == NGCFlowCtrl_Do && o_label == stack[stack_idx].o_label) if(last_op == NGCFlowCtrl_Do && o_label == stack[stack_idx].o_label)
stack_pull(); stack_pull();
} else if(!skipping && (status = ngc_eval_expression(line, pos, &value)) == Status_OK) { } else if(!skipping && (status = ngc_eval_expression(line, pos, &value)) == Status_OK) {