@@ -38,8 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
3838#include < SPI.h>
3939#include < Wire.h>
4040
41- #define I2C_FREQ 400000L // I2C Frequency is 400kHz (fast as possible)
42-
4341// Configure SPI settings - Max clk frequency for display is 10MHz
4442SPISettings oledSettings (10000000 , MSBFIRST, SPI_MODE0);
4543
@@ -50,12 +48,12 @@ SPISettings oledSettings(10000000, MSBFIRST, SPI_MODE0);
5048void MicroOLED::spiSetup ()
5149{
5250 // Initialize the pins:
53- pinMode (dcPin, OUTPUT); // dc Is used for SPI and parallel interfaces but not I2C
54- pinMode (MOSI, OUTPUT); // MOSI is an OUTPUT
55- pinMode (SCK, OUTPUT); // SCK is an OUTPUT
56- pinMode (csPin, OUTPUT); // CS is an OUTPUT
57- digitalWrite (csPin, HIGH); // Start CS High
58-
51+ pinMode (dcPin, OUTPUT); // dc Is used for SPI and parallel interfaces but not I2C
52+ pinMode (MOSI, OUTPUT); // MOSI is an OUTPUT
53+ pinMode (SCK, OUTPUT); // SCK is an OUTPUT
54+ pinMode (csPin, OUTPUT); // CS is an OUTPUT
55+ digitalWrite (csPin, HIGH); // Start CS High
56+
5957#if defined(__AVR__)
6058 pinMode (10 , OUTPUT); // Required for setting into Master mode
6159#endif
@@ -71,7 +69,7 @@ void MicroOLED::spiTransfer(byte data)
7169{
7270 SPI.beginTransaction (oledSettings);
7371 digitalWrite (csPin, LOW);
74- SPI.transfer (data);
72+ SPI.transfer (data);
7573 digitalWrite (csPin, HIGH);
7674 SPI.endTransaction ();
7775}
@@ -83,7 +81,6 @@ void MicroOLED::spiTransfer(byte data)
8381**/
8482void MicroOLED::i2cSetup ()
8583{
86-
8784}
8885
8986/* * \brief Write a byte over I2C
@@ -116,7 +113,7 @@ void MicroOLED::parallelSetup()
116113 digitalWrite (rdPin, HIGH);
117114 pinMode (csPin, OUTPUT);
118115 digitalWrite (csPin, HIGH);
119- for (int i= 0 ; i< 8 ; i++)
116+ for (int i = 0 ; i < 8 ; i++)
120117 pinMode (dPins[i], OUTPUT);
121118}
122119
@@ -132,29 +129,28 @@ void MicroOLED::parallelWrite(byte data, byte dc)
132129 // digitalWrite(csPin, HIGH);
133130 // digitalWrite(wrPin, HIGH);
134131 // digitalWrite(rdPin, HIGH);
135-
132+
136133 // chip select high->low
137134 digitalWrite (csPin, LOW);
138-
135+
139136 // dc high or low
140137 digitalWrite (dcPin, dc);
141-
138+
142139 // wr high->low
143140 digitalWrite (wrPin, LOW);
144-
141+
145142 // set data pins
146- for (int i= 0 ; i< 8 ; i++)
143+ for (int i = 0 ; i < 8 ; i++)
147144 {
148- if (data & (1 << i))
145+ if (data & (1 << i))
149146 digitalWrite (dPins[i], HIGH);
150147 else
151148 digitalWrite (dPins[i], LOW);
152149 }
153-
150+
154151 // wr low->high
155152 digitalWrite (wrPin, HIGH);
156-
153+
157154 // cs high
158155 digitalWrite (csPin, HIGH);
159156}
160-
0 commit comments