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

add G10L20 capabilities #275

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

add G10L20 capabilities #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
cce8aba
Fix faulty STAT_ARC_SPECIFICATION_ERROR
lekkerkoken Dec 12, 2021
21c5515
adding G10 to canonical
lekkerkoken Jan 14, 2022
c87d3a8
Update canonical_machine.h
lekkerkoken Jan 14, 2022
75b0185
plan_arc_fix
lekkerkoken Jan 14, 2022
098ce46
adding G10 to canonical
lekkerkoken Jan 14, 2022
45c10bd
canonical_machine update for G10 L20
lekkerkoken Jan 14, 2022
9e754f0
Merge branch 'g10l20-v1' of https://github.com/lekkerkoken/TinyG into…
lekkerkoken Jan 14, 2022
ded246c
Change origin_offsets name to g92_offsets
lekkerkoken Jan 15, 2022
35cb734
work_offset and work_position changed to display--
lekkerkoken Jan 15, 2022
97b8650
Debugging-g10l20-on-tinyg
lekkerkoken Jan 17, 2022
0ecf47b
Compensating lack of gcodeflags_t type.
lekkerkoken Jan 20, 2022
9c101b9
Debugging finished
lekkerkoken Jan 21, 2022
8e951b9
Release 440.22
lekkerkoken Jan 21, 2022
d627747
Remove plan arc zero length error
lekkerkoken Mar 5, 2022
2cab90f
Remove Mistake of bitwise &
Mar 5, 2022
8ff9a5d
Merge branch 'debugging-g10l20-checking-g0x1-3'
Mar 11, 2022
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
14,920 changes: 7,472 additions & 7,448 deletions firmware/tinyg/Debug/tinyg.hex
View file
Open in desktop

Large diffs are not rendered by default.

92 changes: 66 additions & 26 deletions firmware/tinyg/Release/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Automatically-generated file. Do not edit!
################################################################################


SHELL := cmd.exe
RM := rm -rf

USER_OBJS :=
Expand All @@ -29,6 +29,7 @@ QUOTE := "
ADDITIONAL_DEPENDENCIES:=
OUTPUT_FILE_DEP:=
LIB_DEP:=
LINKER_SCRIPT_DEP:=

# Every subdirectory with source files must be described here
SUBDIRS := \
Expand All @@ -45,7 +46,9 @@ C_SRCS += \
../config_app.c \
../controller.c \
../cycle_homing.c \
../cycle_jogging.c \
../cycle_probing.c \
../encoder.c \
../gcode_parser.c \
../gpio.c \
../hardware.c \
Expand All @@ -54,9 +57,12 @@ C_SRCS += \
../kinematics.c \
../main.c \
../network.c \
../persistence.c \
../planner.c \
../plan_arc.c \
../plan_exec.c \
../plan_line.c \
../plan_zoid.c \
../pwm.c \
../report.c \
../spindle.c \
Expand All @@ -65,7 +71,7 @@ C_SRCS += \
../test.c \
../text_parser.c \
../util.c \
../xio/xio.c \
../xio.c \
../xio/xio_file.c \
../xio/xio_pgm.c \
../xio/xio_rs485.c \
Expand All @@ -90,7 +96,9 @@ config.o \
config_app.o \
controller.o \
cycle_homing.o \
cycle_jogging.o \
cycle_probing.o \
encoder.o \
gcode_parser.o \
gpio.o \
hardware.o \
Expand All @@ -99,9 +107,12 @@ json_parser.o \
kinematics.o \
main.o \
network.o \
persistence.o \
planner.o \
plan_arc.o \
plan_exec.o \
plan_line.o \
plan_zoid.o \
pwm.o \
report.o \
spindle.o \
Expand All @@ -110,7 +121,7 @@ switch.o \
test.o \
text_parser.o \
util.o \
xio/xio.o \
xio.o \
xio/xio_file.o \
xio/xio_pgm.o \
xio/xio_rs485.o \
Expand All @@ -122,14 +133,15 @@ xmega/xmega_init.o \
xmega/xmega_interrupts.o \
xmega/xmega_rtc.o


