|
|
@ -28,13 +28,6 @@ |
|
|
|
|
|
|
|
|
|
|
|
#include "config.h" |
|
|
|
#include "config.h" |
|
|
|
#include "Disp_Plus.h" |
|
|
|
#include "Disp_Plus.h" |
|
|
|
/* #ifdef I2C_DISPLAY
|
|
|
|
|
|
|
|
#include "LiquidCrystalPlus_I2C.h" |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
#ifdef U8X8_DISPLAY |
|
|
|
|
|
|
|
#include "SSD1322_Plus.h" |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
#include <LCDMenuLib2.h> |
|
|
|
#include <LCDMenuLib2.h> |
|
|
|
#include <Encoder.h> |
|
|
|
#include <Encoder.h> |
|
|
|
|
|
|
|
|
|
|
@ -70,7 +63,6 @@ elapsedMillis back_from_volume; |
|
|
|
|
|
|
|
|
|
|
|
#ifdef I2C_DISPLAY |
|
|
|
#ifdef I2C_DISPLAY |
|
|
|
#include <LiquidCrystal_I2C.h> |
|
|
|
#include <LiquidCrystal_I2C.h> |
|
|
|
//LiquidCrystalPlus_I2C lcd(LCD_I2C_ADDRESS, _LCDML_DISP_cols, _LCDML_DISP_rows);
|
|
|
|
|
|
|
|
Disp_Plus<LiquidCrystal_I2C> lcd(LCD_I2C_ADDRESS, _LCDML_DISP_cols, _LCDML_DISP_rows); |
|
|
|
Disp_Plus<LiquidCrystal_I2C> lcd(LCD_I2C_ADDRESS, _LCDML_DISP_cols, _LCDML_DISP_rows); |
|
|
|
#endif |
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
@ -82,7 +74,6 @@ Disp_Plus<LiquidCrystal_I2C> lcd(LCD_I2C_ADDRESS, _LCDML_DISP_cols, _LCDML_DISP_ |
|
|
|
#ifdef U8X8_HAVE_HW_I2C |
|
|
|
#ifdef U8X8_HAVE_HW_I2C |
|
|
|
#include <Wire.h> |
|
|
|
#include <Wire.h> |
|
|
|
#endif |
|
|
|
#endif |
|
|
|
//SSD1322_Plus lcd(/* cs=*/ U8X8_CS_PIN, /* dc=*/ U8X8_DC_PIN, /* reset=*/ U8X8_RESET_PIN);
|
|
|
|
|
|
|
|
Disp_Plus<U8X8_DISPLAY_CLASS> lcd(/* cs=*/ U8X8_CS_PIN, /* dc=*/ U8X8_DC_PIN, /* reset=*/ U8X8_RESET_PIN); |
|
|
|
Disp_Plus<U8X8_DISPLAY_CLASS> lcd(/* cs=*/ U8X8_CS_PIN, /* dc=*/ U8X8_DC_PIN, /* reset=*/ U8X8_RESET_PIN); |
|
|
|
//Disp_Plus<U8X8_DISPLAY_CLASS> lcd(U8X8_PIN_NONE);
|
|
|
|
//Disp_Plus<U8X8_DISPLAY_CLASS> lcd(U8X8_PIN_NONE);
|
|
|
|
#endif |
|
|
|
#endif |
|
|
|