zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

changes:

Browse source 
- changed the variables from keypad to reprapworld_keypad
- added a missing ifdef check
This commit is contained in:
gregor 2013-05-10 22:20:02 +02:00
parent 6fb9573157
commit 2739c26c4f
4 changed files with 58 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Marlin/Configuration.h
View file

@ -338,10 +338,10 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
// ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib // ==> REMEMBER TO INSTALL U8glib to your ARDUINO library folder: http://code.google.com/p/u8glib/wiki/u8glib
//#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER //#define REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
// The RepRapWorld Keypad v1.1 // The RepRapWorld REPRAPWORLD_KEYPAD v1.1
// http://reprapworld.com/?products_details&products_id=202&cPath=1591_1626 // http://reprapworld.com/?products_details&products_id=202&cPath=1591_1626
//#define KEYPAD //#define REPRAPWORLD_KEYPAD
//#define KEYPAD_MOVE_STEP 10.0 // how much should be moved when a key is pressed, eg 10.0 means 10mm per click //#define REPRAPWORLD_KEYPAD_MOVE_STEP 10.0 // how much should be moved when a key is pressed, eg 10.0 means 10mm per click
//automatic expansion //automatic expansion
#if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) #if defined (REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
@ -355,7 +355,7 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
#define NEWPANEL #define NEWPANEL
#endif #endif
#if defined(KEYPAD) #if defined(REPRAPWORLD_KEYPAD)
#define NEWPANEL #define NEWPANEL
#define ULTIPANEL #define ULTIPANEL
#endif #endif

18
Marlin/pins.h
View file

@ -416,7 +416,7 @@
#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 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
@ -424,14 +424,14 @@
#define SHIFT_CLK 44 // shift register #define SHIFT_CLK 44 // shift register
#define SHIFT_LD 42 // shift register #define SHIFT_LD 42 // shift register
// define register bit values, don't change it // define register bit values, don't change it
#define BLEN_KEYPAD_F3 0 #define BLEN_REPRAPWORLD_KEYPAD_F3 0
#define BLEN_KEYPAD_F2 1 #define BLEN_REPRAPWORLD_KEYPAD_F2 1
#define BLEN_KEYPAD_F1 2 #define BLEN_REPRAPWORLD_KEYPAD_F1 2
#define BLEN_KEYPAD_UP 3 #define BLEN_REPRAPWORLD_KEYPAD_UP 3
#define BLEN_KEYPAD_RIGHT 4 #define BLEN_REPRAPWORLD_KEYPAD_RIGHT 4
#define BLEN_KEYPAD_MIDDLE 5 #define BLEN_REPRAPWORLD_KEYPAD_MIDDLE 5
#define BLEN_KEYPAD_DOWN 6 #define BLEN_REPRAPWORLD_KEYPAD_DOWN 6
#define BLEN_KEYPAD_LEFT 7 #define BLEN_REPRAPWORLD_KEYPAD_LEFT 7
#else #else
#define BTN_EN1 37 #define BTN_EN1 37
#define BTN_EN2 35 #define BTN_EN2 35

57
Marlin/ultralcd.cpp
View file

