Merge pull request #4053 from thinkyhead/rc_cartesio_redo

CNControls Cartesio UI Support
MarlinFirmware · Jun 16, 2016 · b410bf9 · b410bf9
2 parents f639044 + 4d2cb70
commit b410bf9
Show file tree

Hide file tree

Showing 7 changed files with 2,047 additions and 0 deletions.
diff --git a/Marlin/Conditionals.h b/Marlin/Conditionals.h
@@ -47,6 +47,15 @@
 
   #define LCD_HAS_DIRECTIONAL_BUTTONS (BUTTON_EXISTS(UP) || BUTTON_EXISTS(DWN) || BUTTON_EXISTS(LFT) || BUTTON_EXISTS(RT))
 
+  #if ENABLED(CARTESIO_UI)
+    #define DOGLCD
+    #define ULTIPANEL
+    #define NEWPANEL
+    #define DEFAULT_LCD_CONTRAST 90
+    #define LCD_CONTRAST_MIN 60
+    #define LCD_CONTRAST_MAX 140
+  #endif
+
   #if ENABLED(MAKRPANEL) || ENABLED(MINIPANEL)
     #define DOGLCD
     #define ULTIPANEL

diff --git a/Marlin/boards.h b/Marlin/boards.h
@@ -29,6 +29,7 @@
 #define BOARD_GEN7_12           11   // Gen7 v1.1, v1.2
 #define BOARD_GEN7_13           12   // Gen7 v1.3
 #define BOARD_GEN7_14           13   // Gen7 v1.4
+#define BOARD_CNCONTROLS_12     112  // Cartesio CN Controls V12
 #define BOARD_CHEAPTRONIC       2    // Cheaptronic v1.0
 #define BOARD_SETHI             20   // Sethi 3D_1
 #define BOARD_RAMPS_OLD         3    // MEGA/RAMPS up to 1.2

diff --git a/Marlin/dogm_lcd_implementation.h b/Marlin/dogm_lcd_implementation.h
@@ -141,6 +141,9 @@
 #if ENABLED(U8GLIB_ST7920)
   //U8GLIB_ST7920_128X64_RRD u8g(0,0,0);
   U8GLIB_ST7920_128X64_RRD u8g(0);
+#elif defined(CARTESIO_UI)
+  // The CartesioUI display with SW-SPI
+  U8GLIB_DOGM128 u8g(DOGLCD_sck, DOGLCD_mosi, DOGLCD_cs, DOGLCD_a0);
 #elif ENABLED(U8GLIB_LM6059_AF)
   // Based on the Adafruit ST7565 (http://www.adafruit.com/products/250)
   U8GLIB_LM6059 u8g(DOGLCD_CS, DOGLCD_A0);

diff --git a/Marlin/example_configurations/Cartesio/Configuration.h b/Marlin/example_configurations/Cartesio/Configuration.h
diff --git a/Marlin/example_configurations/Cartesio/Configuration_adv.h b/Marlin/example_configurations/Cartesio/Configuration_adv.h
diff --git a/Marlin/pins.h b/Marlin/pins.h
@@ -31,6 +31,8 @@
   #include "pins_GEN7_13.h"
 #elif MB(GEN7_14)
   #include "pins_GEN7_14.h"
+#elif MB(CNCONTROLS_12)
+  #include "pins_CNCONTROLS_12.h"
 #elif MB(CHEAPTRONIC)
   #include "pins_CHEAPTRONIC.h"
 #elif MB(SETHI)

diff --git a/Marlin/pins_CNCONTROLS_12.h b/Marlin/pins_CNCONTROLS_12.h
@@ -0,0 +1,108 @@
+/**
+ * CartesioV12 pin assignments
+ */
+
+#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
+  #error Oops!  Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu.
+#endif
+
+//#define LARGE_FLASH true
+
+ #define X_ENABLE_PIN           26
+ #define X_STEP_PIN             25
+ #define X_DIR_PIN              27
+ #define X_MIN_PIN              19
+ #define X_MAX_PIN              -1
+
+ #define Y_ENABLE_PIN           29
+ #define Y_STEP_PIN             28
+ #define Y_DIR_PIN              30
+ #define Y_MIN_PIN              22
+ #define Y_MAX_PIN              -1
+
+ #define Z_ENABLE_PIN           32
+ #define Z_STEP_PIN             31
+ #define Z_DIR_PIN              33
+ #define Z_MIN_PIN              23
+ #define Z_MAX_PIN              -1
+
+
+//Tools
+
+ #define E0_ENABLE_PIN          58
+ #define E0_STEP_PIN            57
+ #define E0_DIR_PIN             55
+ #define HEATER_0_PIN           11
+ #define TEMP_0_PIN             0   // ANALOG INPUT !!
+// #define TOOL_0_PIN             56
+// #define TOOL_0_PWM_PIN         10 // used for red warning led at dual extruder
+
+ #define E1_ENABLE_PIN          60
+ #define E1_STEP_PIN            61
+ #define E1_DIR_PIN             62
+ #define HEATER_1_PIN           9 
+ #define TEMP_1_PIN             9  // 9 for tool3 -> 13 for chambertemp
+// #define TOOL_1_PIN             59
+// #define TOOL_1_PWM_PIN         8 // used for lights at dual extruder
+
+ #define E2_ENABLE_PIN          44
+ #define E2_STEP_PIN            46
+ #define E2_DIR_PIN             66
+ #define HEATER_2_PIN           6
+ #define TEMP_2_PIN             13 // 10 for tool3 -> 13 for chambertemp
+// #define TOOL_2_PIN             4
+// #define TOOL_2_PWM_PIN         5
+
+ #define E3_ENABLE_PIN          47
+ #define E3_STEP_PIN            45
+ #define E3_DIR_PIN             69
+ #define HEATER_3_PIN           3  
+ #define TEMP_3_PIN             11  // 11 for tool4 -> 13 for chambertemp
+// #define TOOL_3_PIN             14
+// #define TOOL_3_PWM_PIN         2
+
+ #define HEATER_BED_PIN         24
+ #define TEMP_BED_PIN           14   // ANALOG INPUT !! 
+
+//common I/O
+
+ //#define TEMP_CHAMBER_PIN        13  // ANALOG INPUT !!
+ //#define FILAMENT_RUNOUT_SENSOR  18
+ //#define PWM_1_PIN               12
+ //#define PWM_2_PIN               13 
+ //#define SPARE_IO                17  
+ #define FAN_PIN                   5 // 5 is PWMtool3 -> 7 is common PWM pin for all tools 
+
+
+//user interface
+
+ #define BEEPER_PIN                16
+
+ // Pins for DOGM SPI LCD Support
+ #define DOGLCD_a0             39
+ #define DOGLCD_cs             35
+ #define DOGLCD_mosi           48
+ #define DOGLCD_sck            49
+ #define LCD_SCREEN_ROT_180
+ 
+ //The encoder and click button 
+ #define BTN_EN1 36
+ #define BTN_EN2 34
+ #define BTN_ENC 38  //the click switch
+
+ //hardware buttons for manual movement of XYZ
+ #define SHIFT_OUT             42
+ #define SHIFT_LD              41
+ #define SHIFT_CLK             40
+
+
+ //#define UI1                 43
+ //#define UI2                 37
+
+
+// Other 
+
+ #define SDSS                  53
+ #define SD_DETECT_PIN         15
+ #define STAT_LED_BLUE         -1
+ #define STAT_LED_RED          10 // TOOL_0_PWM_PIN