reprap teacup firmware config update

diff --git a/teacup_firmware/config.h b/teacup_firmware/config.h
index bab04fe..6fbaa3c 100644 (file)
--- a/teacup_firmware/config.h
+++ b/teacup_firmware/config.h
@@ -75,9 +75,23 @@
 #define        STEPS_PER_M_Z                                   320000
 
 /// http://blog.arcol.hu/?p=157 may help with this one
-#define        STEPS_PER_M_E                                   35200
+//#define      STEPS_PER_M_E                                   35200
 // Extruder gear ratio Gr = 14.0 / 43.0
-// Extruder nozzle diameter = 0.5 (? oder 0.35, oder 0.25)
+// Extruder nozzle diameter = 0.5mm (bzw 0.35mm mit unserer anderen Düse)
+// Filament Width = 3mm
+
+
+// d_schraube ~= 0.007m
+// u_schraube = d_schraube * pi ~= 0.022m
+// motor_steps for 1 circumfence = 200
+// 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
+
 
 /*
        Values depending on the capabilities of your stepper motors and other mechanics.
@@ -204,7 +218,7 @@
 #define        X_STEP_PIN                                              DIO15
 #define        X_DIR_PIN                                                       DIO18
 //~ #define    X_MIN_PIN                                                       DIO20
-//~ #define    X_MAX_PIN                                                       DIO21
+#define        X_MAX_PIN                                                       DIO21
 #define        X_ENABLE_PIN                                    DIO19
 //#define      X_INVERT_DIR
 //~ #define    X_INVERT_MIN
@@ -241,7 +255,7 @@
 #define        SD_WRITE_PROTECT                        DIO3
 
 //#define      PS_ON_PIN                                                       DIO14
-#define        PS_ON_PIN                                                       PD4 // on TCC Motherboard, JTAG Port, TDI Pin
+#define        PS_ON_PIN                                                       PD4 // on TechZoneComm Motherboard, JTAG Port, TDI Pin
 //#define      STEPPER_ENABLE_PIN              xxxx
 //#define      STEPPER_INVERT_ENABLE
 
@@ -376,7 +390,8 @@ 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
+//#define      HEATER_EXTRUDER HEATER_extruder
+#define        HEATER_EXTRUDER 0
 
 // workaround for heated bed over intercom. HEATER_BED is the intercom temp channel number.
 #define HEATER_BED 1

diff --git a/teacup_firmware/extruder/config.h b/teacup_firmware/extruder/config.h
index c842060..8faa6e8 100644 (file)
--- a/teacup_firmware/extruder/config.h
+++ b/teacup_firmware/extruder/config.h
@@ -54,8 +54,13 @@
 \r
 #define        TEMP_THERMISTOR\r
 \r
-#define        HEATER_PIN      DIO11\r
-#define BED_PIN                AIO1\r
+//~ //original code\r
+//~ #define    HEATER_PIN      DIO11\r
+//~ #define BED_PIN            AIO1\r
+//~ #define FAN_PIN            DIO12\r
+// r3: exchange HEATER and BED (we don't have bed right now, and heater-mosfet is shot)\r
+#define        BED_PIN DIO11\r
+#define HEATER_PIN             AIO1\r
 #define FAN_PIN                DIO12\r
 \r
 // extruder settings\r
@@ -70,8 +75,12 @@ DEFINE_TEMP_SENSOR(noheater, TT_THERMISTOR,          TRIM_POT_CHANNEL,               0)
 #endif\r
 \r
 #ifdef DEFINE_HEATER\r
-DEFINE_HEATER(extruder,        DIO11)\r
-DEFINE_HEATER(bed,                     AIO1)\r
+//~ //original code\r
+//~ DEFINE_HEATER(extruder,    DIO11)\r
+//~ DEFINE_HEATER(bed,                 AIO1)\r
+// r3: exchange HEATER and BED (we don't have bed right now, and heater-mosfet is shot)\r
+DEFINE_HEATER(extruder,        AIO1)\r
+DEFINE_HEATER(bed,                     DIO11)\r
 #endif\r
 \r
 // list of PWM-able pins and corresponding timers\r