thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests 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
Download Patch File Download Diff File Expand all files Collapse all files

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 */
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 */
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(unsigned long, long5, ftostr5, 0.01)
#ifdef KEYPAD
static void keypad_move_y_down() {
SERIAL_ECHO("keypad_move_y_down");
#ifdef REPRAPWORLD_KEYPAD
static void reprapworld_keypad_move_y_down() {
encoderPosition = 1;
move_menu_scale = KEYPAD_MOVE_STEP;
move_menu_scale = REPRAPWORLD_KEYPAD_MOVE_STEP;
lcd_move_y();
}
static void keypad_move_y_up() {
static void reprapworld_keypad_move_y_up() {
encoderPosition = -1;
move_menu_scale = KEYPAD_MOVE_STEP;
move_menu_scale = REPRAPWORLD_KEYPAD_MOVE_STEP;
lcd_move_y();
}
static void keypad_move_home() {
static void reprapworld_keypad_move_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
enquecommand_P((PSTR("G28 Y")));
@@ -770,7 +769,7 @@ void lcd_init()
WRITE(BTN_EN1,HIGH);
WRITE(BTN_EN2,HIGH);
WRITE(BTN_ENC,HIGH);
#ifdef KEYPAD
#ifdef REPRAPWORLD_KEYPAD
pinMode(SHIFT_CLK,OUTPUT);
pinMode(SHIFT_LD,OUTPUT);
pinMode(SHIFT_OUT,INPUT);
@@ -823,15 +822,15 @@ void lcd_update()
if (lcd_next_update_millis < millis())
{
#ifdef ULTIPANEL
#ifdef KEYPAD
if (KEYPAD_MOVE_Y_DOWN) {
keypad_move_y_down();
#ifdef REPRAPWORLD_KEYPAD
if (REPRAPWORLD_KEYPAD_MOVE_Y_DOWN) {
reprapworld_keypad_move_y_down();
}
if (KEYPAD_MOVE_Y_UP) {
keypad_move_y_up();
if (REPRAPWORLD_KEYPAD_MOVE_Y_UP) {
reprapworld_keypad_move_y_up();
}
if (KEYPAD_MOVE_HOME) {
keypad_move_home();
if (REPRAPWORLD_KEYPAD_MOVE_HOME) {
reprapworld_keypad_move_home();
}
#endif
if (encoderDiff)
@@ -914,18 +913,20 @@ void lcd_buttons_update()
if((blocking_enc<millis()) && (READ(BTN_ENC)==0))
newbutton |= EN_C;
buttons = newbutton;
// for the keypad
uint8_t newbutton_keypad=0;
WRITE(SHIFT_LD,LOW);
WRITE(SHIFT_LD,HIGH);
for(int8_t i=0;i<8;i++) {
newbutton_keypad = newbutton_keypad>>1;
if(READ(SHIFT_OUT))
newbutton_keypad|=(1<<7);
WRITE(SHIFT_CLK,HIGH);
WRITE(SHIFT_CLK,LOW);
}
buttons_keypad=~newbutton_keypad; //invert it, because a pressed switch produces a logical 0
#ifdef REPRAPWORLD_KEYPAD
// for the reprapworld_keypad
uint8_t newbutton_reprapworld_keypad=0;
WRITE(SHIFT_LD,LOW);
WRITE(SHIFT_LD,HIGH);
for(int8_t i=0;i<8;i++) {
newbutton_reprapworld_keypad = newbutton_reprapworld_keypad>>1;
if(READ(SHIFT_OUT))
newbutton_reprapworld_keypad|=(1<<7);
WRITE(SHIFT_CLK,HIGH);
WRITE(SHIFT_CLK,LOW);
}
buttons_reprapworld_keypad=~newbutton_reprapworld_keypad; //invert it, because a pressed switch produces a logical 0
#endif
#else //read it from the shift register
uint8_t newbutton=0;
WRITE(SHIFT_LD,LOW);