From: Bernhard Tittelbach <xro@realraum.at>
Date: Fri, 12 Jul 2013 08:18:54 +0000 (+0000)
Subject: reprap improvements
X-Git-Url: https://git.realraum.at/?a=commitdiff_plain;h=4d9a26119df1308969a802bb6ed2ee84f35b7ffe;p=reprap_mendel_prusa.git

reprap improvements
---

diff --git a/notes.txt b/notes.txt
index 41ee8d9..12b3377 100644
--- a/notes.txt
+++ b/notes.txt
@@ -7,7 +7,3 @@ Slic3r Gcode Generator:
 PrintRun Frontend
   https://github.com/kliment/Printrun
 
-
-Problems with Teacup:
-Gcode "M116" aka "Wait until temperature reached" kann ewig hängen.
-Besser die Temperatur manuell einstellen, M116 vom Gcode entfernen und dann drucken.
diff --git a/teacup_firmware/config.h b/teacup_firmware/config.h
index c19a502..1c685a3 100644
--- a/teacup_firmware/config.h
+++ b/teacup_firmware/config.h
@@ -129,7 +129,7 @@
 #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			195.0
@@ -280,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
@@ -326,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
@@ -394,7 +394,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_BED 1
 #define HEATER_FAN 2
 
 
diff --git a/teacup_firmware/extruder/config.h b/teacup_firmware/extruder/config.h
index 42a9313..a531d43 100644
--- a/teacup_firmware/extruder/config.h
+++ b/teacup_firmware/extruder/config.h
@@ -54,14 +54,14 @@
 
 #define	TEMP_THERMISTOR
 
-//~ //original code
-//~ #define	HEATER_PIN	DIO11
-//~ #define BED_PIN		AIO1
-//~ #define FAN_PIN		DIO12
-// r3: exchange HEATER and BED (we don't have bed right now, and heater-mosfet is shot)
-#define	BED_PIN	DIO11
-#define HEATER_PIN		AIO1
-#define FAN_PIN		DIO12
+//e.e.: TechZoneRemix Gen3 Extruder Board:
+// 12V screw terminal C: DIO12
+// 12V screw terminal B: DIO11
+// 12V screw terminal A: AIO1
+
+#define HEATER_PIN	DIO12
+#define BED_PIN		AIO1
+#define FAN_PIN		DIO11
 
 // extruder settings
 #define	TEMP_HYSTERESIS				5
@@ -73,15 +73,14 @@ DEFINE_TEMP_SENSOR(bed,			TT_THERMISTOR,		TEMP_BED_PIN_CHANNEL,	THERMISTOR_EXTRU
 // dummy temp sensor so analog_mask includes trim pot
 DEFINE_TEMP_SENSOR(noheater,	TT_THERMISTOR,		TRIM_POT_CHANNEL,		0)
 #endif
-
+// DEFINE_HEATER(<name>, <pin>, <fan startup threshold pwm value>)
+// fan startup threshold: FANs usually take more power to start spinning than to keep spinning,
+//                        so, below a given pwm value we start the fan with full power and after
+//                        50ms lower the output to the requested value.
 #ifdef	DEFINE_HEATER
-//~ //original code
-//~ DEFINE_HEATER(extruder,	DIO11)
-//~ DEFINE_HEATER(bed,			AIO1)
-// r3: exchange HEATER and BED
-DEFINE_HEATER(extruder,	AIO1)
-DEFINE_HEATER(bed,			DIO11)
-DEFINE_HEATER(fan,			DIO12)
+DEFINE_HEATER(extruder,	DIO12, 0)
+DEFINE_HEATER(bed,			AIO1, 0)
+DEFINE_HEATER(fan,			DIO11, 150)
 #endif
 
 // list of PWM-able pins and corresponding timers