OBJS_AS_ARGS += \
canonical_machine.o \
config.o \
config_app.o \
controller.o \
cycle_homing.o \
cycle_jogging.o \
cycle_probing.o \
encoder.o \
gcode_parser.o \
gpio.o \
hardware.o \
Expand All @@ -138,9 +150,12 @@ json_parser.o \
kinematics.o \
main.o \
network.o \
persistence.o \
planner.o \
plan_arc.o \
plan_exec.o \
plan_line.o \
plan_zoid.o \
pwm.o \
report.o \
spindle.o \
Expand All @@ -149,7 +164,7 @@ switch.o \
test.o \
text_parser.o \
util.o \
xio/xio.o \
xio.o \
xio/xio_file.o \
xio/xio_pgm.o \
xio/xio_rs485.o \
Expand All @@ -161,14 +176,15 @@ xmega/xmega_init.o \
xmega/xmega_interrupts.o \
xmega/xmega_rtc.o


C_DEPS += \
canonical_machine.d \
config.d \
config_app.d \
controller.d \
cycle_homing.d \
cycle_jogging.d \
cycle_probing.d \
encoder.d \
gcode_parser.d \
gpio.d \
hardware.d \
Expand All @@ -177,9 +193,12 @@ json_parser.d \
kinematics.d \
main.d \
network.d \
persistence.d \
planner.d \
plan_arc.d \
plan_exec.d \
plan_line.d \
plan_zoid.d \
pwm.d \
report.d \
spindle.d \
Expand All @@ -188,7 +207,7 @@ switch.d \
test.d \
text_parser.d \
util.d \
xio/xio.d \
xio.d \
xio/xio_file.d \
xio/xio_pgm.d \
xio/xio_rs485.d \
Expand All @@ -200,14 +219,15 @@ xmega/xmega_init.d \
xmega/xmega_interrupts.d \
xmega/xmega_rtc.d


C_DEPS_AS_ARGS += \
canonical_machine.d \
config.d \
config_app.d \
controller.d \
cycle_homing.d \
cycle_jogging.d \
cycle_probing.d \
encoder.d \
gcode_parser.d \
gpio.d \
hardware.d \
Expand All @@ -216,9 +236,12 @@ json_parser.d \
kinematics.d \
main.d \
network.d \
persistence.d \
planner.d \
plan_arc.d \
plan_exec.d \
plan_line.d \
plan_zoid.d \
pwm.d \
report.d \
spindle.d \
Expand All @@ -227,7 +250,7 @@ switch.d \
test.d \
text_parser.d \
util.d \
xio/xio.d \
xio.d \
xio/xio_file.d \
xio/xio_pgm.d \
xio/xio_rs485.d \
Expand All @@ -239,7 +262,6 @@ xmega/xmega_init.d \
xmega/xmega_interrupts.d \
xmega/xmega_rtc.d


OUTPUT_FILE_PATH +=tinyg.elf

OUTPUT_FILE_PATH_AS_ARGS +=tinyg.elf
Expand All @@ -250,6 +272,9 @@ OUTPUT_FILE_DEP:= ./makedep.mk

LIB_DEP+=

LINKER_SCRIPT_DEP+=


# AVR32/GNU C Compiler


Expand Down Expand Up @@ -313,6 +338,16 @@ LIB_DEP+=
















Expand All @@ -326,21 +361,24 @@ LIB_DEP+=

./%.o: .././%.c
@echo Building file: $<
@echo Invoking: AVR/GNU C Compiler :
$(QUOTE)C:\Program Files\Atmel\Atmel Toolchain\AVR8 GCC\Native\3.4.2.876\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -funsigned-char -funsigned-bitfields -Os -ffunction-sections -fpack-struct -fshort-enums -Wall -mmcu=atxmega192a3 -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o"$@" "$<"
@echo Invoking: AVR/GNU C Compiler : 4.8.1
$(QUOTE)C:\Program Files (x86)\Atmel\Atmel Toolchain\AVR8 GCC\Native\3.4.1061\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DF_CPU=32000000UL -O2 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -Wall -mmcu=atxmega192a3 -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<"
@echo Finished building: $<


