Browse Source

Fix Configuration.h file to not define LCDs be default.

Also fix compile time check in Marlin.pde
Robert F-C 11 years ago
parent
commit
839bef6d5d
2 changed files with 6 additions and 4 deletions
  1. 5
    2
      Marlin/Configuration.h
  2. 1
    2
      Marlin/Marlin.pde

+ 5
- 2
Marlin/Configuration.h View File

320
 //#define SDSUPPORT // Enable SD Card Support in Hardware Console
320
 //#define SDSUPPORT // Enable SD Card Support in Hardware Console
321
 
321
 
322
 //#define ULTIMAKERCONTROLLER //as available from the ultimaker online store.
322
 //#define ULTIMAKERCONTROLLER //as available from the ultimaker online store.
323
-#define ULTIPANEL  //the ultipanel as on thingiverse
323
+//#define ULTIPANEL  //the ultipanel as on thingiverse
324
 
324
 
325
 // The RepRapDiscount Smart Controller (white PCB)
325
 // The RepRapDiscount Smart Controller (white PCB)
326
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
326
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
338
 
338
 
339
 // I2C PANELS
339
 // I2C PANELS
340
 
340
 
341
-#define LCD_I2C_SAINSMART_YWROBOT
341
+//#define LCD_I2C_SAINSMART_YWROBOT
342
 #ifdef LCD_I2C_SAINSMART_YWROBOT
342
 #ifdef LCD_I2C_SAINSMART_YWROBOT
343
   // This uses the LiquidCrystal_I2C library ( https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home )
343
   // This uses the LiquidCrystal_I2C library ( https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home )
344
   // Make sure it is placed in the Arduino libraries directory.
344
   // Make sure it is placed in the Arduino libraries directory.
345
   #define LCD_I2C_TYPE_PCF8575
345
   #define LCD_I2C_TYPE_PCF8575
346
+  #define LCD_I2C
346
   #define ULTIPANEL
347
   #define ULTIPANEL
347
   #define NEWPANEL
348
   #define NEWPANEL
348
   #define LCD_I2C_ADDRESS 0x27   // I2C Address of the port expander
349
   #define LCD_I2C_ADDRESS 0x27   // I2C Address of the port expander
354
   // This uses the LiquidTWI2 library ( https://github.com/lincomatic/LiquidTWI2 ).
355
   // This uses the LiquidTWI2 library ( https://github.com/lincomatic/LiquidTWI2 ).
355
   // Make sure it is placed in the Arduino libraries directory.
356
   // Make sure it is placed in the Arduino libraries directory.
356
   #define LCD_I2C_TYPE_MCP23017
357
   #define LCD_I2C_TYPE_MCP23017
358
+  #define LCD_I2C
357
   #define ULTIPANEL
359
   #define ULTIPANEL
358
   #define NEWPANEL
360
   #define NEWPANEL
359
   #define LCD_I2C_ADDRESS 0x20
361
   #define LCD_I2C_ADDRESS 0x20
367
   // This uses the LiquidTWI2 library (https://github.com/lincomatic/LiquidTWI2).
369
   // This uses the LiquidTWI2 library (https://github.com/lincomatic/LiquidTWI2).
368
   // Make sure it is placed in the Arduino libraries directory.
370
   // Make sure it is placed in the Arduino libraries directory.
369
   #define LCD_I2C_TYPE_MCP23017
371
   #define LCD_I2C_TYPE_MCP23017
372
+  #define LCD_I2C
370
   #define ULTIPANEL
373
   #define ULTIPANEL
371
   #define NEWPANEL
374
   #define NEWPANEL
372
   #define LCD_I2C_ADDRESS 0x20
375
   #define LCD_I2C_ADDRESS 0x20

+ 1
- 2
Marlin/Marlin.pde View File

39
     #if defined(LCD_I2C_TYPE_PCF8575)
39
     #if defined(LCD_I2C_TYPE_PCF8575)
40
       #include <LiquidCrystal_I2C.h>
40
       #include <LiquidCrystal_I2C.h>
41
     #elif defined(LCD_I2C_TYPE_MCP23017)
41
     #elif defined(LCD_I2C_TYPE_MCP23017)
42
-      #ifdef PANELOLU2
43
-        #undef PANELOLU2
42
+      #ifdef LCD_I2C_PANELOLU2
44
         #include <LiquidTWI2.h>
43
         #include <LiquidTWI2.h>
45
         #ifndef PANELOLU2
44
         #ifndef PANELOLU2
46
           #error You must uncomment #define PANELOLU2 in LiquidTWI2.h for LiquidTWI2.cpp to compile correctly
45
           #error You must uncomment #define PANELOLU2 in LiquidTWI2.h for LiquidTWI2.cpp to compile correctly

Loading…
Cancel
Save