Fixed symbol issue with Arduino Due blocking compilation of NGC parameter support.

This commit is contained in:
Terje Io
2024-04-02 23:55:46 +02:00
parent 5afac36157
commit c3aace735b
6 changed files with 32 additions and 14 deletions

View File

@@ -13,7 +13,7 @@ It has been written to complement grblHAL and has features such as proper keyboa
---
Latest build date is 20240328, see the [changelog](changelog.md) for details.
Latest build date is 20240402, see the [changelog](changelog.md) for details.
__NOTE:__ Build 20240222 has moved the probe input to the ioPorts pool of inputs and will be allocated from it when configured.
The change is major and _potentially dangerous_, it may damage your probe, so please _verify correct operation_ after installing this, or later, builds.
@@ -93,4 +93,4 @@ G/M-codes not supported by [legacy Grbl](https://github.com/gnea/grbl/wiki) are
Some [plugins](https://github.com/grblHAL/plugins) implements additional M-codes.
---
20240222
20240402

View File

@@ -1,6 +1,24 @@
## grblHAL changelog
<a name="202403230"/>Build 20240330
<a name="20240402"/>Build 20240402
Core:
* Fixed symbol issue with Arduino Due blocking compilation of NGC parameter support.
Drivers:
* SAM3X8E: added driver support for additional aux inputs in order to support probe input.
* iMXRT1062: fixed typo in step inject code causing direction signal to fail for A+ axes.
Plugings:
* Spindle: added motor enable support for stepper spindle.
---
<a name="20240330"/>Build 20240330
Core:

View File

@@ -534,6 +534,7 @@ typedef struct {
typedef struct {
float offset[N_AXIS]; //!< Tool offset
float radius; //!< Radius of tool (currently unsupported)
// TODO: add float max_rpm; ?
tool_id_t tool_id; //!< Tool number
} tool_data_t;

2
grbl.h
View File

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

View File

@@ -2977,7 +2977,7 @@ void settings_init (void)
if(hal.stepper.get_ganged)
setting_remove_elements(Setting_GangedDirInvertMask, hal.stepper.get_ganged(false).mask);
setting_remove_element(Setting_CoolantInvertMask, hal.coolant_cap.mask);
setting_remove_elements(Setting_CoolantInvertMask, hal.coolant_cap.mask);
#if COMPATIBILITY_LEVEL <= 1
if(hal.homing.get_state == NULL) {

17
vfs.c
View File

@@ -7,28 +7,29 @@
Copyright (c) 2022-2024 Terje Io
Grbl is free software: you can redistribute it and/or modify
grblHAL is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Grbl is distributed in the hope that it will be useful,
grblHAL is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
along with grblHAL. If not, see <http://www.gnu.org/licenses/>.
*/
#include <string.h>
#include <stdlib.h>
#ifndef ARDUINO_SAM_DUE
#include "hal.h"
#include "vfs.h"
//#include <errno.h>
#ifdef ARDUINO_SAM_DUE
#undef feof
#endif
// NULL file system
@@ -632,5 +633,3 @@ int vfs_drive_format (vfs_drive_t *drive)
return fs->format ? fs->format() : -1;
}
#endif