Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from Jun 16, 2016
+31 −5
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Marlin/dogm_lcd_implementation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
13 changes: 13 additions & 0 deletions Marlin/example_configurations/Cartesio/Configuration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
13 changes: 13 additions & 0 deletions Marlin/example_configurations/Cartesio/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions Marlin/pins_CNCONTROLS_12.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down