Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compilation with grbl v1.1f on linux using GCC 11.1.0 #29

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −4
Open

Fix compilation with grbl v1.1f on linux using GCC 11.1.0 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ GRBL_OVERRIDE_OBJECTS = ../main.o ../serial.o ../report.o
AVR_OBJECTS = avr/interrupt.o avr/pgmspace.o avr/io.o avr/eeprom.o grbl_eeprom_extensions.o

# Simulator Only Objects
SIM_OBJECTS = main.o simulator.o serial.o util/delay.o util/floatunsisf.o platform_$(PLATFORM).o system_declares.o
SIM_OBJECTS = main.o simulator.o serial.o util/delay.o util/floatunsisf.o platform_$(PLATFORM).o

GRBL_SIM_OBJECTS = grbl_interface.o $(GRBL_BASE_OBJECTS) $(GRBL_OVERRIDE_OBJECTS) $(SIM_OBJECTS) $(AVR_OBJECTS)
GRBL_VAL_OBJECTS = validator.o overridden_report.o $(GRBL_BASE_OBJECTS) $(AVR_OBJECTS) system_declares.o
Expand Down
4 changes: 2 additions & 2 deletions avr/wdt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
along with Grbl. If not, see <http://www.gnu.org/licenses/>.
*/

#define WDTCSR wdt
/*#define WDTCSR wdt*/
#define WDP0 0
#define WDP1 1
#define WDP2 2
Expand All @@ -30,4 +30,4 @@
#define WDIE 6
#define WDIF 7

uint16_t wdt;
/*uint16_t wdt;*/
2 changes: 1 addition & 1 deletion validator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

// Declare system global variable structure
system_t sys;
volatile io_sim_t io;
/*volatile io_sim_t io;*/


typedef struct arg_vars {
Expand Down