Browse Source

Fix BQ_LCD_SMART_CONTROLLER pin compiler warnings

Scott Lahteine 9 years ago
parent
commit
a82c755a35
2 changed files with 7 additions and 25 deletions
  1. 0
    17
      Marlin/pins_BQ_ZUM_MEGA_3D.h
  2. 7
    8
      Marlin/pins_RAMPS_14.h

+ 0
- 17
Marlin/pins_BQ_ZUM_MEGA_3D.h View File

59
 #undef PS_ON_PIN             // 12
59
 #undef PS_ON_PIN             // 12
60
 #define PS_ON_PIN         81 // External Power Supply
60
 #define PS_ON_PIN         81 // External Power Supply
61
 
61
 
62
-#if ENABLED(BQ_LCD_SMART_CONTROLLER) // Most similar to REPRAP_DISCOUNT_SMART_CONTROLLER
63
-  #define KILL_PIN        41
64
-
65
-  #define BEEPER_PIN      37
66
-
67
-  #define BTN_EN1         31
68
-  #define BTN_EN2         33
69
-  #define BTN_ENC         35
70
-
71
-  #define LCD_PIN_BL      39
72
-  #define LCD_PINS_RS     16
73
-  #define LCD_PINS_ENABLE 17
74
-  #define LCD_PINS_D4     23
75
-
76
-  #define SD_DETECT_PIN   49
77
-#endif
78
-
79
 #if ENABLED(AUTO_BED_LEVELING_FEATURE)
62
 #if ENABLED(AUTO_BED_LEVELING_FEATURE)
80
   #undef Z_MIN_PIN
63
   #undef Z_MIN_PIN
81
   #undef Z_MAX_PIN
64
   #undef Z_MAX_PIN

+ 7
- 8
Marlin/pins_RAMPS_14.h View File

116
 
116
 
117
 #define PS_ON_PIN          12
117
 #define PS_ON_PIN          12
118
 
118
 
119
-#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) || ENABLED(G3D_PANEL)
120
-  #define KILL_PIN         41
121
-#endif
122
-
123
 #if MB(RAMPS_14_EFF) || MB(RAMPS_13_EFF)
119
 #if MB(RAMPS_14_EFF) || MB(RAMPS_13_EFF)
124
   #define HEATER_0_PIN      8
120
   #define HEATER_0_PIN      8
125
 #else
121
 #else
168
       #define BTN_ENC 35
164
       #define BTN_ENC 35
169
 
165
 
170
       #define SD_DETECT_PIN 49
166
       #define SD_DETECT_PIN 49
167
+      #define KILL_PIN 41
168
+
169
+      #if ENABLED(BQ_LCD_SMART_CONTROLLER)
170
+        #define LCD_PIN_BL 39
171
+      #endif
172
+
171
     #elif ENABLED(LCD_I2C_PANELOLU2)
173
     #elif ENABLED(LCD_I2C_PANELOLU2)
172
       #define BTN_EN1 47  // reverse if the encoder turns the wrong way.
174
       #define BTN_EN1 47  // reverse if the encoder turns the wrong way.
173
       #define BTN_EN2 43
175
       #define BTN_EN2 43
241
 
243
 
242
       #if ENABLED(G3D_PANEL)
244
       #if ENABLED(G3D_PANEL)
243
         #define SD_DETECT_PIN 49
245
         #define SD_DETECT_PIN 49
246
+        #define KILL_PIN 41
244
       #else
247
       #else
245
         //        #define SD_DETECT_PIN -1  // Ramps doesn't use this
248
         //        #define SD_DETECT_PIN -1  // Ramps doesn't use this
246
       #endif
249
       #endif
282
   #define MISO_PIN         50
285
   #define MISO_PIN         50
283
   #define MOSI_PIN         51
286
   #define MOSI_PIN         51
284
 #endif
287
 #endif
285
-
286
-#ifndef KILL_PIN
287
-  //  #define KILL_PIN         -1
288
-#endif

Loading…
Cancel
Save