From dbc170a571054f7019a1f10840591b7ff9f1b4cd Mon Sep 17 00:00:00 2001 From: Terje Io Date: Thu, 26 Jan 2023 07:13:28 +0100 Subject: [PATCH] Fixed include file issue causing macro warnings for drivers built with the Arduino platform. --- README.md | 8 ++++---- changelog.md | 12 ++++++++++++ grbl.h | 10 +++++----- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 0b60eaa..06b60ef 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,9 @@ It has been written to complement grblHAL and has features such as proper keyboa --- -Latest build date is 20230125, see the [changelog](changelog.md) for details. -__NOTE:__ A settings reset will be performed on an update. Backup and restore of settings is recommended. -__IMPORTANT!__ A new setting has been introduced for ganged axes motors in version 20211121. +Latest build date is 20230126, see the [changelog](changelog.md) for details. +__NOTE:__ A settings reset will be performed on an update of builds earlier than 20230125. Backup and restore of settings is recommended. +__IMPORTANT!__ A new setting has been introduced for ganged axes motors in build 20211121. I have only bench tested this for a couple of drivers, correct function should be verified after updating by those who have more than three motors configured. More details in the [changelog](changelog.md). @@ -87,4 +87,4 @@ List of Supported G-Codes: Some [plugins](https://github.com/grblHAL/plugins) implements additional M-codes. --- -2023-01-25 +2023-01-26 diff --git a/changelog.md b/changelog.md index 950f960..dc48b9b 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,17 @@ ## grblHAL changelog +Build 20230126 + +Core: + +* Fixed include file issue causing macro warnings for drivers built with the Arduino platform. + +Web Builder: + +* Added macros plugin to capable drivers, removed resizable planner buffer option as this is now always enabled and added option for rotary axes feed rate fix. + +--- + Build 20230125 Core: diff --git a/grbl.h b/grbl.h index 11920eb..80e0e20 100644 --- a/grbl.h +++ b/grbl.h @@ -30,6 +30,10 @@ #include #include +#ifdef ARDUINO +#include +#endif + #include "config.h" // Grbl versioning system @@ -38,7 +42,7 @@ #else #define GRBL_VERSION "1.1f" #endif -#define GRBL_BUILD 20230125 +#define GRBL_BUILD 20230126 #define GRBL_URL "https://github.com/grblHAL" @@ -62,10 +66,6 @@ #define ISR_FUNC(fn) fn #endif -#ifdef ARDUINO -#include -#endif - #ifndef PROGMEM #define PROGMEM #endif