identical num steps on x and y, longer delay between onewire access

diff --git a/teacup_firmware/config.h b/teacup_firmware/config.h
index 2b4f9fb..e829616 100644 (file)
--- a/teacup_firmware/config.h
+++ b/teacup_firmware/config.h
@@ -66,12 +66,12 @@
 //#define   STEPS_PER_M_X                   8000
 //rechnerisch 8000, experimentell auf der X-Achse 8963.59
 //rechnerisch 8000, experimentell auf der X-Achse 8075.67
 //#define   STEPS_PER_M_X                   8000
 //rechnerisch 8000, experimentell auf der X-Achse 8963.59
 //rechnerisch 8000, experimentell auf der X-Achse 8075.67

-#define STEPS_PER_M_X                   8200
+#define STEPS_PER_M_X                   8000

 // 200 steps / 20 gearteeth / 2.5mm (abtsand zahnriemen-zähne)
 //#define   STEPS_PER_M_Y                   10047
 // 200 steps / 20 gearteeth / 2.5mm (abtsand zahnriemen-zähne)
 //#define   STEPS_PER_M_Y                   10047

-//#define   STEPS_PER_M_Y                   8000
+#define   STEPS_PER_M_Y                   8000

 //rechnerisch 8000, experimentell auf der Y-Achse 8164.0
 //rechnerisch 8000, experimentell auf der Y-Achse 8164.0

-#define STEPS_PER_M_Y                   8110
+//#define STEPS_PER_M_Y                   8110

 //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
 //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

diff --git a/teacup_firmware/extruder/config.h b/teacup_firmware/extruder/config.h
index 474b971..ace2d67 100644 (file)
--- a/teacup_firmware/extruder/config.h
+++ b/teacup_firmware/extruder/config.h
@@ -74,11 +74,11 @@
 DEFINE_TEMP_SENSOR(extruder,    TT_THERMISTOR,      TEMP_PIN_CHANNEL,       THERMISTOR_EXTRUDER)\r
 //DEFINE_TEMP_SENSOR(bed,           TT_THERMISTOR,      TEMP_BED_PIN_CHANNEL,   THERMISTOR_EXTRUDER)\r
     //9 bits accuracy for faster conversion time\r
 DEFINE_TEMP_SENSOR(extruder,    TT_THERMISTOR,      TEMP_PIN_CHANNEL,       THERMISTOR_EXTRUDER)\r
 //DEFINE_TEMP_SENSOR(bed,           TT_THERMISTOR,      TEMP_BED_PIN_CHANNEL,   THERMISTOR_EXTRUDER)\r
     //9 bits accuracy for faster conversion time\r

-DEFINE_TEMP_SENSOR(bed,         TT_ONEWIRE,     0,  9)\r
+DEFINE_TEMP_SENSOR(bed,         TT_DS1820,     0,  12)\r

 // dummy temp sensor so analog_mask includes trim pot\r
 DEFINE_TEMP_SENSOR(noheater,    TT_THERMISTOR,      TRIM_POT_CHANNEL,       0)\r
 #endif\r
 // dummy temp sensor so analog_mask includes trim pot\r
 DEFINE_TEMP_SENSOR(noheater,    TT_THERMISTOR,      TRIM_POT_CHANNEL,       0)\r
 #endif\r

-// DEFINE_HEATER(<name>, <pin>, <fan startup threshold pwm value>)\r
+// DEFINE_HEATER(<name>, <pin>, <invert?>, <fan startup threshold pwm value>)\r

 // fan startup threshold: FANs usually take more power to start spinning than to keep spinning,\r
 //                        so, below a given pwm value we start the fan with full power and after
 //                        50ms lower the output to the requested value.\r
 // fan startup threshold: FANs usually take more power to start spinning than to keep spinning,\r
 //                        so, below a given pwm value we start the fan with full power and after
 //                        50ms lower the output to the requested value.\r