Adjust values for pull

pull/3/head
Dirk Niggemann 5 years ago
parent 3ac708542a
commit d64bd4e614
  1. 6
      Disp_Plus.h
  2. 9
      MicroDexed.ino
  3. 8
      config.h

@ -26,7 +26,7 @@
#ifndef DISP_PLUS_H_INCLUDED #ifndef DISP_PLUS_H_INCLUDED
#define DISP_PLUS_H_INCLUDED #define DISP_PLUS_H_INCLUDED
#define STRING_BUF_SIZE 21 #define STRING_BUFFER_SIZE 21
template <class T> template <class T>
class Disp_Plus : public T class Disp_Plus : public T
@ -42,7 +42,7 @@ class Disp_Plus : public T
void show(uint8_t y, uint8_t x, uint8_t fs, long num) void show(uint8_t y, uint8_t x, uint8_t fs, long num)
{ {
char _buf10[STRING_BUF_SIZE]; char _buf10[STRING_BUFFER_SIZE];
_show(y, x, fs, itoa(num, _buf10, 10), true, true); _show(y, x, fs, itoa(num, _buf10, 10), true, true);
} }
@ -51,7 +51,7 @@ class Disp_Plus : public T
void _show(uint8_t pos_y, uint8_t pos_x, uint8_t field_size, const char *str, bool justify_right, bool fill_zero) void _show(uint8_t pos_y, uint8_t pos_x, uint8_t field_size, const char *str, bool justify_right, bool fill_zero)
{ {
{ {
char tmp[STRING_BUF_SIZE]; char tmp[STRING_BUFFER_SIZE];
char *s = tmp; char *s = tmp;
uint8_t l = strlen(str); uint8_t l = strlen(str);

@ -164,18 +164,22 @@ extern LCDMenuLib2 LCDML;
extern uint8_t menu_state; extern uint8_t menu_state;
#endif #endif
#ifdef DISPLAY_LCD_SPI
void change_disp_sd(bool disp) void change_disp_sd(bool disp)
{ {
digitalWrite(SDCARD_CS_PIN, disp); digitalWrite(SDCARD_CS_PIN, disp);
digitalWrite(U8X8_CS_PIN, !disp); digitalWrite(U8X8_CS_PIN, !disp);
} }
#endif
void setup() void setup()
{ {
//while (!Serial) ; // wait for Arduino Serial Monitor //while (!Serial) ; // wait for Arduino Serial Monitor
Serial.begin(SERIAL_SPEED); Serial.begin(SERIAL_SPEED);
#ifdef DISPLAY_LCD_SPI
pinMode(SDCARD_CS_PIN, OUTPUT); pinMode(SDCARD_CS_PIN, OUTPUT);
pinMode(U8X8_CS_PIN, OUTPUT); pinMode(U8X8_CS_PIN, OUTPUT);
#endif
#ifdef ENABLE_LCD_UI #ifdef ENABLE_LCD_UI
setup_ui(); setup_ui();
@ -251,7 +255,9 @@ void setup()
SPI.setMOSI(SDCARD_MOSI_PIN); SPI.setMOSI(SDCARD_MOSI_PIN);
SPI.setSCK(SDCARD_SCK_PIN); SPI.setSCK(SDCARD_SCK_PIN);
#endif #endif
#ifdef DISPLAY_LCD_SPI
change_disp_sd(false); change_disp_sd(false);
#endif
if (!SD.begin(SDCARD_CS_PIN)) if (!SD.begin(SDCARD_CS_PIN))
{ {
Serial.println(F("SD card not accessable.")); Serial.println(F("SD card not accessable."));
@ -290,7 +296,9 @@ void setup()
// load default SYSEX data // load default SYSEX data
load_sysex(configuration.bank, configuration.voice); load_sysex(configuration.bank, configuration.voice);
} }
#ifdef DISPLAY_LCD_SPI
change_disp_sd(true); change_disp_sd(true);
#endif
// Init effects // Init effects
if (!modchorus.begin(delayline, MOD_DELAY_SAMPLE_BUFFER)) { if (!modchorus.begin(delayline, MOD_DELAY_SAMPLE_BUFFER)) {
Serial.println(F("AudioEffectModulatedDelay - right channel begin failed")); Serial.println(F("AudioEffectModulatedDelay - right channel begin failed"));
@ -426,7 +434,6 @@ void loop()
{ {
#ifdef ENABLE_LCD_UI #ifdef ENABLE_LCD_UI
// LCD Menu // LCD Menu
delay(1);
LCDML.loop(); LCDML.loop();
// initial starts voice selection menu as default // initial starts voice selection menu as default

@ -110,17 +110,23 @@
//* UI //* UI
//************************************************************************************************* //*************************************************************************************************
#define ENABLE_LCD_UI 1 #define ENABLE_LCD_UI 1
// LCD Display
//I2C_DISPLAY only
#define LCD_I2C_ADDRESS 0x3f #define LCD_I2C_ADDRESS 0x3f
//Display size, must be set for U8X8 as well
#define LCD_cols 16 #define LCD_cols 16
#define LCD_rows 4 #define LCD_rows 4
// LCD Display
//enable U8X8 support
#define U8X8_DISPLAY #define U8X8_DISPLAY
//enable SPI CS switching
#define DISPLAY_LCD_SPI
#define U8X8_DISPLAY_CLASS U8X8_SSD1322_NHD_256X64_4W_HW_SPI #define U8X8_DISPLAY_CLASS U8X8_SSD1322_NHD_256X64_4W_HW_SPI
//#define U8X8_DISPLAY_CLASS U8X8_SSD1306_128X64_NONAME_HW_I2C //#define U8X8_DISPLAY_CLASS U8X8_SSD1306_128X64_NONAME_HW_I2C
#define U8X8_CS_PIN 9 #define U8X8_CS_PIN 9
#define U8X8_DC_PIN 15 #define U8X8_DC_PIN 15
#define U8X8_RESET_PIN 14 #define U8X8_RESET_PIN 14
//Standard 16x2 LCD display (SPI/PCF8874)
//#define I2C_DISPLAY //#define I2C_DISPLAY
// [I2C] SCL: Pin 19, SDA: Pin 18 (https://www.pjrc.com/teensy/td_libs_Wire.html) // [I2C] SCL: Pin 19, SDA: Pin 18 (https://www.pjrc.com/teensy/td_libs_Wire.html)
//#define LCD_GFX 1 //#define LCD_GFX 1

Loading…
Cancel
Save