ed790c9fa2
- Increment to v1.1d due to interface tweaks. - Based on GUI dev feedback, the toggle overrides report was removed and replace with showing “accessory state”. This shows a character if a particular accessory is enabled, like the spindle or flood coolant. These can be directly altered by the toggle overrides, so when they execute, a GUI will be able to observe the state altering as feedback. - Altered the real-time feed rate to show real-time spindle speed as well. It was an over-sight on my part. It’s needed because it’s hard to know what the current spindle speed is when overrides are altering it. Especially during something like a laser cutting job when its important to know how spindle speed overrides are effecting things. - Real-time spindle speed is not shown if VARIABLE_SPINDLE is disabled. The old real-time feed rate data field will show instead. - Compile-time option data is now included in another message immediately following the build info version string, starting with `[OPT:`. A character code follows the data type name with each indicating a particular option enabled or disabled. This will help immensely with debugging Grbl as well as help GUIs know exactly how Grbl was compiled. - These interface changes are detailed in the updated documentation. - Reduced the default planner buffer size from 17 to 16. Needed to free up some memory… - For increasing the serial TX buffer size from 90 to 104 bytes. The addition of real-time spindle speeds and accessory enable data required a bigger buffer. This is to ensure Grbl is performing at optimal levels. - Refactored parts of the spindle and coolant control code to make it more consistent to each other and how it was called. It was a little messy. The changes made it easier to track what each function call was doing based on what was calling it. - Created a couple of new get_state functions for the spindle and coolant. These are called by the accessory state report to look directly at the pin state, rather than track how it was set. This guarantees that the state is reported correctly. - Updated the g-code parser, parking motion, sleep mode, and spindle stop calls to refactored spindle and coolant code. - Added a compile-time option to enable homing individual axes, rather than having only the main homing cycle. The actual use case for this is pretty rare. It’s not recommended you enable this, unless you have a specific application for it. Otherwise, just alter the homing cycle itself. - Refactored the printFloat() function to not show a decimal point if there are no trailing values after it. For example, `1.` now shows `1`. - Fixed an issue regarding spindle speed overrides no being applied to blocks without motions. - Removed the toggle_ovr_mask system variable and replaced with spindle_stop_ovr system variable. Coolant toggles don’t need to be tracked. - Updated README
107 lines
3.7 KiB
Makefile
107 lines
3.7 KiB
Makefile
# Part of Grbl
|
|
#
|
|
# Copyright (c) 2009-2011 Simen Svale Skogsrud
|
|
# Copyright (c) 2012-2016 Sungeun K. Jeon for Gnea Research LLC
|
|
#
|
|
# Grbl 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,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# 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/>.
|
|
|
|
|
|
# This is a prototype Makefile. Modify it according to your needs.
|
|
# You should at least check the settings for
|
|
# DEVICE ....... The AVR device you compile for
|
|
# CLOCK ........ Target AVR clock rate in Hertz
|
|
# OBJECTS ...... The object files created from your source files. This list is
|
|
# usually the same as the list of source files with suffix ".o".
|
|
# PROGRAMMER ... Options to avrdude which define the hardware you use for
|
|
# uploading to the AVR and the interface where this hardware
|
|
# is connected.
|
|
# FUSES ........ Parameters for avrdude to flash the fuses appropriately.
|
|
|
|
DEVICE ?= atmega328p
|
|
CLOCK = 16000000
|
|
PROGRAMMER ?= -c avrisp2 -P usb
|
|
SOURCE = main.c motion_control.c gcode.c spindle_control.c coolant_control.c serial.c \
|
|
protocol.c stepper.c eeprom.c settings.c planner.c nuts_bolts.c limits.c jog.c\
|
|
print.c probe.c report.c system.c
|
|
BUILDDIR = build
|
|
SOURCEDIR = grbl
|
|
# FUSES = -U hfuse:w:0xd9:m -U lfuse:w:0x24:m
|
|
FUSES = -U hfuse:w:0xd2:m -U lfuse:w:0xff:m
|
|
|
|
# Tune the lines below only if you know what you are doing:
|
|
|
|
AVRDUDE = avrdude $(PROGRAMMER) -p $(DEVICE) -B 10 -F
|
|
|
|
# Compile flags for avr-gcc v4.8.1. Does not produce -flto warnings.
|
|
# COMPILE = avr-gcc -Wall -Os -DF_CPU=$(CLOCK) -mmcu=$(DEVICE) -I. -ffunction-sections
|
|
|
|
# Compile flags for avr-gcc v4.9.2 compatible with the IDE. Or if you don't care about the warnings.
|
|
COMPILE = avr-gcc -Wall -Os -DF_CPU=$(CLOCK) -mmcu=$(DEVICE) -I. -ffunction-sections -flto
|
|
|
|
|
|
OBJECTS = $(addprefix $(BUILDDIR)/,$(notdir $(SOURCE:.c=.o)))
|
|
|
|
# symbolic targets:
|
|
all: grbl.hex
|
|
|
|
$(BUILDDIR)/%.o: $(SOURCEDIR)/%.c
|
|
$(COMPILE) -MMD -MP -c $< -o $@
|
|
|
|
.S.o:
|
|
$(COMPILE) -x assembler-with-cpp -c $< -o $(BUILDDIR)/$@
|
|
# "-x assembler-with-cpp" should not be necessary since this is the default
|
|
# file type for the .S (with capital S) extension. However, upper case
|
|
# characters are not always preserved on Windows. To ensure WinAVR
|
|
# compatibility define the file type manually.
|
|
|
|
#.c.s:
|
|
$(COMPILE) -S $< -o $(BUILDDIR)/$@
|
|
|
|
flash: all
|
|
$(AVRDUDE) -U flash:w:grbl.hex:i
|
|
|
|
fuse:
|
|
$(AVRDUDE) $(FUSES)
|
|
|
|
# Xcode uses the Makefile targets "", "clean" and "install"
|
|
install: flash fuse
|
|
|
|
# if you use a bootloader, change the command below appropriately:
|
|
load: all
|
|
bootloadHID grbl.hex
|
|
|
|
clean:
|
|
rm -f grbl.hex $(BUILDDIR)/*.o $(BUILDDIR)/*.d $(BUILDDIR)/*.elf
|
|
|
|
# file targets:
|
|
$(BUILDDIR)/main.elf: $(OBJECTS)
|
|
$(COMPILE) -o $(BUILDDIR)/main.elf $(OBJECTS) -lm -Wl,--gc-sections
|
|
|
|
grbl.hex: $(BUILDDIR)/main.elf
|
|
rm -f grbl.hex
|
|
avr-objcopy -j .text -j .data -O ihex $(BUILDDIR)/main.elf grbl.hex
|
|
avr-size --format=berkeley $(BUILDDIR)/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.
|
|
|
|
# Targets for code debugging and analysis:
|
|
disasm: main.elf
|
|
avr-objdump -d $(BUILDDIR)/main.elf
|
|
|
|
cpp:
|
|
$(COMPILE) -E $(SOURCEDIR)/main.c
|
|
|
|
# include generated header dependencies
|
|
-include $(BUILDDIR)/$(OBJECTS:.o=.d)
|