Update Configuration.h

MarlinKimbra/Configuration.h

@@ -4,7 +4,7 @@
 // User-specified version info of this build to display in [Pronterface, etc] terminal window during
 // startup. Implementation of an idea by Prof Braino to inform user that any changes made to this
 // build by the user have been successfully uploaded into firmware.
-#define STRING_VERSION_CONFIG_H __DATE__ " 12/12/2014 " __TIME__ // build date and time
+#define STRING_VERSION_CONFIG_H __DATE__ " 16/12/2014 " __TIME__ // build date and time
 #define STRING_CONFIG_H_AUTHOR "(MagoKimbra: magokimbra@hotmail.com, Version 4.0)" // Who made the changes.
 
 // SERIAL_PORT selects which serial port should be used for communication with the host.
@@ -126,7 +126,31 @@
 
 //**********************************************************************
 
-#if !defined(MKR4)
+/***********************************************************************
+ *********************** Multiextruder NPr2  ***************************
+ ***********************************************************************
+ *                                                                     *
+ * Setting fot color meccanism NPr2 by NicolaP (www.3dmakerlab.it)     *
+ *                                                                     *
+ * Firmware by MagoKimbra magokimbra@hotmail.com                       *
+ *                                                                     *
+ * Find angle setting by g-Code "M997 Cxxx"                            *
+ *                                                                     *
+ ***********************************************************************/
+//#define NPR2
+#ifdef NPR2
+#define COLOR_STEP {120, 25, -65, -155}           // CARTER ANGLE
+#define COLOR_SLOWRATE 170                        // MICROSECOND delay for carter motor routine (Carter Motor Feedrate: upper value-slow feedrate)  
+#define COLOR_HOMERATE 4                          // FEEDRATE for carter home
+#define MOTOR_ANGLE 1.8                           // Nema angle for single step 
+#define DRIVER_MICROSTEP 4                        // Microstep moltiplicator driver (set jumper MS1-2-3) off-on-off 1/4 microstepping.
+#define CARTER_MOLTIPLICATOR 14.22                // CARTER MOLTIPLICATOR (gear ratio 13/31-10/31)
+#define DRIVER_EXTRUDERS 2                        // This defines the number of Driver extruders
+#endif
+//**********************************************************************
+
+
+#if !defined(MKR4) && !defined(NPR2)
 #define DRIVER_EXTRUDERS EXTRUDERS // This defines the number of Driver extruders
 #endif
 
@@ -163,7 +187,7 @@
  * 10 is 100k RS thermistor 198-961 (4.7k pullup)
  * 11 is 100k beta 3950 1% thermistor (4.7k pullup)
  * 12 is 100k 0603 SMD Vishay NTCS0603E3104FXT (4.7k pullup) (calibrated for Makibox hot bed)
- * 13 is 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE" 
+ * 13 is 100k Hisens 3950  1% up to 300°C for hotend "Simple ONE " & "Hotend "All In ONE" 
  * 20 is the PT100 circuit found in the Ultimainboard V2.x
  * 60 is 100k Maker's Tool Works Kapton Bed Thermistor beta=3950
  * 
@@ -528,15 +552,6 @@
 //=============================Additional Features===========================
 //===========================================================================
 
-// Custom M code points
-#define CUSTOM_M_CODES
-#ifdef CUSTOM_M_CODES
-#define CUSTOM_M_CODE_SET_Z_PROBE_OFFSET 851
-#define Z_PROBE_OFFSET_RANGE_MIN -15
-#define Z_PROBE_OFFSET_RANGE_MAX -5
-#endif
-
-
 // EEPROM
 // The microcontroller can store settings in the EEPROM, e.g. max velocity...
 // M500 - stores parameters in EEPROM
@@ -653,4 +668,4 @@
 #include "Configuration_adv.h"
 #include "thermistortables.h"
 
-#endif //__CONFIGURATION_H
\ No newline at end of file
+#endif //__CONFIGURATION_H