MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge pull request #4060 from esenapaj/Follow-up-the-PR-#4053

Browse Source 
Follow-up and improvement the PR #4053 (CNControls Cartesio UI Support)
This commit is contained in:
Scott Lahteine 2016-06-16 15:44:00 -07:00 committed by GitHub
commit 4640974e1b
4 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/dogm_lcd_implementation.h
View File

@ -143,7 +143,7 @@
U8GLIB_ST7920_128X64_RRD u8g(0); U8GLIB_ST7920_128X64_RRD u8g(0);
#elif defined(CARTESIO_UI) #elif defined(CARTESIO_UI)
// The CartesioUI display with SW-SPI // 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) #elif ENABLED(U8GLIB_LM6059_AF)
// Based on the Adafruit ST7565 (http://www.adafruit.com/products/250) // Based on the Adafruit ST7565 (http://www.adafruit.com/products/250)
U8GLIB_LM6059 u8g(DOGLCD_CS, DOGLCD_A0); U8GLIB_LM6059 u8g(DOGLCD_CS, DOGLCD_A0);

13
Marlin/example_configurations/Cartesio/Configuration.h
View File

@ -38,6 +38,19 @@
#ifndef CONFIGURATION_H #ifndef CONFIGURATION_H
#define 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 "boards.h"
#include "macros.h" #include "macros.h"

13
Marlin/example_configurations/Cartesio/Configuration_adv.h
View File

@ -33,6 +33,19 @@
#ifndef CONFIGURATION_ADV_H #ifndef CONFIGURATION_ADV_H
#define 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" #include "Conditionals.h"
// @section temperature // @section temperature

8
Marlin/pins_CNCONTROLS_12.h
View File

@ -79,10 +79,10 @@
#define BEEPER_PIN 16 #define BEEPER_PIN 16
// Pins for DOGM SPI LCD Support // Pins for DOGM SPI LCD Support
#define DOGLCD_a0 39 #define DOGLCD_A0 39
#define DOGLCD_cs 35 #define DOGLCD_CS 35
#define DOGLCD_mosi 48 #define DOGLCD_MOSI 48
#define DOGLCD_sck 49 #define DOGLCD_SCK 49
#define LCD_SCREEN_ROT_180 #define LCD_SCREEN_ROT_180
//The encoder and click button //The encoder and click button