Skip to content

M
MarlinKimbra
Commit 007d9649 authored by MagoKimbra's avatar MagoKimbra
Browse files
Options

add support for LCD panel_one e VIKI

parent ee5b01a0
Hide whitespace changes
Inline Side-by-side
Showing with 256 additions and 173 deletions
MarlinKimbra/Configuration.h
View file @ 007d9649
...@@ -336,6 +336,7 @@ your extruder heater takes 2 minutes to hit the target on heating. ...@@ -336,6 +336,7 @@ your extruder heater takes 2 minutes to hit the target on heating.
// Character based displays can have different extended charsets. // Character based displays can have different extended charsets.
#define DISPLAY_CHARSET_HD44780_JAPAN // "ääööüüß23°" #define DISPLAY_CHARSET_HD44780_JAPAN // "ääööüüß23°"
//#define DISPLAY_CHARSET_HD44780_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one. //#define DISPLAY_CHARSET_HD44780_WESTERN // "ÄäÖöÜüß²³°" if you see a '~' instead of a 'arrow_right' at the right of submenuitems - this is the right one.
//#define ULTRA_LCD //general LCD support, also 16x2 //#define ULTRA_LCD //general LCD support, also 16x2
//#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family) //#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
//#define SDSUPPORT // Enable SD Card Support in Hardware Console //#define SDSUPPORT // Enable SD Card Support in Hardware Console
...@@ -348,10 +349,20 @@ your extruder heater takes 2 minutes to hit the target on heating. ...@@ -348,10 +349,20 @@ your extruder heater takes 2 minutes to hit the target on heating.
//#define LCD_FEEDBACK_FREQUENCY_HZ 1000 // this is the tone frequency the buzzer plays when on UI feedback. ie Screen Click //#define LCD_FEEDBACK_FREQUENCY_HZ 1000 // this is the tone frequency the buzzer plays when on UI feedback. ie Screen Click
//#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 // the duration the buzzer plays the UI feedback sound. ie Screen Click //#define LCD_FEEDBACK_FREQUENCY_DURATION_MS 100 // the duration the buzzer plays the UI feedback sound. ie Screen Click
// PanelOne from T3P3 (via RAMPS 1.4 AUX2/AUX3)
// http://reprap.org/wiki/PanelOne
//#define PANEL_ONE
// The MaKr3d Makr-Panel with graphic controller and SD support // The MaKr3d Makr-Panel with graphic controller and SD support
// http://reprap.org/wiki/MaKr3d_MaKrPanel // http://reprap.org/wiki/MaKr3d_MaKrPanel
//#define MAKRPANEL //#define MAKRPANEL
// The Panucatt Devices Viki 2.0 and mini Viki with Graphic LCD
// http://panucatt.com
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
//#define VIKI2
//#define miniVIKI
// The RepRapDiscount Smart Controller (white PCB) // The RepRapDiscount Smart Controller (white PCB)
// http://reprap.org/wiki/RepRapDiscount_Smart_Controller // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
//#define REPRAP_DISCOUNT_SMART_CONTROLLER //#define REPRAP_DISCOUNT_SMART_CONTROLLER
...@@ -385,6 +396,26 @@ your extruder heater takes 2 minutes to hit the target on heating. ...@@ -385,6 +396,26 @@ your extruder heater takes 2 minutes to hit the target on heating.
#define DEFAULT_LCD_CONTRAST 17 #define DEFAULT_LCD_CONTRAST 17
#endif //defined (MAKRPANEL) #endif //defined (MAKRPANEL)
#if defined(miniVIKI) || defined(VIKI2)
#define ULTRA_LCD //general LCD support, also 16x2
#define DOGLCD // Support for SPI LCD 128x64 (Controller ST7565R graphic Display Family)
#define ULTIMAKERCONTROLLER //as available from the Ultimaker online store.
#ifdef miniVIKI
#define DEFAULT_LCD_CONTRAST 95
#else
#define DEFAULT_LCD_CONTRAST 40
#endif
#define ENCODER_PULSES_PER_STEP 4
#define ENCODER_STEPS_PER_MENU_ITEM 1
#endif //defined(miniVIKI) || defined(VIKI2)
#if defined (PANEL_ONE)
#define SDSUPPORT
#define ULTIMAKERCONTROLLER
#endif //defined (PANEL_ONE)
#if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) #if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define DOGLCD #define DOGLCD
#define U8GLIB_ST7920 #define U8GLIB_ST7920
......
MarlinKimbra/pins.h
View file @ 007d9649
...@@ -913,20 +913,20 @@ ...@@ -913,20 +913,20 @@
#define HEATER_BED_PIN 8 // BED #define HEATER_BED_PIN 8 // BED
#define TEMP_BED_PIN 14 // ANALOG NUMBERING #define TEMP_BED_PIN 14 // ANALOG NUMBERING
#ifdef FILAMENT_SENSOR #ifdef FILAMENT_SENSOR
// FMM added for Filament Extruder // FMM added for Filament Extruder
//define analog pin for the filament width sensor input //define analog pin for the filament width sensor input
//Use the RAMPS 1.4 Analog input 5 on the AUX2 connector //Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
#define FILWIDTH_PIN 5 // ANALOG NUMBERING #define FILWIDTH_PIN 5 // ANALOG NUMBERING
#endif #endif
#if defined(REPRAP_DISCOUNT_SMART_CONTROLLER) || defined(G3D_PANEL) #if defined(REPRAP_DISCOUNT_SMART_CONTROLLER) || defined(G3D_PANEL)
#define KILL_PIN 41 #define KILL_PIN 41
#else #else
#define KILL_PIN -1 #define KILL_PIN -1
#endif #endif
#if NUM_SERVOS > 0 #if NUM_SERVOS > 0
#define SERVO0_PIN 11 #define SERVO0_PIN 11
#if NUM_SERVOS > 1 #if NUM_SERVOS > 1
...@@ -939,23 +939,32 @@ ...@@ -939,23 +939,32 @@
#endif #endif
#endif #endif
#endif #endif
#ifdef ULTRA_LCD #ifdef ULTRA_LCD
#ifdef NEWPANEL #ifdef NEWPANEL
#define LCD_PINS_RS 16 #ifdef PANEL_ONE
#define LCD_PINS_ENABLE 17 #define LCD_PINS_RS 40
#define LCD_PINS_D4 23 #define LCD_PINS_ENABLE 42
#define LCD_PINS_D5 25 #define LCD_PINS_D4 65
#define LCD_PINS_D6 27 #define LCD_PINS_D5 66
#define LCD_PINS_D7 29 #define LCD_PINS_D6 44
#define LCD_PINS_D7 64
#else
#define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17
#define LCD_PINS_D4 23
#define LCD_PINS_D5 25
#define LCD_PINS_D6 27
#define LCD_PINS_D7 29
#endif //PANEL_ONE
#ifdef REPRAP_DISCOUNT_SMART_CONTROLLER #ifdef REPRAP_DISCOUNT_SMART_CONTROLLER
#define BEEPER 37 #define BEEPER 37
#define BTN_EN1 31 #define BTN_EN1 31
#define BTN_EN2 33 #define BTN_EN2 33
#define BTN_ENC 35 #define BTN_ENC 35
#define SDCARDDETECT 49 #define SDCARDDETECT 49
#elif defined(LCD_I2C_PANELOLU2) #elif defined(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.
...@@ -973,7 +982,7 @@ ...@@ -973,7 +982,7 @@
#else #else
//arduino pin which triggers an piezzo beeper //arduino pin which triggers an piezzo beeper
#define BEEPER 33 // Beeper on AUX-4 #define BEEPER 33 // Beeper on AUX-4
//buttons are directly attached using AUX-2 //buttons are directly attached using AUX-2
#ifdef REPRAPWORLD_KEYPAD #ifdef REPRAPWORLD_KEYPAD
#define BTN_EN1 64 // encoder #define BTN_EN1 64 // encoder
...@@ -982,6 +991,10 @@ ...@@ -982,6 +991,10 @@
#define SHIFT_OUT 40 // shift register #define SHIFT_OUT 40 // shift register
#define SHIFT_CLK 44 // shift register #define SHIFT_CLK 44 // shift register
#define SHIFT_LD 42 // shift register #define SHIFT_LD 42 // shift register
#elif defined(PANEL_ONE)
#define BTN_EN1 59 // AUX2 PIN 3
#define BTN_EN2 63 // AUX2 PIN 4
#define BTN_ENC 49 // AUX3 PIN 7
#else #else
#define BTN_EN1 37 #define BTN_EN1 37
#define BTN_EN2 35 #define BTN_EN2 35
...@@ -993,7 +1006,7 @@ ...@@ -993,7 +1006,7 @@
#else #else
#define SDCARDDETECT -1 // Ramps does not use this port #define SDCARDDETECT -1 // Ramps does not use this port
#endif #endif
#endif #endif
#else //old style panel with shift register #else //old style panel with shift register
...@@ -1013,9 +1026,9 @@ ...@@ -1013,9 +1026,9 @@
#define LCD_PINS_D5 25 #define LCD_PINS_D5 25
#define LCD_PINS_D6 27 #define LCD_PINS_D6 27
#define LCD_PINS_D7 29 #define LCD_PINS_D7 29
#endif #endif //NEWPANEL
#endif //ULTRA_LCD #endif //ULTRA_LCD
// SPI for Max6675 Thermocouple // SPI for Max6675 Thermocouple
#ifndef SDSUPPORT #ifndef SDSUPPORT
// these pins are defined in the SD library if building with SD support // these pins are defined in the SD library if building with SD support
...@@ -1041,27 +1054,27 @@ ...@@ -1041,27 +1054,27 @@
#if MB(RAMPS_13_EEB) #if MB(RAMPS_13_EEB)
#define KNOWN_BOARD 1 #define KNOWN_BOARD 1
#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__) #if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
#error Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu. #error Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu.
#endif #endif
#define LARGE_FLASH true #define LARGE_FLASH true
//X axis pins //X axis pins
#define X_STEP_PIN 54 #define X_STEP_PIN 54
#define X_DIR_PIN 55 #define X_DIR_PIN 55
#define X_ENABLE_PIN 38 #define X_ENABLE_PIN 38
#define X_MIN_PIN 3 #define X_MIN_PIN 3
#define X_MAX_PIN 2 #define X_MAX_PIN 2
//Y axis pins //Y axis pins
#define Y_STEP_PIN 60 #define Y_STEP_PIN 60
#define Y_DIR_PIN 61 #define Y_DIR_PIN 61
#define Y_ENABLE_PIN 56 #define Y_ENABLE_PIN 56
#define Y_MIN_PIN 14 #define Y_MIN_PIN 14
#define Y_MAX_PIN 15 #define Y_MAX_PIN 15
#define Y2_STEP_PIN 36 #define Y2_STEP_PIN 36
#define Y2_DIR_PIN 34 #define Y2_DIR_PIN 34
#define Y2_ENABLE_PIN 30 #define Y2_ENABLE_PIN 30
...@@ -1085,14 +1098,14 @@ ...@@ -1085,14 +1098,14 @@
#define E1_STEP_PIN 36 #define E1_STEP_PIN 36
#define E1_DIR_PIN 34 #define E1_DIR_PIN 34
#define E1_ENABLE_PIN 30 #define E1_ENABLE_PIN 30
#define SDPOWER -1 #define SDPOWER -1
#define SDSS 53 #define SDSS 53
#define LED_PIN 13 #define LED_PIN 13
#define FAN_PIN 4 #define FAN_PIN 4
#define PS_ON_PIN 12 #define PS_ON_PIN 12
#define HEATER_0_PIN 10 // HOTEND 1 #define HEATER_0_PIN 10 // HOTEND 1
#define HEATER_1_PIN 9 // HOTEND 2 #define HEATER_1_PIN 9 // HOTEND 2
#define HEATER_2_PIN -1 #define HEATER_2_PIN -1
...@@ -1102,10 +1115,10 @@ ...@@ -1102,10 +1115,10 @@
#define TEMP_1_PIN 15 // ANALOG NUMBERING #define TEMP_1_PIN 15 // ANALOG NUMBERING
#define TEMP_2_PIN -1 // ANALOG NUMBERING #define TEMP_2_PIN -1 // ANALOG NUMBERING
#define TEMP_3_PIN -1 // ANALOG NUMBERING #define TEMP_3_PIN -1 // ANALOG NUMBERING
#define HEATER_BED_PIN 8 // BED #define HEATER_BED_PIN 8 // BED
#define TEMP_BED_PIN 14 // ANALOG NUMBERING #define TEMP_BED_PIN 14 // ANALOG NUMBERING
#ifdef FILAMENT_SENSOR #ifdef FILAMENT_SENSOR
// FMM added for Filament Extruder // FMM added for Filament Extruder
//define analog pin for the filament width sensor input //define analog pin for the filament width sensor input
...@@ -1128,50 +1141,63 @@ ...@@ -1128,50 +1141,63 @@
#ifdef ULTRA_LCD #ifdef ULTRA_LCD
#ifdef NEWPANEL #ifdef NEWPANEL
#define LCD_PINS_RS 16 #ifdef PANEL_ONE
#define LCD_PINS_ENABLE 17 #define LCD_PINS_RS 40
#define LCD_PINS_D4 23 #define LCD_PINS_ENABLE 42
#define LCD_PINS_D5 25 #define LCD_PINS_D4 65
#define LCD_PINS_D6 27 #define LCD_PINS_D5 66
#define LCD_PINS_D7 29 #define LCD_PINS_D6 44
#define LCD_PINS_D7 64
#else
#define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17
#define LCD_PINS_D4 23
#define LCD_PINS_D5 25
#define LCD_PINS_D6 27
#define LCD_PINS_D7 29
#endif //PANEL_ONE
#ifdef REPRAP_DISCOUNT_SMART_CONTROLLER #ifdef REPRAP_DISCOUNT_SMART_CONTROLLER
#define BEEPER 37 #define BEEPER 37
#define BTN_EN1 31 #define BTN_EN1 31
#define BTN_EN2 33 #define BTN_EN2 33
#define BTN_ENC 35 #define BTN_ENC 35
#define SDCARDDETECT 49 #define SDCARDDETECT 49
#elif defined(LCD_I2C_PANELOLU2) #elif defined(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
#define BTN_ENC 32 #define BTN_ENC 32
#define LCD_SDSS 53 #define LCD_SDSS 53
#define SDCARDDETECT -1 #define SDCARDDETECT -1
#define KILL_PIN 41 #define KILL_PIN 41
#elif defined(LCD_I2C_VIKI) #elif defined(LCD_I2C_VIKI)
#define BTN_EN1 22 //reverse if the encoder turns the wrong way. #define BTN_EN1 22 //reverse if the encoder turns the wrong way.
#define BTN_EN2 7 #define BTN_EN2 7
#define BTN_ENC -1 #define BTN_ENC -1
#define LCD_SDSS 53 #define LCD_SDSS 53
#define SDCARDDETECT 49 #define SDCARDDETECT 49
#else #else
//arduino pin which triggers an piezzo beeper //arduino pin which triggers an piezzo beeper
#define BEEPER 33 // Beeper on AUX-4 #define BEEPER 33 // Beeper on AUX-4
//buttons are directly attached using AUX-2 //buttons are directly attached using AUX-2
#ifdef REPRAPWORLD_KEYPAD #ifdef REPRAPWORLD_KEYPAD
#define BTN_EN1 64 // encoder #define BTN_EN1 64 // encoder
#define BTN_EN2 59 // encoder #define BTN_EN2 59 // encoder
#define BTN_ENC 63 // enter button #define BTN_ENC 63 // enter button
#define SHIFT_OUT 40 // shift register #define SHIFT_OUT 40 // shift register
#define SHIFT_CLK 44 // shift register #define SHIFT_CLK 44 // shift register
#define SHIFT_LD 42 // shift register #define SHIFT_LD 42 // shift register
#elif defined(PANEL_ONE)
#define BTN_EN1 59 // AUX2 PIN 3
#define BTN_EN2 63 // AUX2 PIN 4
#define BTN_ENC 49 // AUX3 PIN 7
#else #else
#define BTN_EN1 37 #define BTN_EN1 37
#define BTN_EN2 35 #define BTN_EN2 35
#define BTN_ENC 31 //the click #define BTN_ENC 31 //the click
#endif #endif
#ifdef G3D_PANEL #ifdef G3D_PANEL
...@@ -1179,19 +1205,19 @@ ...@@ -1179,19 +1205,19 @@
#else #else
#define SDCARDDETECT -1 // Ramps does not use this port #define SDCARDDETECT -1 // Ramps does not use this port
#endif #endif
#endif #endif
#else //old style panel with shift register #else //old style panel with shift register
//arduino pin witch triggers an piezzo beeper //arduino pin witch triggers an piezzo beeper
#define BEEPER 33 //No Beeper added #define BEEPER 33 //No Beeper added
//buttons are attached to a shift register //buttons are attached to a shift register
// Not wired this yet // Not wired this yet
//#define SHIFT_CLK 38 //#define SHIFT_CLK 38
//#define SHIFT_LD 42 //#define SHIFT_LD 42
//#define SHIFT_OUT 40 //#define SHIFT_OUT 40
//#define SHIFT_EN 17 //#define SHIFT_EN 17
#define LCD_PINS_RS 16 #define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17 #define LCD_PINS_ENABLE 17
...@@ -1199,9 +1225,9 @@ ...@@ -1199,9 +1225,9 @@
#define LCD_PINS_D5 25 #define LCD_PINS_D5 25
#define LCD_PINS_D6 27 #define LCD_PINS_D6 27
#define LCD_PINS_D7 29 #define LCD_PINS_D7 29
#endif #endif //NEWPANEL
#endif //ULTRA_LCD #endif //ULTRA_LCD
// SPI for Max6675 Thermocouple // SPI for Max6675 Thermocouple
#ifndef SDSUPPORT #ifndef SDSUPPORT
// these pins are defined in the SD library if building with SD support // these pins are defined in the SD library if building with SD support
...@@ -1227,27 +1253,27 @@ ...@@ -1227,27 +1253,27 @@
#if MB(RAMPS_13_EFF) #if MB(RAMPS_13_EFF)
#define KNOWN_BOARD 1 #define KNOWN_BOARD 1
#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__) #if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
#error Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu. #error Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu.
#endif #endif
#define LARGE_FLASH true #define LARGE_FLASH true
//X axis pins //X axis pins
#define X_STEP_PIN 54 #define X_STEP_PIN 54
#define X_DIR_PIN 55 #define X_DIR_PIN 55
#define X_ENABLE_PIN 38 #define X_ENABLE_PIN 38
#define X_MIN_PIN 3 #define X_MIN_PIN 3
#define X_MAX_PIN 2 #define X_MAX_PIN 2
//Y axis pins //Y axis pins
#define Y_STEP_PIN 60 #define Y_STEP_PIN 60
#define Y_DIR_PIN 61 #define Y_DIR_PIN 61
#define Y_ENABLE_PIN 56 #define Y_ENABLE_PIN 56
#define Y_MIN_PIN 14 #define Y_MIN_PIN 14
#define Y_MAX_PIN 15 #define Y_MAX_PIN 15
#define Y2_STEP_PIN 36 #define Y2_STEP_PIN 36
#define Y2_DIR_PIN 34 #define Y2_DIR_PIN 34
#define Y2_ENABLE_PIN 30 #define Y2_ENABLE_PIN 30
...@@ -1271,14 +1297,14 @@ ...@@ -1271,14 +1297,14 @@
#define E1_STEP_PIN 36 #define E1_STEP_PIN 36
#define E1_DIR_PIN 34 #define E1_DIR_PIN 34
#define E1_ENABLE_PIN 30 #define E1_ENABLE_PIN 30
#define SDPOWER -1 #define SDPOWER -1
#define SDSS 53 #define SDSS 53
#define LED_PIN 13 #define LED_PIN 13
#define FAN_PIN 9 #define FAN_PIN 9
#define PS_ON_PIN 12 #define PS_ON_PIN 12
#define HEATER_0_PIN 10 // HOTEND 1 #define HEATER_0_PIN 10 // HOTEND 1
#define HEATER_1_PIN -1 #define HEATER_1_PIN -1
#define HEATER_2_PIN -1 #define HEATER_2_PIN -1
...@@ -1288,7 +1314,7 @@ ...@@ -1288,7 +1314,7 @@
#define TEMP_1_PIN 15 // ANALOG NUMBERING #define TEMP_1_PIN 15 // ANALOG NUMBERING
#define TEMP_2_PIN -1 // ANALOG NUMBERING #define TEMP_2_PIN -1 // ANALOG NUMBERING
#define TEMP_3_PIN -1 // ANALOG NUMBERING #define TEMP_3_PIN -1 // ANALOG NUMBERING
#define HEATER_BED_PIN -1 // BED #define HEATER_BED_PIN -1 // BED
#define TEMP_BED_PIN 14 // ANALOG NUMBERING #define TEMP_BED_PIN 14 // ANALOG NUMBERING
...@@ -1314,50 +1340,63 @@ ...@@ -1314,50 +1340,63 @@
#ifdef ULTRA_LCD #ifdef ULTRA_LCD
#ifdef NEWPANEL #ifdef NEWPANEL
#define LCD_PINS_RS 16 #ifdef PANEL_ONE
#define LCD_PINS_ENABLE 17 #define LCD_PINS_RS 40
#define LCD_PINS_D4 23 #define LCD_PINS_ENABLE 42
#define LCD_PINS_D5 25 #define LCD_PINS_D4 65
#define LCD_PINS_D6 27 #define LCD_PINS_D5 66
#define LCD_PINS_D7 29 #define LCD_PINS_D6 44
#define LCD_PINS_D7 64
#else
#define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17
#define LCD_PINS_D4 23
#define LCD_PINS_D5 25
#define LCD_PINS_D6 27
#define LCD_PINS_D7 29
#endif //PANEL_ONE
#ifdef REPRAP_DISCOUNT_SMART_CONTROLLER #ifdef REPRAP_DISCOUNT_SMART_CONTROLLER
#define BEEPER 37 #define BEEPER 37
#define BTN_EN1 31 #define BTN_EN1 31
#define BTN_EN2 33 #define BTN_EN2 33
#define BTN_ENC 35 #define BTN_ENC 35
#define SDCARDDETECT 49 #define SDCARDDETECT 49
#elif defined(LCD_I2C_PANELOLU2) #elif defined(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
#define BTN_ENC 32 #define BTN_ENC 32
#define LCD_SDSS 53 #define LCD_SDSS 53
#define SDCARDDETECT -1 #define SDCARDDETECT -1
#define KILL_PIN 41 #define KILL_PIN 41
#elif defined(LCD_I2C_VIKI) #elif defined(LCD_I2C_VIKI)
#define BTN_EN1 22 //reverse if the encoder turns the wrong way. #define BTN_EN1 22 //reverse if the encoder turns the wrong way.
#define BTN_EN2 7 #define BTN_EN2 7
#define BTN_ENC -1 #define BTN_ENC -1
#define LCD_SDSS 53 #define LCD_SDSS 53
#define SDCARDDETECT 49 #define SDCARDDETECT 49
#else #else
//arduino pin which triggers an piezzo beeper //arduino pin which triggers an piezzo beeper
#define BEEPER 33 // Beeper on AUX-4 #define BEEPER 33 // Beeper on AUX-4
//buttons are directly attached using AUX-2 //buttons are directly attached using AUX-2
#ifdef REPRAPWORLD_KEYPAD #ifdef REPRAPWORLD_KEYPAD
#define BTN_EN1 64 // encoder #define BTN_EN1 64 // encoder
#define BTN_EN2 59 // encoder #define BTN_EN2 59 // encoder
#define BTN_ENC 63 // enter button #define BTN_ENC 63 // enter button
#define SHIFT_OUT 40 // shift register #define SHIFT_OUT 40 // shift register
#define SHIFT_CLK 44 // shift register #define SHIFT_CLK 44 // shift register
#define SHIFT_LD 42 // shift register #define SHIFT_LD 42 // shift register
#elif defined(PANEL_ONE)
#define BTN_EN1 59 // AUX2 PIN 3
#define BTN_EN2 63 // AUX2 PIN 4
#define BTN_ENC 49 // AUX3 PIN 7
#else #else
#define BTN_EN1 37 #define BTN_EN1 37
#define BTN_EN2 35 #define BTN_EN2 35
#define BTN_ENC 31 //the click #define BTN_ENC 31 //the click
#endif #endif
#ifdef G3D_PANEL #ifdef G3D_PANEL
...@@ -1365,19 +1404,19 @@ ...@@ -1365,19 +1404,19 @@
#else #else
#define SDCARDDETECT -1 // Ramps does not use this port #define SDCARDDETECT -1 // Ramps does not use this port
#endif #endif
#endif #endif
#else //old style panel with shift register #else //old style panel with shift register
//arduino pin witch triggers an piezzo beeper //arduino pin witch triggers an piezzo beeper
#define BEEPER 33 //No Beeper added #define BEEPER 33 //No Beeper added
//buttons are attached to a shift register //buttons are attached to a shift register
// Not wired this yet // Not wired this yet
//#define SHIFT_CLK 38 //#define SHIFT_CLK 38
//#define SHIFT_LD 42 //#define SHIFT_LD 42
//#define SHIFT_OUT 40 //#define SHIFT_OUT 40
//#define SHIFT_EN 17 //#define SHIFT_EN 17
#define LCD_PINS_RS 16 #define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17 #define LCD_PINS_ENABLE 17
...@@ -1385,9 +1424,9 @@ ...@@ -1385,9 +1424,9 @@
#define LCD_PINS_D5 25 #define LCD_PINS_D5 25
#define LCD_PINS_D6 27 #define LCD_PINS_D6 27
#define LCD_PINS_D7 29 #define LCD_PINS_D7 29
#endif #endif //NEWPANEL
#endif //ULTRA_LCD #endif //ULTRA_LCD
// SPI for Max6675 Thermocouple // SPI for Max6675 Thermocouple
#ifndef SDSUPPORT #ifndef SDSUPPORT
// these pins are defined in the SD library if building with SD support // these pins are defined in the SD library if building with SD support
...@@ -1413,27 +1452,27 @@ ...@@ -1413,27 +1452,27 @@
#if MB(RAMPS_13_EEF) #if MB(RAMPS_13_EEF)
#define KNOWN_BOARD 1 #define KNOWN_BOARD 1
#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__) #if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
#error Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu. #error Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu.
#endif #endif
#define LARGE_FLASH true #define LARGE_FLASH true
//X axis pins //X axis pins
#define X_STEP_PIN 54 #define X_STEP_PIN 54
#define X_DIR_PIN 55 #define X_DIR_PIN 55
#define X_ENABLE_PIN 38 #define X_ENABLE_PIN 38
#define X_MIN_PIN 3 #define X_MIN_PIN 3
#define X_MAX_PIN 2 #define X_MAX_PIN 2
//Y axis pins //Y axis pins
#define Y_STEP_PIN 60 #define Y_STEP_PIN 60
#define Y_DIR_PIN 61 #define Y_DIR_PIN 61
#define Y_ENABLE_PIN 56 #define Y_ENABLE_PIN 56
#define Y_MIN_PIN 14 #define Y_MIN_PIN 14
#define Y_MAX_PIN 15 #define Y_MAX_PIN 15
#define Y2_STEP_PIN 36 #define Y2_STEP_PIN 36
#define Y2_DIR_PIN 34 #define Y2_DIR_PIN 34
#define Y2_ENABLE_PIN 30 #define Y2_ENABLE_PIN 30
...@@ -1457,14 +1496,14 @@ ...@@ -1457,14 +1496,14 @@
#define E1_STEP_PIN 36 #define E1_STEP_PIN 36
#define E1_DIR_PIN 34 #define E1_DIR_PIN 34
#define E1_ENABLE_PIN 30 #define E1_ENABLE_PIN 30
#define SDPOWER -1 #define SDPOWER -1
#define SDSS 53 #define SDSS 53
#define LED_PIN 13 #define LED_PIN 13
#define FAN_PIN 8 #define FAN_PIN 8
#define PS_ON_PIN 12 #define PS_ON_PIN 12
#define HEATER_0_PIN 10 // HOTEND 1 #define HEATER_0_PIN 10 // HOTEND 1
#define HEATER_1_PIN 9 // HOTEND 2 #define HEATER_1_PIN 9 // HOTEND 2
#define HEATER_2_PIN -1 #define HEATER_2_PIN -1
...@@ -1474,10 +1513,10 @@ ...@@ -1474,10 +1513,10 @@
#define TEMP_1_PIN 15 // ANALOG NUMBERING #define TEMP_1_PIN 15 // ANALOG NUMBERING
#define TEMP_2_PIN -1 // ANALOG NUMBERING #define TEMP_2_PIN -1 // ANALOG NUMBERING
#define TEMP_3_PIN -1 // ANALOG NUMBERING #define TEMP_3_PIN -1 // ANALOG NUMBERING
#define HEATER_BED_PIN 8 // BED #define HEATER_BED_PIN 8 // BED
#define TEMP_BED_PIN 14 // ANALOG NUMBERING #define TEMP_BED_PIN 14 // ANALOG NUMBERING
#ifdef FILAMENT_SENSOR #ifdef FILAMENT_SENSOR
// FMM added for Filament Extruder // FMM added for Filament Extruder
//define analog pin for the filament width sensor input //define analog pin for the filament width sensor input
...@@ -1500,50 +1539,63 @@ ...@@ -1500,50 +1539,63 @@
#ifdef ULTRA_LCD #ifdef ULTRA_LCD
#ifdef NEWPANEL #ifdef NEWPANEL
#define LCD_PINS_RS 16 #ifdef PANEL_ONE
#define LCD_PINS_ENABLE 17 #define LCD_PINS_RS 40
#define LCD_PINS_D4 23 #define LCD_PINS_ENABLE 42
#define LCD_PINS_D5 25 #define LCD_PINS_D4 65
#define LCD_PINS_D6 27 #define LCD_PINS_D5 66
#define LCD_PINS_D7 29 #define LCD_PINS_D6 44
#define LCD_PINS_D7 64
#else
#define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17
#define LCD_PINS_D4 23
#define LCD_PINS_D5 25
#define LCD_PINS_D6 27
#define LCD_PINS_D7 29
#endif //PANEL_ONE
#ifdef REPRAP_DISCOUNT_SMART_CONTROLLER #ifdef REPRAP_DISCOUNT_SMART_CONTROLLER
#define BEEPER 37 #define BEEPER 37
#define BTN_EN1 31 #define BTN_EN1 31
#define BTN_EN2 33 #define BTN_EN2 33
#define BTN_ENC 35 #define BTN_ENC 35
#define SDCARDDETECT 49 #define SDCARDDETECT 49
#elif defined(LCD_I2C_PANELOLU2) #elif defined(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
#define BTN_ENC 32 #define BTN_ENC 32
#define LCD_SDSS 53 #define LCD_SDSS 53
#define SDCARDDETECT -1 #define SDCARDDETECT -1
#define KILL_PIN 41 #define KILL_PIN 41
#elif defined(LCD_I2C_VIKI) #elif defined(LCD_I2C_VIKI)
#define BTN_EN1 22 //reverse if the encoder turns the wrong way. #define BTN_EN1 22 //reverse if the encoder turns the wrong way.
#define BTN_EN2 7 #define BTN_EN2 7
#define BTN_ENC -1 #define BTN_ENC -1
#define LCD_SDSS 53 #define LCD_SDSS 53
#define SDCARDDETECT 49 #define SDCARDDETECT 49
#else #else
//arduino pin which triggers an piezzo beeper //arduino pin which triggers an piezzo beeper
#define BEEPER 33 // Beeper on AUX-4 #define BEEPER 33 // Beeper on AUX-4
//buttons are directly attached using AUX-2 //buttons are directly attached using AUX-2
#ifdef REPRAPWORLD_KEYPAD #ifdef REPRAPWORLD_KEYPAD
#define BTN_EN1 64 // encoder #define BTN_EN1 64 // encoder
#define BTN_EN2 59 // encoder #define BTN_EN2 59 // encoder
#define BTN_ENC 63 // enter button #define BTN_ENC 63 // enter button
#define SHIFT_OUT 40 // shift register #define SHIFT_OUT 40 // shift register
#define SHIFT_CLK 44 // shift register #define SHIFT_CLK 44 // shift register
#define SHIFT_LD 42 // shift register #define SHIFT_LD 42 // shift register
#elif defined(PANEL_ONE)
#define BTN_EN1 59 // AUX2 PIN 3
#define BTN_EN2 63 // AUX2 PIN 4
#define BTN_ENC 49 // AUX3 PIN 7
#else #else
#define BTN_EN1 37 #define BTN_EN1 37
#define BTN_EN2 35 #define BTN_EN2 35
#define BTN_ENC 31 //the click #define BTN_ENC 31 //the click
#endif #endif
#ifdef G3D_PANEL #ifdef G3D_PANEL
...@@ -1551,19 +1603,19 @@ ...@@ -1551,19 +1603,19 @@
#else #else
#define SDCARDDETECT -1 // Ramps does not use this port #define SDCARDDETECT -1 // Ramps does not use this port
#endif #endif
#endif #endif
#else //old style panel with shift register #else //old style panel with shift register
//arduino pin witch triggers an piezzo beeper //arduino pin witch triggers an piezzo beeper
#define BEEPER 33 //No Beeper added #define BEEPER 33 //No Beeper added
//buttons are attached to a shift register //buttons are attached to a shift register
// Not wired this yet // Not wired this yet
//#define SHIFT_CLK 38 //#define SHIFT_CLK 38
//#define SHIFT_LD 42 //#define SHIFT_LD 42
//#define SHIFT_OUT 40 //#define SHIFT_OUT 40
//#define SHIFT_EN 17 //#define SHIFT_EN 17
#define LCD_PINS_RS 16 #define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17 #define LCD_PINS_ENABLE 17
...@@ -1571,9 +1623,9 @@ ...@@ -1571,9 +1623,9 @@
#define LCD_PINS_D5 25 #define LCD_PINS_D5 25
#define LCD_PINS_D6 27 #define LCD_PINS_D6 27
#define LCD_PINS_D7 29 #define LCD_PINS_D7 29
#endif #endif //NEWPANEL
#endif //ULTRA_LCD #endif //ULTRA_LCD
// SPI for Max6675 Thermocouple // SPI for Max6675 Thermocouple
#ifndef SDSUPPORT #ifndef SDSUPPORT
// these pins are defined in the SD library if building with SD support // these pins are defined in the SD library if building with SD support
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment