Browse Source

Follow-up and improvement the PR #4053 (CNControls Cartesio UI Support)

・Add implimantation of PR #3609 to configuration files of Cartesio
・Standardize macro names
esenapaj 8 years ago
parent
commit
106227540e

+ 1
- 1
Marlin/dogm_lcd_implementation.h View File

143
   U8GLIB_ST7920_128X64_RRD u8g(0);
143
   U8GLIB_ST7920_128X64_RRD u8g(0);
144
 #elif defined(CARTESIO_UI)
144
 #elif defined(CARTESIO_UI)
145
   // The CartesioUI display with SW-SPI
145
   // The CartesioUI display with SW-SPI
146
-  U8GLIB_DOGM128 u8g(DOGLCD_sck, DOGLCD_mosi, DOGLCD_cs, DOGLCD_a0);
146
+  U8GLIB_DOGM128 u8g(DOGLCD_SCK, DOGLCD_MOSI, DOGLCD_CS, DOGLCD_A0);
147
 #elif ENABLED(U8GLIB_LM6059_AF)
147
 #elif ENABLED(U8GLIB_LM6059_AF)
148
   // Based on the Adafruit ST7565 (http://www.adafruit.com/products/250)
148
   // Based on the Adafruit ST7565 (http://www.adafruit.com/products/250)
149
   U8GLIB_LM6059 u8g(DOGLCD_CS, DOGLCD_A0);
149
   U8GLIB_LM6059 u8g(DOGLCD_CS, DOGLCD_A0);

+ 13
- 0
Marlin/example_configurations/Cartesio/Configuration.h View File

38
 #ifndef CONFIGURATION_H
38
 #ifndef CONFIGURATION_H
39
 #define CONFIGURATION_H
39
 #define CONFIGURATION_H
40
 
40
 
41
+/**
42
+ *
43
+ *  ***********************************
44
+ *  **  ATTENTION TO ALL DEVELOPERS  **
45
+ *  ***********************************
46
+ *
47
+ * You must increment this version number for every significant change such as,
48
+ * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option.
49
+ *
50
+ * Note: Update also Version.h !
51
+ */
52
+#define CONFIGURATION_H_VERSION 010100
53
+
41
 #include "boards.h"
54
 #include "boards.h"
42
 #include "macros.h"
55
 #include "macros.h"
43
 
56
 

+ 13
- 0
Marlin/example_configurations/Cartesio/Configuration_adv.h View File

33
 #ifndef CONFIGURATION_ADV_H
33
 #ifndef CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
34
 #define CONFIGURATION_ADV_H
35
 
35
 
36
+/**
37
+ *
38
+ *  ***********************************
39
+ *  **  ATTENTION TO ALL DEVELOPERS  **
40
+ *  ***********************************
41
+ *
42
+ * You must increment this version number for every significant change such as,
43
+ * but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option.
44
+ *
45
+ * Note: Update also Version.h !
46
+ */
47
+#define CONFIGURATION_ADV_H_VERSION 010100
48
+
36
 #include "Conditionals.h"
49
 #include "Conditionals.h"
37
 
50
 
38
 // @section temperature
51
 // @section temperature

+ 4
- 4
Marlin/pins_CNCONTROLS_12.h View File

79
  #define BEEPER_PIN                16
79
  #define BEEPER_PIN                16
80
 
80
 
81
  // Pins for DOGM SPI LCD Support
81
  // Pins for DOGM SPI LCD Support
82
- #define DOGLCD_a0             39
83
- #define DOGLCD_cs             35
84
- #define DOGLCD_mosi           48
85
- #define DOGLCD_sck            49
82
+ #define DOGLCD_A0             39
83
+ #define DOGLCD_CS             35
84
+ #define DOGLCD_MOSI           48
85
+ #define DOGLCD_SCK            49
86
  #define LCD_SCREEN_ROT_180
86
  #define LCD_SCREEN_ROT_180
87
  
87
  
88
  //The encoder and click button 
88
  //The encoder and click button 

Loading…
Cancel
Save