X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=teacup_firmware%2Fconfig.h;h=1c685a367b860915af6e17a068b8b623e2e7d83e;hb=4d9a26119df1308969a802bb6ed2ee84f35b7ffe;hp=9a32a763cedaac8e5692dd8df035956ca2f3772f;hpb=0838a4eb18086ac0d03612b977a451a9286a34f2;p=reprap_mendel_prusa.git

diff --git a/teacup_firmware/config.h b/teacup_firmware/config.h
index 9a32a76..1c685a3 100644
--- a/teacup_firmware/config.h
+++ b/teacup_firmware/config.h
@@ -64,13 +64,14 @@
 */
 //#define	STEPS_PER_M_X					10047
 //#define	STEPS_PER_M_X					8000
-//rechnerisch 8000, experimentell auf der X-Achse 7684.8395
-#define	STEPS_PER_M_X				    7685
+//rechnerisch 8000, experimentell auf der X-Achse 8963.59
+//rechnerisch 8000, experimentell auf der X-Achse 8075.67
+#define	STEPS_PER_M_X				    8050
 // 200 steps / 20 gearteeth / 2.5mm (abtsand zahnriemen-zähne)
 //#define	STEPS_PER_M_Y					10047
 //#define	STEPS_PER_M_Y					8000
-//rechnerisch 8000, experimentell auf der Y-Achse 6766.1691
-#define	STEPS_PER_M_Y					6766
+//rechnerisch 8000, experimentell auf der Y-Achse 8164.0
+#define	STEPS_PER_M_Y					8164
 //160000 für single step mit M8 Muttern, 320000 für half-step mit M8 Muttern
 //200 steps / 1.25 * 1000 * 2
 #define	STEPS_PER_M_Z					320000
@@ -88,10 +89,8 @@
 // Extruder gear ratio Gr = 14.0 / 43.0
 // STEPS_PER_M_E = 1m / (Gr * u_schraube) * motor_steps ¨~= 27933
 //#define	STEPS_PER_M_E		27933
-//experimentell 220mm:
-//#define	STEPS_PER_M_E	109400  
-//experimentell 200mm:
-#define	STEPS_PER_M_E	99455
+//experimentell (ohne Düse): 99455 previousvalue *(200.0mm software/194.0mm echt) = 102530.93
+#define	STEPS_PER_M_E	102531
 
 
 /*
@@ -130,10 +129,10 @@
 #define	X_MIN			0.0
 // eigentlich 184mm, aber wir lassen uns ein bisschen Sicherheitsabstand
 //#define	X_MAX			184.0
-#define	X_MAX			180.0
+#define	X_MAX			177.0
 
 #define	Y_MIN			0.0
-#define	Y_MAX			220.0
+#define	Y_MAX			195.0
 
 #define	Z_MIN			0.0
 #define	Z_MAX			125.0
@@ -143,7 +142,7 @@
 
 	This is the startup default and can be changed with M82/M83 while running.
 */
-// #define E_ABSOLUTE
+#define E_ABSOLUTE
 
 
 
@@ -230,8 +229,8 @@
 
 #define	Y_STEP_PIN						DIO23
 #define	Y_DIR_PIN							DIO22
-//~ #define	Y_MIN_PIN							AIO6
-#define	Y_MAX_PIN							AIO5
+#define	Y_MIN_PIN							AIO6
+//~ #define	Y_MAX_PIN							AIO5
 #define	Y_ENABLE_PIN					AIO7
 //#define	Y_INVERT_DIR
 //~ #define	Y_INVERT_MIN
@@ -258,7 +257,7 @@
 #define	SD_WRITE_PROTECT			DIO3
 
 //#define	PS_ON_PIN							DIO14
-#define	PS_ON_PIN							PC5 // on TechZoneComm Motherboard, JTAG Port, TDI Pin
+#define	PS_ON_PIN							PB5 // on TechZoneComm Motherboard, SPI Port: MOSI
 //#define	STEPPER_ENABLE_PIN		xxxx
 //#define	STEPPER_INVERT_ENABLE
 
@@ -281,7 +280,7 @@
 	set temperature +- TEMP_HYSTERESIS) for this long before target is achieved
 	(and a M116 succeeds). Unit is seconds.
 */
-#define	TEMP_RESIDENCY_TIME		60
+#define	TEMP_RESIDENCY_TIME		30
 
 /**
   TEMP_EWMA: Smooth noisy temperature sensors. Good hardware shouldn't be
@@ -327,7 +326,7 @@
 
 //                 name       type            pin        additional
 DEFINE_TEMP_SENSOR(noheater,  TT_INTERCOM,    AIO0,      0)
-DEFINE_TEMP_SENSOR(bed,       TT_INTERCOM,    AIO1,      0)
+//DEFINE_TEMP_SENSOR(bed,       TT_INTERCOM,    AIO1,      0)
 
 // bed has no heater attached
 #define HEATER_bed HEATER_noheater
@@ -393,11 +392,10 @@ DEFINE_TEMP_SENSOR(bed,       TT_INTERCOM,    AIO1,      0)
 	I have searched high and low for a way to make the preprocessor do this for us, but so far I have not found a way.
 */
 
-//#define	HEATER_EXTRUDER HEATER_extruder
+// workaround for heated bed over intercom. HEATER_EXTRUDER, HEATER_BED are the intercom temp channel numbers.
 #define	HEATER_EXTRUDER 0
-
-// workaround for heated bed over intercom. HEATER_BED is the intercom temp channel number.
-#define HEATER_BED 1
+//~ #define HEATER_BED 1
+#define HEATER_FAN 2