SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Patches to prepare REPRAPWORLD_GRAPHICAL_LCD

Browse source
This commit is contained in:
Scott Lahteine 2016-07-25 12:09:24 -07:00
parent a60a668f6b
commit 0c0a63322b
5 changed files with 51 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Marlin/Conditionals.h
View file

@ -118,7 +118,11 @@
#define REPRAP_DISCOUNT_SMART_CONTROLLER
#endif
#if ENABLED(ULTIMAKERCONTROLLER) || ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) || ENABLED(G3D_PANEL) || ENABLED(RIGIDBOT_PANEL) || ENABLED(REPRAPWORLD_KEYPAD)
#if ENABLED(ULTIMAKERCONTROLLER) \
|| ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) \
|| ENABLED(G3D_PANEL) \
|| ENABLED(RIGIDBOT_PANEL) \
|| ENABLED(REPRAPWORLD_KEYPAD)
#define ULTIPANEL
#define NEWPANEL
#endif
@ -130,11 +134,11 @@
#define NEWPANEL
#endif
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
#define DOGLCD
#define U8GLIB_ST7920
#define ULTIPANEL
#define NEWPANEL
#endif
/**

1
Marlin/Configuration.h
View file

@ -1124,7 +1124,6 @@
//
//#define REPRAPWORLD_GRAPHICAL_LCD
//
// Activate one of these if you have a Panucatt Devices
// Viki 2.0 or mini Viki with Graphic LCD

24
Marlin/pins_MEGATRONICS_3.h
View file

@ -106,26 +106,17 @@
#define BEEPER_PIN 61
#if ENABLED(DOGLCD)
#if ENABLED(U8GLIB_ST7920)
#define LCD_PINS_RS 56 //CS chip select /SS chip slave select
#define LCD_PINS_ENABLE 51 //SID (MOSI)
#define LCD_PINS_D4 52 //SCK (CLK) clock
#define BTN_EN1 44
#define BTN_EN2 45
#define BTN_ENC 33
#define SD_DETECT_PIN 35
#endif
#else
#define LCD_PINS_RS 32
#define LCD_PINS_ENABLE 31
#define LCD_PINS_D4 14
@ -137,25 +128,16 @@
#define SHIFT_LD 35
#define SHIFT_OUT 34
#define SHIFT_EN 44
//buttons are directly attached using keypad
#define BTN_EN1 44
#define BTN_EN2 45
#define BTN_ENC 33 //the click
#define BLEN_C 2
#define BLEN_B 1
#define BLEN_A 0
#define SD_DETECT_PIN 56 // Megatronics v3.1 only
#endif
#endif
// Buttons are directly attached using keypad
#define BTN_EN1 44
#define BTN_EN2 45
#define BTN_ENC 33 // the click
#define BTN_ENC 33
#define BLEN_C 2
#define BLEN_B 1
#define BLEN_A 0

8
Marlin/pins_MINITRONICS.h
View file

@ -76,12 +76,9 @@
#define BEEPER_PIN -1
#if ENABLED(DOGLCD)
#if ENABLED(U8GLIB_ST7920)
#define LCD_PINS_RS 15 //CS chip select /SS chip slave select
#define LCD_PINS_ENABLE 11 //SID (MOSI)
#define LCD_PINS_D4 10 //SCK (CLK) clock
@ -90,11 +87,11 @@
#define BTN_EN2 17
#define BTN_ENC 25
#define SD_DETECT_PIN 30
#endif
#else
#define LCD_PINS_RS -1
#define LCD_PINS_ENABLE -1
#define LCD_PINS_D4 -1
@ -105,11 +102,12 @@
// Buttons are directly attached using keypad
#define BTN_EN1 -1
#define BTN_EN2 -1
#define BTN_ENC -1 // the click
#define BTN_ENC -1
#define BLEN_C 2
#define BLEN_B 1
#define BLEN_A 0
#define SD_DETECT_PIN -1 // Minitronics doesn't use this
#endif

21
Marlin/pins_RAMPS_14.h
View file

@ -139,25 +139,13 @@
#define SLED_PIN -1
#endif
#if ENABLED(ULTRA_LCD)
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
#define LCD_PINS_RS 49 //CS chip select /SS chip slave select
#define LCD_PINS_ENABLE 51 //SID (MOSI)
#define LCD_PINS_D4 52 //SCK (CLK) clock
#define BTN_EN1 64
#define BTN_EN2 59
#define BTN_ENC 63
#define SD_DETECT_PIN 42
#elif ENABLED(ULTRA_LCD)
#if ENABLED(NEWPANEL) && ENABLED(PANEL_ONE)
#elif ENABLED(NEWPANEL) && ENABLED(PANEL_ONE)
#define LCD_PINS_RS 40
#define LCD_PINS_ENABLE 42
#define LCD_PINS_D4 65
@ -198,6 +186,11 @@
#define LCD_PIN_BL 39
#endif
#elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
#define BTN_EN1 64
#define BTN_EN2 59
#define BTN_ENC 63
#define SD_DETECT_PIN 42
#elif ENABLED(LCD_I2C_PANELOLU2)
#define BTN_EN1 47 // reverse if the encoder turns the wrong way.
#define BTN_EN2 43