From: Bernhard Tittelbach <xro@realraum.at>
Date: Wed, 10 Jul 2013 14:12:48 +0000 (+0000)
Subject: reprap config.h und slic3r config
X-Git-Url: https://git.realraum.at/?a=commitdiff_plain;h=a501b777105ebdc03cbfdaa7be9a69f3898e46e8;p=reprap_mendel_prusa.git

reprap config.h und slic3r config
---

diff --git a/teacup_firmware/config.h b/teacup_firmware/config.h
index 4f015d9..696ac55 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 7960.0
+#define	STEPS_PER_M_Y					7960
 //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,9 +89,7 @@
 // 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:
+//experimentell (ohne Düse) mit 200mm:
 #define	STEPS_PER_M_E	99455
 
 
@@ -133,7 +132,7 @@
 #define	X_MAX			180.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
@@ -396,6 +395,7 @@ 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_FAN 2
 
 
 
diff --git a/teacup_firmware/extruder/config.h b/teacup_firmware/extruder/config.h
index 8faa6e8..42a9313 100644
--- a/teacup_firmware/extruder/config.h
+++ b/teacup_firmware/extruder/config.h
@@ -78,9 +78,10 @@ DEFINE_TEMP_SENSOR(noheater,	TT_THERMISTOR,		TRIM_POT_CHANNEL,		0)
 //~ //original code
 //~ DEFINE_HEATER(extruder,	DIO11)
 //~ DEFINE_HEATER(bed,			AIO1)
-// r3: exchange HEATER and BED (we don't have bed right now, and heater-mosfet is shot)
+// r3: exchange HEATER and BED
 DEFINE_HEATER(extruder,	AIO1)
 DEFINE_HEATER(bed,			DIO11)
+DEFINE_HEATER(fan,			DIO12)
 #endif
 
 // list of PWM-able pins and corresponding timers