From 106227540e4a64f25d1a822c58edc9ad6cec41ab Mon Sep 17 00:00:00 2001
From: esenapaj <creation0004@gmail.com>
Date: Thu, 16 Jun 2016 19:22:31 +0900
Subject: [PATCH] Follow-up and improvement the PR #4053 (CNControls Cartesio
 UI Support)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

・Add implimantation of PR #3609 to configuration files of Cartesio
・Standardize macro names
---
 Marlin/dogm_lcd_implementation.h                    |  2 +-
 .../example_configurations/Cartesio/Configuration.h | 13 +++++++++++++
 .../Cartesio/Configuration_adv.h                    | 13 +++++++++++++
 Marlin/pins_CNCONTROLS_12.h                         |  8 ++++----
 4 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/Marlin/dogm_lcd_implementation.h b/Marlin/dogm_lcd_implementation.h
index a992eb848..1ef521442 100644
--- a/Marlin/dogm_lcd_implementation.h
+++ b/Marlin/dogm_lcd_implementation.h
@@ -143,7 +143,7 @@
   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);
+  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
index 0830692f4..d5fddbbd0 100644
--- a/Marlin/example_configurations/Cartesio/Configuration.h
+++ b/Marlin/example_configurations/Cartesio/Configuration.h
@@ -38,6 +38,19 @@
 #ifndef CONFIGURATION_H
 #define CONFIGURATION_H
 
+/**
+ *
+ *  ***********************************
+ *  **  ATTENTION TO ALL DEVELOPERS  **
+ *  ***********************************
+ *
+ * You must increment this version number for every significant change such as,
+ * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option.
+ *
+ * Note: Update also Version.h !
+ */
+#define CONFIGURATION_H_VERSION 010100
+
 #include "boards.h"
 #include "macros.h"
 
diff --git a/Marlin/example_configurations/Cartesio/Configuration_adv.h b/Marlin/example_configurations/Cartesio/Configuration_adv.h
index 4b7765e12..7f61cf437 100644
--- a/Marlin/example_configurations/Cartesio/Configuration_adv.h
+++ b/Marlin/example_configurations/Cartesio/Configuration_adv.h
@@ -33,6 +33,19 @@
 #ifndef CONFIGURATION_ADV_H
 #define CONFIGURATION_ADV_H
 
+/**
+ *
+ *  ***********************************
+ *  **  ATTENTION TO ALL DEVELOPERS  **
+ *  ***********************************
+ *
+ * You must increment this version number for every significant change such as,
+ * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option.
+ *
+ * Note: Update also Version.h !
+ */
+#define CONFIGURATION_ADV_H_VERSION 010100
+
 #include "Conditionals.h"
 
 // @section temperature
diff --git a/Marlin/pins_CNCONTROLS_12.h b/Marlin/pins_CNCONTROLS_12.h
index 74fdf15cc..de27b8f9d 100644
--- a/Marlin/pins_CNCONTROLS_12.h
+++ b/Marlin/pins_CNCONTROLS_12.h
@@ -79,10 +79,10 @@
  #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 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