xio/%.o: ../xio/%.c
@echo Building file: $<
@echo Invoking: AVR/GNU C Compiler :
$(QUOTE)C:\Program Files\Atmel\Atmel Toolchain\AVR8 GCC\Native\3.4.2.876\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -funsigned-char -funsigned-bitfields -Os -ffunction-sections -fpack-struct -fshort-enums -Wall -mmcu=atxmega192a3 -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o"$@" "$<"
@echo Invoking: AVR/GNU C Compiler : 4.8.1
$(QUOTE)C:\Program Files (x86)\Atmel\Atmel Toolchain\AVR8 GCC\Native\3.4.1061\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DF_CPU=32000000UL -O2 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -Wall -mmcu=atxmega192a3 -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<"
@echo Finished building: $<


xmega/%.o: ../xmega/%.c
@echo Building file: $<
@echo Invoking: AVR/GNU C Compiler :
$(QUOTE)C:\Program Files\Atmel\Atmel Toolchain\AVR8 GCC\Native\3.4.2.876\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -funsigned-char -funsigned-bitfields -Os -ffunction-sections -fpack-struct -fshort-enums -Wall -mmcu=atxmega192a3 -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o"$@" "$<"
@echo Invoking: AVR/GNU C Compiler : 4.8.1
$(QUOTE)C:\Program Files (x86)\Atmel\Atmel Toolchain\AVR8 GCC\Native\3.4.1061\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -x c -funsigned-char -funsigned-bitfields -DF_CPU=32000000UL -O2 -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -Wall -mmcu=atxmega192a3 -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -o "$@" "$<"
@echo Finished building: $<




Expand All @@ -364,16 +402,17 @@ endif
# All Target
all: $(OUTPUT_FILE_PATH) $(ADDITIONAL_DEPENDENCIES)

