bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Attempt to address Bernhard's comments

Browse Source 
Refactor configuration to try to make items clearer (what defines a
panel vs what is user changeable).
This commit is contained in:
Robert F-C
2013-03-01 01:17:07 +11:00
parent 839bef6d5d
commit 6beb42cdf6
4 changed files with 134 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Marlin/Marlin.pde
View File

@@ -34,21 +34,14 @@
#include "pins.h"
#ifdef ULTRA_LCD
#ifdef LCD_I2C
#if defined(LCD_I2C_TYPE_PCF8575)
#include <Wire.h>
#if defined(LCD_I2C_TYPE_PCF8575)
#include <LiquidCrystal_I2C.h>
#elif defined(LCD_I2C_TYPE_MCP23017)
#ifdef LCD_I2C_PANELOLU2
#include <LiquidTWI2.h>
#ifndef PANELOLU2
#error You must uncomment #define PANELOLU2 in LiquidTWI2.h for LiquidTWI2.cpp to compile correctly
#endif
#else
#include <LiquidTWI2.h>
#endif
#else
#error Unknown I2C LCD type
#include <LiquidCrystal_I2C.h>
#elif defined(LCD_I2C_TYPE_MCP23017) || defined(LCD_I2C_TYPE_MCP23008)
#include <Wire.h>
#include <LiquidTWI2.h>
#if defined(LCD_I2C_PANELOLU2) && !defined(PANELOLU2)
#error You must uncomment "#define PANELOLU2" in LiquidTWI2.h for LiquidTWI2.cpp to compile correctly
#endif
#else
#include <LiquidCrystal.h>