@ -113,7 +113,7 @@ static void menu_action_setting_edit_callback_long5(const char* pstr, unsigned l
/** Used variables to keep track of the menu */ /** Used variables to keep track of the menu */
volatile uint8_t buttons;//Contains the bits of the currently pressed buttons. volatile uint8_t buttons;//Contains the bits of the currently pressed buttons.
volatile uint8_t buttons_keypad; // to store the keypad shiftregister values volatile uint8_t buttons_reprapworld_keypad; // to store the reprapworld_keypad shiftregister values
uint8_t currentMenuViewOffset; /* scroll offset in the current menu */ uint8_t currentMenuViewOffset; /* scroll offset in the current menu */
uint32_t blocking_enc; uint32_t blocking_enc;
@ -688,19 +688,18 @@ menu_edit_type(float, float51, ftostr51, 10)
menu_edit_type(float, float52, ftostr52, 100) menu_edit_type(float, float52, ftostr52, 100)
menu_edit_type(unsigned long, long5, ftostr5, 0.01) menu_edit_type(unsigned long, long5, ftostr5, 0.01)
#ifdef KEYPAD #ifdef REPRAPWORLD_KEYPAD
static void keypad_move_y_down() { static void reprapworld_keypad_move_y_down() {
SERIAL_ECHO("keypad_move_y_down");
encoderPosition = 1; encoderPosition = 1;
move_menu_scale = KEYPAD_MOVE_STEP; move_menu_scale = REPRAPWORLD_KEYPAD_MOVE_STEP;
lcd_move_y(); lcd_move_y();
} }
static void keypad_move_y_up() { static void reprapworld_keypad_move_y_up() {
encoderPosition = -1; encoderPosition = -1;
move_menu_scale = KEYPAD_MOVE_STEP; move_menu_scale = REPRAPWORLD_KEYPAD_MOVE_STEP;
lcd_move_y(); lcd_move_y();
} }
static void keypad_move_home() { static void reprapworld_keypad_move_home() {
//enquecommand_P((PSTR("G28"))); // move all axis home //enquecommand_P((PSTR("G28"))); // move all axis home
// TODO gregor: move all axis home, i have currently only one axis on my prusa i3 // TODO gregor: move all axis home, i have currently only one axis on my prusa i3
enquecommand_P((PSTR("G28 Y"))); enquecommand_P((PSTR("G28 Y")));
@ -770,7 +769,7 @@ void lcd_init()
WRITE(BTN_EN1,HIGH); WRITE(BTN_EN1,HIGH);
WRITE(BTN_EN2,HIGH); WRITE(BTN_EN2,HIGH);
WRITE(BTN_ENC,HIGH); WRITE(BTN_ENC,HIGH);
#ifdef KEYPAD #ifdef REPRAPWORLD_KEYPAD
pinMode(SHIFT_CLK,OUTPUT); pinMode(SHIFT_CLK,OUTPUT);
pinMode(SHIFT_LD,OUTPUT); pinMode(SHIFT_LD,OUTPUT);
pinMode(SHIFT_OUT,INPUT); pinMode(SHIFT_OUT,INPUT);
@ -823,15 +822,15 @@ void lcd_update()
if (lcd_next_update_millis < millis()) if (lcd_next_update_millis < millis())
{ {
#ifdef ULTIPANEL #ifdef ULTIPANEL
#ifdef KEYPAD #ifdef REPRAPWORLD_KEYPAD
if (KEYPAD_MOVE_Y_DOWN) { if (REPRAPWORLD_KEYPAD_MOVE_Y_DOWN) {
keypad_move_y_down(); reprapworld_keypad_move_y_down();
} }
if (KEYPAD_MOVE_Y_UP) { if (REPRAPWORLD_KEYPAD_MOVE_Y_UP) {
keypad_move_y_up(); reprapworld_keypad_move_y_up();
} }
if (KEYPAD_MOVE_HOME) { if (REPRAPWORLD_KEYPAD_MOVE_HOME) {
keypad_move_home(); reprapworld_keypad_move_home();
} }
#endif #endif
if (encoderDiff) if (encoderDiff)
@ -914,18 +913,20 @@ void lcd_buttons_update()
if((blocking_enc<millis()) && (READ(BTN_ENC)==0)) if((blocking_enc<millis()) && (READ(BTN_ENC)==0))
newbutton |= EN_C; newbutton |= EN_C;
buttons = newbutton; buttons = newbutton;
// for the keypad #ifdef REPRAPWORLD_KEYPAD
uint8_t newbutton_keypad=0; // for the reprapworld_keypad
WRITE(SHIFT_LD,LOW); uint8_t newbutton_reprapworld_keypad=0;
WRITE(SHIFT_LD,HIGH); WRITE(SHIFT_LD,LOW);
for(int8_t i=0;i<8;i++) { WRITE(SHIFT_LD,HIGH);
newbutton_keypad = newbutton_keypad>>1; for(int8_t i=0;i<8;i++) {
if(READ(SHIFT_OUT)) newbutton_reprapworld_keypad = newbutton_reprapworld_keypad>>1;
newbutton_keypad|=(1<<7); if(READ(SHIFT_OUT))
WRITE(SHIFT_CLK,HIGH); newbutton_reprapworld_keypad|=(1<<7);
WRITE(SHIFT_CLK,LOW); WRITE(SHIFT_CLK,HIGH);
} WRITE(SHIFT_CLK,LOW);
buttons_keypad=~newbutton_keypad; //invert it, because a pressed switch produces a logical 0 }
buttons_reprapworld_keypad=~newbutton_reprapworld_keypad; //invert it, because a pressed switch produces a logical 0
#endif
#else //read it from the shift register #else //read it from the shift register
uint8_t newbutton=0; uint8_t newbutton=0;
WRITE(SHIFT_LD,LOW); WRITE(SHIFT_LD,LOW);

32
Marlin/ultralcd.h
View file

@ -23,8 +23,8 @@
#ifdef ULTIPANEL #ifdef ULTIPANEL
void lcd_buttons_update(); void lcd_buttons_update();
extern volatile uint8_t buttons; //the last checked buttons in a bit array. extern volatile uint8_t buttons; //the last checked buttons in a bit array.
#ifdef KEYPAD #ifdef REPRAPWORLD_KEYPAD
extern volatile uint8_t buttons_keypad; // to store the keypad shiftregister values extern volatile uint8_t buttons_reprapworld_keypad; // to store the keypad shiftregister values
#endif #endif
#else #else
FORCE_INLINE void lcd_buttons_update() {} FORCE_INLINE void lcd_buttons_update() {}
@ -44,21 +44,21 @@
#define EN_A (1<<BLEN_A) #define EN_A (1<<BLEN_A)
#define LCD_CLICKED (buttons&EN_C) #define LCD_CLICKED (buttons&EN_C)
#ifdef KEYPAD #ifdef REPRAPWORLD_KEYPAD
#define EN_KEYPAD_F3 (1<<BLEN_KEYPAD_F3) #define EN_REPRAPWORLD_KEYPAD_F3 (1<<BLEN_REPRAPWORLD_KEYPAD_F3)
#define EN_KEYPAD_F2 (1<<BLEN_KEYPAD_F2) #define EN_REPRAPWORLD_KEYPAD_F2 (1<<BLEN_REPRAPWORLD_KEYPAD_F2)
#define EN_KEYPAD_F1 (1<<BLEN_KEYPAD_F1) #define EN_REPRAPWORLD_KEYPAD_F1 (1<<BLEN_REPRAPWORLD_KEYPAD_F1)
#define EN_KEYPAD_UP (1<<BLEN_KEYPAD_UP) #define EN_REPRAPWORLD_KEYPAD_UP (1<<BLEN_REPRAPWORLD_KEYPAD_UP)
#define EN_KEYPAD_RIGHT (1<<BLEN_KEYPAD_RIGHT) #define EN_REPRAPWORLD_KEYPAD_RIGHT (1<<BLEN_REPRAPWORLD_KEYPAD_RIGHT)
#define EN_KEYPAD_MIDDLE (1<<BLEN_KEYPAD_MIDDLE) #define EN_REPRAPWORLD_KEYPAD_MIDDLE (1<<BLEN_REPRAPWORLD_KEYPAD_MIDDLE)
#define EN_KEYPAD_DOWN (1<<BLEN_KEYPAD_DOWN) #define EN_REPRAPWORLD_KEYPAD_DOWN (1<<BLEN_REPRAPWORLD_KEYPAD_DOWN)
#define EN_KEYPAD_LEFT (1<<BLEN_KEYPAD_LEFT) #define EN_REPRAPWORLD_KEYPAD_LEFT (1<<BLEN_REPRAPWORLD_KEYPAD_LEFT)
#define LCD_CLICKED ((buttons&EN_C) || (buttons_keypad&EN_KEYPAD_F1)) #define LCD_CLICKED ((buttons&EN_C) || (buttons_reprapworld_keypad&EN_REPRAPWORLD_KEYPAD_F1))
#define KEYPAD_MOVE_Y_DOWN (buttons_keypad&EN_KEYPAD_DOWN) #define REPRAPWORLD_KEYPAD_MOVE_Y_DOWN (buttons_reprapworld_keypad&EN_REPRAPWORLD_KEYPAD_DOWN)
#define KEYPAD_MOVE_Y_UP (buttons_keypad&EN_KEYPAD_UP) #define REPRAPWORLD_KEYPAD_MOVE_Y_UP (buttons_reprapworld_keypad&EN_REPRAPWORLD_KEYPAD_UP)
#define KEYPAD_MOVE_HOME (buttons_keypad&EN_KEYPAD_MIDDLE) #define REPRAPWORLD_KEYPAD_MOVE_HOME (buttons_reprapworld_keypad&EN_REPRAPWORLD_KEYPAD_MIDDLE)
#endif //KEYPAD #endif //REPRAPWORLD_KEYPAD
#else #else
//atomatic, do not change //atomatic, do not change
#define B_LE (1<<BL_LE) #define B_LE (1<<BL_LE)