forksand
/
marlin-lulzbot-laser
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #4445 from thinkyhead/rc_fix_rdfgsc_mega3

Browse Source 
Fix for R.D.F.G.S.C. with MEGATRONICS 3 board
master
Scott Lahteine 8 years ago committed by GitHub
parent 5367d56f87 03fdb26cd2
commit ae1c7bca1b
18 changed files with 104 additions and 199 deletions
Show Stats Download Patch File Download Diff File

2
Marlin/pins_3DRAG.h
Unescape View File

@ -86,7 +86,7 @@
#undef BTN_ENC
#define BTN_EN1 16
#define BTN_EN2 17
#define BTN_ENC 23 //the click
#define BTN_ENC 23
#else

4
Marlin/pins_CHEAPTRONIC.h
Unescape View File

@ -84,8 +84,4 @@
#define BTN_EN2 -1
#define BTN_ENC -1
#define BLEN_C 2
#define BLEN_B 1
#define BLEN_A 0
// Cheaptronic v1.0 doesn't use this

6
Marlin/pins_ELEFU_3.h
Unescape View File

@ -87,11 +87,7 @@
#define BTN_EN1 14
#define BTN_EN2 39
#define BTN_ENC 15 //the click
#define BLEN_C 2
#define BLEN_B 1
#define BLEN_A 0
#define BTN_ENC 15
#endif // RA_CONTROL_PANEL

3
Marlin/pins_FELIX2.h
Unescape View File

@ -38,9 +38,6 @@
#if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
#define BLEN_C 2
#define BLEN_B 1
#define BLEN_A 0
#define SD_DETECT_PIN 6
#endif // NEWPANEL && ULTRA_LCD

2
Marlin/pins_GEN7_CUSTOM.h
Unescape View File

@ -86,5 +86,5 @@
//buttons are directly attached
#define BTN_EN1 11
#define BTN_EN2 10
#define BTN_ENC 12 //the click
#define BTN_ENC 12

8
Marlin/pins_MEGACONTROLLER.h
Unescape View File

@ -113,11 +113,11 @@
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
//The encoder and click button
#define BTN_EN1 48
#define BTN_EN2 11
#define BTN_ENC 10 //the click switch
//not connected to a pin
#define BTN_ENC 10
#define SD_DETECT_PIN 49
#endif //Minipanel
#endif // MINIPANEL

4
Marlin/pins_MEGATRONICS.h
Unescape View File

@ -92,10 +92,6 @@
#define BTN_EN2 64
#define BTN_ENC 43
#define BLEN_C 2
#define BLEN_B 1
#define BLEN_A 0
#define SD_DETECT_PIN -1 // RAMPS doesn't use this
#endif // ULTRA_LCD && NEWPANEL

7
Marlin/pins_MEGATRONICS_2.h
Unescape View File

@ -101,9 +101,4 @@
// Buttons are directly attached using keypad
#define BTN_EN1 61
#define BTN_EN2 59
#define BTN_ENC 43 //the click
#define BLEN_C 2
#define BLEN_B 1
#define BLEN_A 0
#define BTN_ENC 43

40
Marlin/pins_MEGATRONICS_3.h
Unescape View File

@ -28,7 +28,14 @@
#error "Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu."
#endif
#define MEGATRONICS_31
#if ENABLED(MEGATRONICS_31)
#define BOARD_NAME "Megatronics v3.1"
#else
#define BOARD_NAME "Megatronics v3.0"
#endif
#define LARGE_FLASH true
#if ENABLED(Z_PROBE_SLED)
@ -45,19 +52,19 @@
#define X_DIR_PIN 57
#define X_ENABLE_PIN 59
#define X_MIN_PIN 37
#define X_MAX_PIN 40 // put to -1 to disable
#define X_MAX_PIN 40
#define Y_STEP_PIN 5
#define Y_DIR_PIN 17
#define Y_ENABLE_PIN 4
#define Y_MIN_PIN 41
#define Y_MAX_PIN 38 // put to -1 to disable
#define Y_MAX_PIN 38
#define Z_STEP_PIN 16
#define Z_DIR_PIN 11
#define Z_ENABLE_PIN 3
#define Z_MIN_PIN 18
#define Z_MAX_PIN 19 // put to -1 to disable
#define Z_MAX_PIN 19
#define E0_STEP_PIN 28
#define E0_DIR_PIN 27
@ -104,19 +111,21 @@
#define TEMP_BED_PIN 14 // ANALOG NUMBERING
#endif
/**
* Controllers and LCDs
*/
#define BEEPER_PIN 61
#if ENABLED(DOGLCD)
#define BTN_EN1 44
#define BTN_EN2 45
#define BTN_ENC 33
#if ENABLED(U8GLIB_ST7920)
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
#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 SD_DETECT_PIN 35
#endif
#else
#define LCD_PINS_RS 32
#define LCD_PINS_ENABLE 31
#define LCD_PINS_D4 14
@ -129,15 +138,10 @@
#define SHIFT_OUT 34
#define SHIFT_EN 44
#define SD_DETECT_PIN 56 // Megatronics v3.1 only
#if ENABLED(MEGATRONICS_31)
#define SD_DETECT_PIN 56
#else
#define SD_DETECT_PIN -1
#endif
// Buttons are directly attached using keypad
#define BTN_EN1 44
#define BTN_EN2 45
#define BTN_ENC 33
#define BLEN_C 2
#define BLEN_B 1
#define BLEN_A 0
#endif

