july24_teacup_diff

Binary files /Users/jeremy/Desktop/Teacup_Firmware/.DS_Store and /Volumes/Home/Desktop/Teacup_Firmware/.DS_Store differ
Common subdirectories: /Users/jeremy/Desktop/Teacup_Firmware/.git and /Volumes/Home/Desktop/Teacup_Firmware/.git
Common subdirectories: /Users/jeremy/Desktop/Teacup_Firmware/LUFA and /Volumes/Home/Desktop/Teacup_Firmware/LUFA
diff /Users/jeremy/Desktop/Teacup_Firmware/ThermistorTable.h /Volumes/Home/Desktop/Teacup_Firmware/ThermistorTable.h
7c7
< // #define THERMISTOR_BED		1
---
> #define THERMISTOR_BED		1
49a50
>
diff /Users/jeremy/Desktop/Teacup_Firmware/config.h /Volumes/Home/Desktop/Teacup_Firmware/config.h
56,57c56,57
< #define	STEPS_PER_MM_X				320.000
< #define	STEPS_PER_MM_Y				320.000
---
> #define	STEPS_PER_MM_X				40.764914893/2 //320.000
> #define	STEPS_PER_MM_Y				40.764914893/2 //320.000
61c61
< #define	STEPS_PER_MM_E				320.000
---
> #define	STEPS_PER_MM_E				2.704 //320.000
72,73c72,73
< #define	MAXIMUM_FEEDRATE_X		200
< #define	MAXIMUM_FEEDRATE_Y		200
---
> #define	MAXIMUM_FEEDRATE_X		2000 //200
> #define	MAXIMUM_FEEDRATE_Y		2000 //200
75c75
< #define	MAXIMUM_FEEDRATE_E		200
---
> #define	MAXIMUM_FEEDRATE_E		2000
80c80
< #define	SEARCH_FEEDRATE_Z			50
---
> #define	SEARCH_FEEDRATE_Z			20 //50
92c92
< #define	X_MAX			200.0
---
> #define	X_MAX			140.0 //200.0
95c95
< #define	Y_MAX			200.0
---
> #define	Y_MAX			120.0 //200.0
98c98
< #define	Z_MAX			140.0
---
> #define	Z_MAX			90.0 //140.0
103c103
< // #define E_ABSOLUTE
---
> #define E_ABSOLUTE
121c121
< // #define ACCELERATION_REPRAP
---
> //#define ACCELERATION_REPRAP
131c131
< #define ACCELERATION 10.
---
> #define ACCELERATION 50.
167c167
< //#define USE_INTERNAL_PULLUPS
---
> #define USE_INTERNAL_PULLUPS
175,177c175,177
< #define	X_STEP_PIN						AIO0
< #define	X_DIR_PIN							AIO1
< #define	X_MIN_PIN							AIO2
---
> #define	X_STEP_PIN						DIO3	//AIO0
> #define	X_DIR_PIN						DIO2	//AIO1
> #define	X_MIN_PIN						AIO1	//AIO2
185,187c185,187
< #define	Y_STEP_PIN						AIO3
< #define	Y_DIR_PIN							AIO4
< #define	Y_MIN_PIN							AIO5
---
> #define	Y_STEP_PIN						DIO5 //AIO3
> #define	Y_DIR_PIN						DIO4 //AIO4
> #define	Y_MIN_PIN						AIO2 //AIO5
195,197c195,197
< #define	Z_STEP_PIN						DIO2
< #define	Z_DIR_PIN							DIO3
< #define	Z_MIN_PIN							DIO4
---
> #define	Z_STEP_PIN						AIO4 //DIO2
> #define	Z_DIR_PIN						DIO7 //DIO3
> #define	Z_MIN_PIN						AIO3 //DIO4
200c200
< //#define	Z_INVERT_DIR
---
> #define	Z_INVERT_DIR
205,206c205,206
< #define	E_STEP_PIN						DIO7
< #define	E_DIR_PIN							DIO8
---
> #define	E_STEP_PIN						DIO11 //DIO7
> #define	E_DIR_PIN						DIO8 //DIO8
210c210
< #define	PS_ON_PIN							DIO9
---
> //#define	PS_ON_PIN							DIO9
254,256c254,256
< //                 name       type          pin		additional
< DEFINE_TEMP_SENSOR(extruder,	TT_THERMISTOR,		0,	THERMISTOR_EXTRUDER)
< // DEFINE_TEMP_SENSOR(bed,				TT_THERMISTOR,	1,	THERMISTOR_EXTRUDER)
---
> //         name       		type          		pin		additional
> DEFINE_TEMP_SENSOR(extruder,	TT_THERMISTOR,		AIO0_PIN,	THERMISTOR_EXTRUDER)
> DEFINE_TEMP_SENSOR(bed,		TT_THERMISTOR,		AIO5_PIN,	THERMISTOR_EXTRUDER)
299,300c299,300
< DEFINE_HEATER(extruder,	PB3)
< DEFINE_HEATER(bed,			PB4)
---
> DEFINE_HEATER(extruder,	 	PD6)
> DEFINE_HEATER(bed,		DIO13)
Only in /Users/jeremy/Desktop/Teacup_Firmware/: config.ramps.h
Common subdirectories: /Users/jeremy/Desktop/Teacup_Firmware/extruder and /Volumes/Home/Desktop/Teacup_Firmware/extruder
Common subdirectories: /Users/jeremy/Desktop/Teacup_Firmware/lufa_serial and /Volumes/Home/Desktop/Teacup_Firmware/lufa_serial
diff /Users/jeremy/Desktop/Teacup_Firmware/temp.c /Volumes/Home/Desktop/Teacup_Firmware/temp.c
352c352
< 	sersendf_P(PSTR("\nT:%u.%u"), temp_sensors_runtime[index].last_read_temp >> 2, c);
---
> 	sersendf_P(PSTR("T:%u.%u"), temp_sensors_runtime[index].last_read_temp >> 2, c);