$(OUTPUT_FILE_PATH): $(OBJS) $(USER_OBJS) $(OUTPUT_FILE_DEP) $(LIB_DEP)
$(OUTPUT_FILE_PATH): $(OBJS) $(USER_OBJS) $(OUTPUT_FILE_DEP) $(LIB_DEP) $(LINKER_SCRIPT_DEP)
@echo Building target: $@
@echo Invoking: AVR/GNU Linker :
$(QUOTE)C:\Program Files\Atmel\Atmel Toolchain\AVR8 GCC\Native\3.4.2.876\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -o$(OUTPUT_FILE_PATH_AS_ARGS) $(OBJS_AS_ARGS) $(USER_OBJS) $(LIBS) -Wl,-Map="tinyg.map" -Wl,--start-group -Wl,-lm -Wl,--end-group -Wl,--gc-sections -mmcu=atxmega192a3
@echo Invoking: AVR/GNU Linker : 4.8.1
$(QUOTE)C:\Program Files (x86)\Atmel\Atmel Toolchain\AVR8 GCC\Native\3.4.1061\avr8-gnu-toolchain\bin\avr-gcc.exe$(QUOTE) -o$(OUTPUT_FILE_PATH_AS_ARGS) $(OBJS_AS_ARGS) $(USER_OBJS) $(LIBS) -Wl,-Map="tinyg.map" -Wl,-u,vfprintf -Wl,--start-group -Wl,-lm -Wl,-lprintf_flt -Wl,--end-group -Wl,--gc-sections -mmcu=atxmega192a3
@echo Finished building target: $@
"C:\Program Files\Atmel\Atmel Toolchain\AVR8 GCC\Native\3.4.2.876\avr8-gnu-toolchain\bin\avr-objcopy.exe" -O ihex -R .eeprom -R .fuse -R .lock -R .signature "tinyg.elf" "tinyg.hex"
"C:\Program Files\Atmel\Atmel Toolchain\AVR8 GCC\Native\3.4.2.876\avr8-gnu-toolchain\bin\avr-objcopy.exe" -j .eeprom --set-section-flags=.eeprom=alloc,load --change-section-lma .eeprom=0 --no-change-warnings -O ihex "tinyg.elf" "tinyg.eep" || exit 0
"C:\Program Files\Atmel\Atmel Toolchain\AVR8 GCC\Native\3.4.2.876\avr8-gnu-toolchain\bin\avr-objdump.exe" -h -S "tinyg.elf" > "tinyg.lss"
"C:\Program Files\Atmel\Atmel Toolchain\AVR8 GCC\Native\3.4.2.876\avr8-gnu-toolchain\bin\avr-objcopy.exe" -O srec -R .eeprom -R .fuse -R .lock -R .signature "tinyg.elf" "tinyg.srec"
"C:\Program Files\Atmel\Atmel Toolchain\AVR8 GCC\Native\3.4.2.876\avr8-gnu-toolchain\bin\avr-size.exe" "tinyg.elf"
"C:\Program Files (x86)\Atmel\Atmel Toolchain\AVR8 GCC\Native\3.4.1061\avr8-gnu-toolchain\bin\avr-objcopy.exe" -O ihex -R .eeprom -R .fuse -R .lock -R .signature -R .user_signatures "tinyg.elf" "tinyg.hex"
"C:\Program Files (x86)\Atmel\Atmel Toolchain\AVR8 GCC\Native\3.4.1061\avr8-gnu-toolchain\bin\avr-objcopy.exe" -j .eeprom --set-section-flags=.eeprom=alloc,load --change-section-lma .eeprom=0 --no-change-warnings -O ihex "tinyg.elf" "tinyg.eep" || exit 0
"C:\Program Files (x86)\Atmel\Atmel Toolchain\AVR8 GCC\Native\3.4.1061\avr8-gnu-toolchain\bin\avr-objdump.exe" -h -S "tinyg.elf" > "tinyg.lss"
"C:\Program Files (x86)\Atmel\Atmel Toolchain\AVR8 GCC\Native\3.4.1061\avr8-gnu-toolchain\bin\avr-objcopy.exe" -O srec -R .eeprom -R .fuse -R .lock -R .signature -R .user_signatures "tinyg.elf" "tinyg.srec"
"C:\Program Files (x86)\Atmel\Atmel Toolchain\AVR8 GCC\Native\3.4.1061\avr8-gnu-toolchain\bin\avr-size.exe" "tinyg.elf"




Expand All @@ -382,6 +421,7 @@ $(OUTPUT_FILE_PATH): $(OBJS) $(USER_OBJS) $(OUTPUT_FILE_DEP) $(LIB_DEP)

# Other Targets
clean:
-$(RM) $(OBJS_AS_ARGS)$(C_DEPS_AS_ARGS) $(EXECUTABLES)
rm -rf "tinyg.elf" "tinyg.a" "tinyg.hex" "tinyg.lss" "tinyg.eep" "tinyg.map" "tinyg.srec"
-$(RM) $(OBJS_AS_ARGS) $(EXECUTABLES)
-$(RM) $(C_DEPS_AS_ARGS)
rm -rf "tinyg.elf" "tinyg.a" "tinyg.hex" "tinyg.lss" "tinyg.eep" "tinyg.map" "tinyg.srec" "tinyg.usersignatures"

12 changes: 11 additions & 1 deletion firmware/tinyg/Release/makedep.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,12 @@ controller.c

cycle_homing.c

cycle_jogging.c

cycle_probing.c

encoder.c

gcode_parser.c

gpio.c
Expand All @@ -30,12 +34,18 @@ main.c

network.c

persistence.c

planner.c

plan_arc.c

plan_exec.c

plan_line.c

plan_zoid.c

pwm.c

report.c
Expand All @@ -52,7 +62,7 @@ text_parser.c

util.c

xio\xio.c
xio.c

xio\xio_file.c

Expand Down
Loading