Просмотр исходного кода

Fix warnings for REPRAPWORLD_KEYPAD

Steven Gotthardt 7 лет назад
Родитель
Сommit
645b586041
1 измененных файлов: 5 добавлений и 6 удалений
  1. 5
    6
      Marlin/ultralcd.h

+ 5
- 6
Marlin/ultralcd.h Просмотреть файл

@@ -129,20 +129,19 @@
129 129
 
130 130
     #define REPRAPWORLD_KEYPAD_MOVE_Z_DOWN  (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_F3)
131 131
     #define REPRAPWORLD_KEYPAD_MOVE_Z_UP    (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_F2)
132
-    #define REPRAPWORLD_KEYPAD_MOVE_MENU    (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_F1)
133 132
     #define REPRAPWORLD_KEYPAD_MOVE_Y_DOWN  (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_DOWN)
134 133
     #define REPRAPWORLD_KEYPAD_MOVE_X_RIGHT (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_RIGHT)
135
-    #define REPRAPWORLD_KEYPAD_MOVE_HOME    (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_MIDDLE)
136 134
     #define REPRAPWORLD_KEYPAD_MOVE_Y_UP    (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_UP)
137 135
     #define REPRAPWORLD_KEYPAD_MOVE_X_LEFT  (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_LEFT)
138 136
 
139 137
     #if ENABLED(ADC_KEYPAD)
140
-      #define REPRAPWORLD_KEYPAD_MOVE_HOME  (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_F1)
141
-      #define KEYPAD_EN_C                   EN_REPRAPWORLD_KEYPAD_MIDDLE
138
+      #define KEYPAD_HOME EN_REPRAPWORLD_KEYPAD_F1
139
+      #define KEYPAD_EN_C EN_REPRAPWORLD_KEYPAD_MIDDLE
142 140
     #else
143
-      #define REPRAPWORLD_KEYPAD_MOVE_HOME  (buttons_reprapworld_keypad & EN_REPRAPWORLD_KEYPAD_MIDDLE)
144
-      #define KEYPAD_EN_C                   EN_REPRAPWORLD_KEYPAD_F1
141
+      #define KEYPAD_HOME EN_REPRAPWORLD_KEYPAD_MIDDLE
142
+      #define KEYPAD_EN_C EN_REPRAPWORLD_KEYPAD_F1
145 143
     #endif
144
+    #define REPRAPWORLD_KEYPAD_MOVE_HOME    (buttons_reprapworld_keypad & KEYPAD_HOME)
146 145
     #define REPRAPWORLD_KEYPAD_MOVE_MENU    (buttons_reprapworld_keypad & KEYPAD_EN_C)
147 146
 
148 147
     #if BUTTON_EXISTS(ENC)

Загрузка…
Отмена
Сохранить