Merge branch 'dev_2' into dev
Conflicts: README.md gcode.c motion_control.c planner.c planner.h protocol.c report.c settings.c settings.h stepper.c stepper.h
This commit is contained in:
parent
b06643a2e0
commit
4f9bcde40e
33 changed files with 3524 additions and 1029 deletions
2
Makefile
2
Makefile
|
|
@ -84,7 +84,7 @@ main.elf: $(OBJECTS)
|
|||
grbl.hex: main.elf
|
||||
rm -f grbl.hex
|
||||
avr-objcopy -j .text -j .data -O ihex main.elf grbl.hex
|
||||
avr-size -C --mcu=$(DEVICE) main.elf
|
||||
avr-size --format=berkeley main.elf
|
||||
# If you have an EEPROM section, you must also create a hex file for the
|
||||
# EEPROM and add it to the "flash" target.
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue