diff --git a/README.md b/README.md index ac78dea..bac9e71 100644 --- a/README.md +++ b/README.md @@ -53,36 +53,9 @@ Video about this project by [Floyd Steinberg](https://www.youtube.com/watch?v=Z3 All devices on Raspberry Pi GPIOs are **optional**. -__CAUTION:__ All GPIO numbers are [chip numbers](https://pinout.xyz/), not header positions. - -|GPIO | Device | | Function | Direction | Comment| -|---|---|---|---|---|---| -|14 | UART | | TXD | | OUT | | serial MIDI| -|15 | UART | | RXD | | IN | | serial MIDI| -|18 | DAC | | CLK | | OUT| -|19 | DAC | | FS | | OUT| -|21 | DAC | | DOUT | | OUT| -|02 | I2C | | SDA | | IN/OUT | | used by some DACs| -|03 | I2C | | SCL | | OUT | | used by some DACs| -|17 | LCD | | EN | | OUT | | default setting| -|27 | LCD | | RS | | OUT | | default setting| -|16 | LCD | | RW | | OUT | | default setting, optional| -|22 | LCD | | D4 | | OUT | | default setting| -|23 | LCD | | D5 | | OUT | | default setting| -|24 | LCD | | D6 | | OUT | | default setting| -|25 | LCD | | D7 | | OUT | | default setting| -|05 | ROTARY ENCODER | CLK (ENC A) | IN | | default setting| -|06 | ROTARY ENCODER | DT (ENC B) | IN | | default setting| -|26 | ROTARY ENCODER | SW | | IN | | default setting| -|12 | PWM AUDIO | PWM0 | | OUT | | on Raspberry Pi Zero| -|13 | PWM AUDIO | PWM1 | | OUT | | on Raspberry Pi Zero| -|07 | SPI | | /CE1 | | OUT | | reserved| -|08 | SPI | | /CE0 | | OUT | | reserved| -|09 | SPI | | MISO | | IN | | reserved| -|10 | SPI | | MOSI | | OUT | | reserved| -|11 | SPI | | SCLK | | OUT | | reserved| -|04 | NONE | | | | | | can generate clock signal| -|20 | NONE | | | | | | may be used for DAC DIN| +![](https://user-images.githubusercontent.com/2480569/166105580-da11481c-8fc7-4375-8ab1-3031ab5c6ad0.png) + +Please the the [wiki](https://github.com/probonopd/MiniDexed/wiki) for more information. ## Downloading diff --git a/src/config.cpp b/src/config.cpp index 31a148c..d5f4e96 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -72,18 +72,18 @@ void CConfig::Load (void) m_bLCDEnabled = m_Properties.GetNumber ("LCDEnabled", 0) != 0; - m_nLCDPinEnable = m_Properties.GetNumber ("LCDPinEnable", 17); + m_nLCDPinEnable = m_Properties.GetNumber ("LCDPinEnable", 4); m_nLCDPinRegisterSelect = m_Properties.GetNumber ("LCDPinRegisterSelect", 27); - m_nLCDPinReadWrite = m_Properties.GetNumber ("LCDPinReadWrite", 16); + m_nLCDPinReadWrite = m_Properties.GetNumber ("LCDPinReadWrite", 0); m_nLCDPinData4 = m_Properties.GetNumber ("LCDPinData4", 22); m_nLCDPinData5 = m_Properties.GetNumber ("LCDPinData5", 23); m_nLCDPinData6 = m_Properties.GetNumber ("LCDPinData6", 24); m_nLCDPinData7 = m_Properties.GetNumber ("LCDPinData7", 25); m_bEncoderEnabled = m_Properties.GetNumber ("EncoderEnabled", 0) != 0; - m_nEncoderPinClock = m_Properties.GetNumber ("EncoderPinClock", 5); - m_nEncoderPinData = m_Properties.GetNumber ("EncoderPinData", 6); - m_nEncoderPinSwitch = m_Properties.GetNumber ("EncoderPinSwitch", 26); + m_nEncoderPinClock = m_Properties.GetNumber ("EncoderPinClock", 10); + m_nEncoderPinData = m_Properties.GetNumber ("EncoderPinData", 9); + m_nEncoderPinSwitch = m_Properties.GetNumber ("EncoderPinSwitch", 11); m_bMIDIDumpEnabled = m_Properties.GetNumber ("MIDIDumpEnabled", 0) != 0; m_bProfileEnabled = m_Properties.GetNumber ("ProfileEnabled", 0) != 0; diff --git a/src/minidexed.ini b/src/minidexed.ini index 327b649..47aefc2 100644 --- a/src/minidexed.ini +++ b/src/minidexed.ini @@ -19,8 +19,8 @@ MIDIRXProgramChange=1 # HD44780 LCD LCDEnabled=1 LCDPinEnable=17 -LCDPinRegisterSelect=27 -LCDPinReadWrite=16 +LCDPinRegisterSelect=4 +LCDPinReadWrite=0 LCDPinData4=22 LCDPinData5=23 LCDPinData6=24 @@ -28,9 +28,9 @@ LCDPinData7=25 # KY-040 Rotary Encoder EncoderEnabled=1 -EncoderPinClock=5 -EncoderPinData=6 -EncoderPinSwitch=26 +EncoderPinClock=10 +EncoderPinData=9 +EncoderPinSwitch=11 # Debug MIDIDumpEnabled=0