12
Marlin/pins_MINITRONICS.h
Unescape View File

@ -74,11 +74,13 @@
#define HEATER_1_PIN 8 // EXTRUDER 2
#define HEATER_BED_PIN 3 // BED
/**
* Controllers and LCDs
*/
#define BEEPER_PIN -1
#if ENABLED(DOGLCD)
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
#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
@ -88,7 +90,6 @@
#define BTN_ENC 25
#define SD_DETECT_PIN 30
#endif
#else
@ -104,10 +105,5 @@
#define BTN_EN2 -1
#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

2
Marlin/pins_PRINTRBOARD.h
Unescape View File

@ -132,7 +132,7 @@
//The encoder and click button (FastIO Pins)
#define BTN_EN1 26
#define BTN_EN2 27
#define BTN_ENC 47 //the click switch
#define BTN_ENC 47
#define SDSS 45
#define SD_DETECT_PIN -1 // FastIO (Manual says 72 I'm not certain cause I can't test)

6
Marlin/pins_PRINTRBOARD_REVF.h
Unescape View File

@ -113,10 +113,6 @@
#define BTN_EN2 17
#define BTN_ENC 18//the click
#define BLEN_C 2
#define BLEN_B 1
#define BLEN_A 0
#define SD_DETECT_PIN -1
//encoder rotation values
@ -136,7 +132,7 @@
//The encoder and click button (FastIO Pins)
#define BTN_EN1 26
#define BTN_EN2 27
#define BTN_ENC 47 //the click switch
#define BTN_ENC 47
#define SDSS 45
#define SD_DETECT_PIN -1 // FastIO (Manual says 72 I'm not certain cause I can't test)

19
Marlin/pins_RAMBO.h
Unescape View File

@ -127,11 +127,7 @@
//buttons are directly attached using AUX-2
#define BTN_EN1 76
#define BTN_EN2 77
#define BTN_ENC 78 //the click
#define BLEN_C 2
#define BLEN_B 1
#define BLEN_A 0
#define BTN_ENC 78
#define SD_DETECT_PIN 81 // Ramps doesn't use this
@ -154,17 +150,6 @@
#define LCD_PINS_D6 27
#define LCD_PINS_D7 29
//bits in the shift register that carry the buttons for:
// left up center down right red
#define BL_LE 7
#define BL_UP 6
#define BL_MI 5
#define BL_DW 4
#define BL_RI 3
#define BL_ST 2
#define BLEN_B 1
#define BLEN_A 0
#endif // !NEWPANEL
#endif // ULTRA_LCD
@ -179,7 +164,7 @@
//The encoder and click button
#define BTN_EN1 85
#define BTN_EN2 84
#define BTN_ENC 83 //the click switch
#define BTN_ENC 83
#define SD_DETECT_PIN -1 // Pin 72 if using easy adapter board

2
Marlin/pins_RAMPS_14.h
Unescape View File

@ -256,7 +256,7 @@
//The encoder and click button
#define BTN_EN1 40
#define BTN_EN2 63
#define BTN_ENC 59 //the click switch
#define BTN_ENC 59
//not connected to a pin
#define SD_DETECT_PIN 49

6
Marlin/pins_ULTIMAIN_2.h
Unescape View File

@ -89,10 +89,6 @@
//buttons are directly attached
#define BTN_EN1 40
#define BTN_EN2 41
#define BTN_ENC 19 //the click
#define BLEN_C 2
#define BLEN_B 1
#define BLEN_A 0
#define BTN_ENC 19
#define SD_DETECT_PIN 39

43
Marlin/ultralcd.h
Unescape View File

