Skip to content

Commit 0b00b9a

Browse files
esenapajCONSULitAS
authored andcommitted
Follow-up and improvement the PR MarlinFirmware#4053 (CNControls Cartesio UI Support)
・Add implimantation of PR MarlinFirmware#3609 to configuration files of Cartesio ・Standardize macro names
1 parent c42191d commit 0b00b9a

File tree

4 files changed

+31
-5
lines changed

4 files changed

+31
-5
lines changed

Marlin/dogm_lcd_implementation.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
U8GLIB_ST7920_128X64_RRD u8g(0);
144144
#elif defined(CARTESIO_UI)
145145
// 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);
147147
#elif ENABLED(U8GLIB_LM6059_AF)
148148
// Based on the Adafruit ST7565 (http://www.adafruit.com/products/250)
149149
U8GLIB_LM6059 u8g(DOGLCD_CS, DOGLCD_A0);

Marlin/example_configurations/Cartesio/Configuration.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,19 @@
3838
#ifndef CONFIGURATION_H
3939
#define CONFIGURATION_H
4040

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+
4154
#include "boards.h"
4255
#include "macros.h"
4356

Marlin/example_configurations/Cartesio/Configuration_adv.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,19 @@
3333
#ifndef CONFIGURATION_ADV_H
3434
#define CONFIGURATION_ADV_H
3535

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+
3649
#include "Conditionals.h"
3750

3851
// @section temperature

Marlin/pins_CNCONTROLS_12.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@
7979
#define BEEPER_PIN 16
8080

8181
// 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
8686
#define LCD_SCREEN_ROT_180
8787

8888
//The encoder and click button

0 commit comments

Comments
 (0)