andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Patches to prepare REPRAPWORLD_GRAPHICAL_LCD

pull/1/head
Scott Lahteine 9 years ago
parent
a60a668f6b
commit
0c0a63322b
5 changed files with 54 additions and 78 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      Marlin/Conditionals.h
  2. 1
      Marlin/Configuration.h
  3. 36
      Marlin/pins_MEGATRONICS_3.h
  4. 58
      Marlin/pins_MINITRONICS.h
  5. 29
      Marlin/pins_RAMPS_14.h

8
Marlin/Conditionals.h
View File

@ -118,7 +118,11 @@
#define REPRAP_DISCOUNT_SMART_CONTROLLER #define REPRAP_DISCOUNT_SMART_CONTROLLER
#endif #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 ULTIPANEL
#define NEWPANEL #define NEWPANEL
#endif #endif
@ -130,11 +134,11 @@
#define NEWPANEL #define NEWPANEL
#endif #endif
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD) #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
#define DOGLCD #define DOGLCD
#define U8GLIB_ST7920 #define U8GLIB_ST7920
#define ULTIPANEL #define ULTIPANEL
#define NEWPANEL
#endif #endif
/** /**

1
Marlin/Configuration.h
View File

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

36
Marlin/pins_MEGATRONICS_3.h
View File

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

58
Marlin/pins_MINITRONICS.h
View File

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

29
Marlin/pins_RAMPS_14.h
View File

@ -139,25 +139,13 @@
#define SLED_PIN -1 #define SLED_PIN -1
#endif #endif
#if ENABLED(ULTRA_LCD)
#if ENABLED(REPRAPWORLD_GRAPHICAL_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 LCD_PINS_RS 49 //CS chip select /SS chip slave select #elif ENABLED(NEWPANEL) && ENABLED(PANEL_ONE)
#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)
#define LCD_PINS_RS 40 #define LCD_PINS_RS 40
#define LCD_PINS_ENABLE 42 #define LCD_PINS_ENABLE 42
#define LCD_PINS_D4 65 #define LCD_PINS_D4 65
@ -198,6 +186,11 @@
#define LCD_PIN_BL 39 #define LCD_PIN_BL 39
#endif #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) #elif ENABLED(LCD_I2C_PANELOLU2)
#define BTN_EN1 47 // reverse if the encoder turns the wrong way. #define BTN_EN1 47 // reverse if the encoder turns the wrong way.
#define BTN_EN2 43 #define BTN_EN2 43

Write Preview
Loading…
Cancel
Save