440.15 master candidate

.gitignore

@@ -1 +1,8 @@
-firmware/tinyg/default/path
+<<<<<<< HEAD
+firmware/tinyg/default/path
+=======
+firmware/tinyg/Release/Makefile
+firmware/tinyg/Release/makedep.mk
+firmware/tinyg/default/path
+tinyg.hex
+>>>>>>> refs/heads/edge

firmware/.gitattributes

@@ -0,0 +1 @@
+*.hex binary

firmware/.gitignore

@@ -1,12 +1,24 @@
 *.o
 *.d
 *.elf
+<<<<<<< HEAD
 *.map
 *.srec
 *.lss
 *.map
 *.aws
 *.atsuo
 *.eep
+=======
+*.hex
+*.pyc
+*.map
+*.eep
+*.lss
+*.map
+*.srec
+*.aws
+*.atsuo
+>>>>>>> refs/heads/edge
 .DS_Store
 TcfTransactionLog.csv

firmware/tinyg.xcodeproj/.gitignore

@@ -0,0 +1,2 @@
+project.xcworkspace
+xcuserdata

firmware/tinyg/Debug/Makefile

@@ -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 :=  \
@@ -42,26 +43,35 @@ SUBDIRS :=  \
 C_SRCS +=  \
 ../canonical_machine.c \
 ../config.c \
+../config_app.c \
 ../controller.c \
 ../cycle_homing.c \
+../cycle_jogging.c \
+../cycle_probing.c \
+../encoder.c \
 ../gcode_parser.c \
 ../gpio.c \
+../hardware.c \
 ../help.c \
 ../json_parser.c \
 ../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 \
 ../stepper.c \
-../system.c \
+../switch.c \
 ../test.c \
+../text_parser.c \
 ../util.c \
-../xio/xio.c \
+../xio.c \
 ../xio/xio_file.c \
 ../xio/xio_pgm.c \
 ../xio/xio_rs485.c \
@@ -83,26 +93,35 @@ ASM_SRCS +=
 OBJS +=  \
 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 \
 help.o \
 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 \
 stepper.o \
-system.o \
+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 \
@@ -114,30 +133,38 @@ 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 \
 help.o \
 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 \
 stepper.o \
-system.o \
+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 \
@@ -149,30 +176,38 @@ 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 \
 help.d \
 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 \
 stepper.d \
-system.d \
+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 \
@@ -184,30 +219,38 @@ 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 \
 help.d \
 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 \
 stepper.d \
-system.d \
+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 \
@@ -219,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
@@ -230,6 +272,9 @@ OUTPUT_FILE_DEP:= ./makedep.mk
 
 LIB_DEP+= 
 
+LINKER_SCRIPT_DEP+= 
+
+
 # AVR32/GNU C Compiler
 
 
@@ -277,6 +322,24 @@ LIB_DEP+=
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -298,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 -DF_CPU=32000000UL  -Os -ffunction-sections -fpack-struct -fshort-enums -g2 -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\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 -fno-align-functions  -fno-align-jumps  -fno-align-loops -fno-align-labels -fno-reorder-blocks -fno-reorder-blocks-and-partition -fno-prefetch-loop-arrays -fno-tree-vect-loop-version -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -g2 -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 -DF_CPU=32000000UL  -Os -ffunction-sections -fpack-struct -fshort-enums -g2 -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\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 -fno-align-functions  -fno-align-jumps  -fno-align-loops -fno-align-labels -fno-reorder-blocks -fno-reorder-blocks-and-partition -fno-prefetch-loop-arrays -fno-tree-vect-loop-version -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -g2 -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 -DF_CPU=32000000UL  -Os -ffunction-sections -fpack-struct -fshort-enums -g2 -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\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 -fno-align-functions  -fno-align-jumps  -fno-align-loops -fno-align-labels -fno-reorder-blocks -fno-reorder-blocks-and-partition -fno-prefetch-loop-arrays -fno-tree-vect-loop-version -ffunction-sections -fdata-sections -fpack-struct -fshort-enums -g2 -Wall -mmcu=atxmega192a3 -c -std=gnu99 -MD -MP -MF "$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)"   -o "$@" "$<" 
 	@echo Finished building: $<
+
 
 
 
@@ -336,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,-u,vfprintf -Wl,--start-group -Wl,-lprintf_flt -Wl,-lm  -Wl,--end-group -Wl,--gc-sections -mmcu=atxmega192a3 
+	@echo Invoking: AVR/GNU Linker : 4.8.1
+	$(QUOTE)C:\Program Files\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\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\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\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\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\Atmel\Atmel Toolchain\AVR8 GCC\Native\3.4.1061\avr8-gnu-toolchain\bin\avr-size.exe" "tinyg.elf"
+
 
 
 
@@ -354,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"