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

diff --git a/teacup_firmware/config.h b/teacup_firmware/config.h
index 4f015d9..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
@@ -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
@@ -395,7 +394,8 @@ DEFINE_TEMP_SENSOR(bed,       TT_INTERCOM,    AIO1,      0)
 
 // workaround for heated bed over intercom. HEATER_EXTRUDER, HEATER_BED are the intercom temp channel numbers.
 #define	HEATER_EXTRUDER 0
-#define HEATER_BED 1
+//~ #define HEATER_BED 1
+#define HEATER_FAN 2