@ -58,7 +58,6 @@
void bootscreen();
#endif
#define LCD_MESSAGEPGM(x) lcd_setstatuspgm(PSTR(x))
#define LCD_ALERTMESSAGEPGM(x) lcd_setalertstatuspgm(PSTR(x))
@ -93,7 +92,20 @@
bool lcd_blink();
#if ENABLED(REPRAPWORLD_KEYPAD)
#if ENABLED(ULTIPANEL)
#define BLEN_A 0
#define BLEN_B 1
// Encoder click is directly connected
#if BUTTON_EXISTS(ENC)
#define BLEN_C 2
#define EN_C (_BV(BLEN_C))
#endif
#define EN_A (_BV(BLEN_A))
#define EN_B (_BV(BLEN_B))
#define EN_C (_BV(BLEN_C))
#endif
#if ENABLED(REPRAPWORLD_KEYPAD) // is also ULTIPANEL and NEWPANEL
#define REPRAPWORLD_BTN_OFFSET 0 // bit offset into buttons for shift register values
@ -135,36 +147,11 @@
EN_REPRAPWORLD_KEYPAD_LEFT) \
)
#endif // REPRAPWORLD_KEYPAD
#if ENABLED(NEWPANEL)
#define EN_C (_BV(BLEN_C))
#define EN_B (_BV(BLEN_B))
#define EN_A (_BV(BLEN_A))
#if ENABLED(REPRAPWORLD_KEYPAD)
#define LCD_CLICKED ((buttons & EN_C) || (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_F1))
#else
#elif ENABLED(NEWPANEL)
#define LCD_CLICKED (buttons & EN_C)
#endif
#else //!NEWPANEL
//atomic, do not change
#define B_LE (_BV(BL_LE))
#define B_UP (_BV(BL_UP))
#define B_MI (_BV(BL_MI))
#define B_DW (_BV(BL_DW))
#define B_RI (_BV(BL_RI))
#define B_ST (_BV(BL_ST))
#define EN_B (_BV(BLEN_B))
#define EN_A (_BV(BLEN_A))
#define LCD_CLICKED ((buttons&B_MI)||(buttons&B_ST))
#endif //!NEWPANEL
#else //no LCD
FORCE_INLINE void lcd_update() {}
FORCE_INLINE void lcd_init() {}

13
Marlin/ultralcd_impl_DOGM.h
Unescape View File

@ -42,20 +42,9 @@
* Implementation of the LCD display routines for a DOGM128 graphic display.
* These are common LCD 128x64 pixel graphic displays.
*/
#if ENABLED(ULTIPANEL)
#define BLEN_A 0
#define BLEN_B 1
#define BLEN_C 2
#define EN_A (_BV(BLEN_A))
#define EN_B (_BV(BLEN_B))
#define EN_C (_BV(BLEN_C))
#define LCD_CLICKED (buttons&EN_C)
#endif
#include "dogm_bitmaps.h"
#include "ultralcd.h"
#include "ultralcd_st7920_u8glib_rrd.h"
#include "dogm_bitmaps.h"
#include "duration_t.h"
#include <U8glib.h>

48
Marlin/ultralcd_impl_HD44780.h
Unescape View File

@ -39,18 +39,6 @@ extern volatile uint8_t buttons; //an extended version of the last checked butt
// via a shift/i2c register.
#if ENABLED(ULTIPANEL)
// All UltiPanels might have an encoder - so this is always be mapped onto first two bits
#define BLEN_B 1
#define BLEN_A 0
#define EN_B (_BV(BLEN_B)) // The two encoder pins are connected through BTN_EN1 and BTN_EN2
#define EN_A (_BV(BLEN_A))
#if BUTTON_EXISTS(ENC)
// encoder click is directly connected
#define BLEN_C 2
#define EN_C (_BV(BLEN_C))
#endif
//
// Setup other button mappings of each panel
@ -80,12 +68,7 @@ extern volatile uint8_t buttons; //an extended version of the last checked butt
#elif ENABLED(LCD_I2C_PANELOLU2)
#if BUTTON_EXISTS(ENC)
#undef LCD_CLICKED
#define LCD_CLICKED (buttons&EN_C)
#else // Read through I2C if not directly connected to a pin
#if !BUTTON_EXISTS(ENC) // Use I2C if not directly connected to a pin
#define B_I2C_BTN_OFFSET 3 // (the first three bit positions reserved for EN_A, EN_B, EN_C)
@ -99,32 +82,21 @@ extern volatile uint8_t buttons; //an extended version of the last checked butt
#endif
#elif ENABLED(REPRAPWORLD_KEYPAD)
// REPRAPWORLD_KEYPAD defined in ultralcd.h
#elif ENABLED(NEWPANEL)
#define LCD_CLICKED (buttons&EN_C)
#else // old style ULTIPANEL
//bits in the shift register that carry the buttons for:
// left up center down right red(stop)
#define BL_LE 7
#define BL_UP 6
#define BL_MI 5
#define BL_DW 4
#define BL_RI 3
#define BL_ST 2
//automatic, do not change
#elif DISABLED(NEWPANEL) // old style ULTIPANEL
// Shift register bits correspond to buttons:
#define BL_LE 7 // Left
#define BL_UP 6 // Up
#define BL_MI 5 // Middle
#define BL_DW 4 // Down
#define BL_RI 3 // Right
#define BL_ST 2 // Red Button
#define B_LE (_BV(BL_LE))
#define B_UP (_BV(BL_UP))
#define B_MI (_BV(BL_MI))
#define B_DW (_BV(BL_DW))
#define B_RI (_BV(BL_RI))
#define B_ST (_BV(BL_ST))
#define LCD_CLICKED (buttons&(B_MI|B_ST))
#define LCD_CLICKED ((buttons & B_MI) || (buttons & B_ST))
#endif
#endif //ULTIPANEL

Write Preview
Loading…
Cancel
Save