More cleanups for pull

pull/3/head
Dirk Niggemann 5 years ago
parent d64bd4e614
commit 7e2d2f4133
  1. 4
      MicroDexed.ino
  2. 9
      UI.hpp

@ -638,9 +638,13 @@ void handleProgramChange(byte inChannel, byte inProgram)
{ {
if (inProgram < MAX_VOICES) if (inProgram < MAX_VOICES)
{ {
#ifdef DISPLAY_LCD_SPI
change_disp_sd(false); change_disp_sd(false);
#endif
load_sysex(configuration.bank, inProgram); load_sysex(configuration.bank, inProgram);
#ifdef DISPLAY_LCD_SPI
change_disp_sd(true); change_disp_sd(true);
#endif
} }
} }

@ -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

Loading…
Cancel
Save