thomas
/
marlin
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Merge pull request #7766 from thinkyhead/bf1_melzi_fixes 

Melzi fixes
Scott Lahteine 7 years ago
parent
aefd2a5c4b 41dcbe89dd
commit
0c2cefed8f
2 changed files with 2 additions and 2 deletions
Unified View Show Diff Stats
  1. 1
    1
      Marlin/SanityCheck.h
  2. 1
    1
      Marlin/pins_SANGUINOLOLU_11.h

+ 1
- 1
Marlin/SanityCheck.h View File

1149 
       && DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) && DISABLED(PANEL_ONE)
 1149 
       && DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) && DISABLED(PANEL_ONE)
1150 
     + 1
 1150 
     + 1
1151 
   #endif
 1151 
   #endif
1152 
-  #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && DISABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
1152 
+  #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) && DISABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(LCD_FOR_MELZI)
1153 
     + 1
 1153 
     + 1
1154 
   #endif
 1154 
   #endif
1155 
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(BQ_LCD_SMART_CONTROLLER)
 1155 
   #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) && DISABLED(BQ_LCD_SMART_CONTROLLER)

+ 1
- 1
Marlin/pins_SANGUINOLOLU_11.h View File

240 
     #ifndef ST7920_DELAY_1
 240 
     #ifndef ST7920_DELAY_1
241 
       #define ST7920_DELAY_1 DELAY_0_NOP
 241 
       #define ST7920_DELAY_1 DELAY_0_NOP
242 
     #endif
 242 
     #endif
243 
-    #ifndef ST7920_DELAY_3
243 
+    #ifndef ST7920_DELAY_2
244 
       #define ST7920_DELAY_2 DELAY_3_NOP
 244 
       #define ST7920_DELAY_2 DELAY_3_NOP
245 
     #endif
 245 
     #endif
246 
     #ifndef ST7920_DELAY_3
 246 
     #ifndef ST7920_DELAY_3

Write Preview
Loading…
Cancel
Save