X-Git-Url: https://git.realraum.at/?p=reprap_mendel_prusa.git;a=blobdiff_plain;f=teacup_firmware%2Fextruder%2Fconfig.h;fp=teacup_firmware%2Fextruder%2Fconfig.h;h=474b97166c89878098d2029cb1a67e9cf0b4e062;hp=a531d43712dd29afdbb7a78a35835af10a29ccfb;hb=4b729bea491ba060ae83f070aa2e9dc43ccfba58;hpb=4d9a26119df1308969a802bb6ed2ee84f35b7ffe

diff --git a/teacup_firmware/extruder/config.h b/teacup_firmware/extruder/config.h
index a531d43..474b971 100644
--- a/teacup_firmware/extruder/config.h
+++ b/teacup_firmware/extruder/config.h
@@ -1,22 +1,22 @@
 /* Notice to developers: this file is intentionally included twice. */
 
 /*
-	CPU clock rate
+    CPU clock rate
 */
-#ifndef	F_CPU
-	#define	F_CPU	16000000L
+#ifndef F_CPU
+    #define F_CPU   16000000L
 #endif
 
 /*
-	other fallbacks for the Arduino IDE
+    other fallbacks for the Arduino IDE
 */
 #define EXTRUDER
 #define GEN3
 
-#include	"arduino.h"
+#include    "arduino.h"
 
 // controller index- bus is multidrop after all
-#define	THIS_CONTROLLER_NUM 0
+#define THIS_CONTROLLER_NUM 0
 
 //RS485 Interface pins
 #define RX_ENABLE_PIN DIO4
@@ -49,56 +49,61 @@
 #define TEMP_BED_PIN AIO6
 #define TEMP_BED_PIN_CHANNEL 6
 
+//Read digital temperature from DS18B20
+#define ONEWIRE_PIN DIO2
 
-#define	REFERENCE	REFERENCE_AVCC
+#define REFERENCE   REFERENCE_AVCC
 
-#define	TEMP_THERMISTOR
+#define TEMP_THERMISTOR
+#define TEMP_DS1820
 
 //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
+#define HEATER_PIN  DIO12
+#define BED_PIN     AIO1
+#define FAN_PIN     DIO11
 
 // extruder settings
-#define	TEMP_HYSTERESIS				5
-#define	TEMP_RESIDENCY_TIME		60
-
-#ifdef	DEFINE_TEMP_SENSOR
-DEFINE_TEMP_SENSOR(extruder,	TT_THERMISTOR,		TEMP_PIN_CHANNEL,		THERMISTOR_EXTRUDER)
-DEFINE_TEMP_SENSOR(bed,			TT_THERMISTOR,		TEMP_BED_PIN_CHANNEL,	THERMISTOR_EXTRUDER)
+#define TEMP_HYSTERESIS             5
+#define TEMP_RESIDENCY_TIME     60
+
+#ifdef  DEFINE_TEMP_SENSOR
+DEFINE_TEMP_SENSOR(extruder,    TT_THERMISTOR,      TEMP_PIN_CHANNEL,       THERMISTOR_EXTRUDER)
+//DEFINE_TEMP_SENSOR(bed,           TT_THERMISTOR,      TEMP_BED_PIN_CHANNEL,   THERMISTOR_EXTRUDER)
+    //9 bits accuracy for faster conversion time
+DEFINE_TEMP_SENSOR(bed,         TT_ONEWIRE,     0,  9)
 // dummy temp sensor so analog_mask includes trim pot
-DEFINE_TEMP_SENSOR(noheater,	TT_THERMISTOR,		TRIM_POT_CHANNEL,		0)
+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
-DEFINE_HEATER(extruder,	DIO12, 0)
-DEFINE_HEATER(bed,			AIO1, 0)
-DEFINE_HEATER(fan,			DIO11, 150)
+#ifdef  DEFINE_HEATER
+DEFINE_HEATER(extruder, DIO12, 0, 0)
+DEFINE_HEATER(bed,          AIO1, 1,  0)
+DEFINE_HEATER(fan,          DIO11, 0, 150)
 #endif
 
 // list of PWM-able pins and corresponding timers
 // timer1 is used for step timing so don't use OC1A/OC1B (DIO9/DIO10)
-// OC0A												DIO6
-// OC0B												DIO5
-// OC1A												DIO9
-// OC1B												DIO10
-// OC2A												DIO11
-// OC2B												DIO3
+// OC0A                                             DIO6
+// OC0B                                             DIO5
+// OC1A                                             DIO9
+// OC1B                                             DIO10
+// OC2A                                             DIO11
+// OC2B                                             DIO3
 
-#define	TH_COUNT					8
-#define	PID_SCALE					1024L
+#define TH_COUNT                    8
+#define PID_SCALE                   1024L
 
 
 /*
-	Motors
+    Motors
 */
 
-#define enable_motors()				do { TCCR0A |= MASK(COM0A1) | MASK(COM0B1); } while (0)
-#define disable_motors()			do { TCCR0A &= ~MASK(COM0A1) & ~MASK(COM0B1); } while (0)
+#define enable_motors()             do { TCCR0A |= MASK(COM0A1) | MASK(COM0B1); } while (0)
+#define disable_motors()            do { TCCR0A &= ~MASK(COM0A1) & ~MASK(COM0B1); } while (0)