Skip to content

Commit 9a8b1ea

Browse files
thinkyheadthinkyhead
committed
🩹 Cleanup (for STM32 I2C LCD)
In advance of #26433
1 parent 57fe45a commit 9a8b1ea

31 files changed

+328
-314
lines changed

Marlin/src/HAL/AVR/u8g_com_HAL_AVR_sw_spi.cpp renamed to Marlin/src/HAL/AVR/u8g/u8g_com_HAL_AVR_sw_spi.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@
5555

5656
#if defined(ARDUINO) && !defined(ARDUINO_ARCH_STM32) && !defined(ARDUINO_ARCH_SAM)
5757

58-
#include "../../inc/MarlinConfigPre.h"
58+
#include "../../../inc/MarlinConfigPre.h"
5959

6060
#if HAS_MARLINUI_U8GLIB
6161

62-
#include "../shared/Marduino.h"
63-
#include "../shared/Delay.h"
62+
#include "../../shared/Marduino.h"
63+
#include "../../shared/Delay.h"
6464

6565
#include <U8glib-HAL.h>
6666

Marlin/src/HAL/STM32F1/dogm/u8g_com_stm32duino_swspi.cpp renamed to Marlin/src/HAL/STM32F1/u8g/u8g_com_stm32duino_swspi.cpp

File renamed without changes.

‎Marlin/src/inc/Conditionals-2-LCD.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@
201201
#define DOGLCD
202202
#define IS_U8GLIB_ST7920 1
203203
#define IS_ULTIPANEL 1
204-
#define ENCODER_PULSES_PER_STEP 2
204+
#define STD_ENCODER_PULSES_PER_STEP 2
205205

206206
#elif ENABLED(MKS_12864OLED)
207207

‎Marlin/src/lcd/dogm/lcdprint_u8g.cpp‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
/**
2+
* Marlin 3D Printer Firmware
3+
* Copyright (c) 2018 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4+
*
5+
* Based on Sprinter and grbl.
6+
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
7+
*
8+
* This program is free software: you can redistribute it and/or modify
9+
* it under the terms of the GNU General Public License as published by
10+
* the Free Software Foundation, either version 3 of the License, or
11+
* (at your option) any later version.
12+
*
13+
* This program is distributed in the hope that it will be useful,
14+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16+
* GNU General Public License for more details.
17+
*
18+
* You should have received a copy of the GNU General Public License
19+
* along with this program. If not, see <https://www.gnu.org/licenses/>.
20+
*
21+
*/
22+
123
/**
224
* @file lcdprint_u8g.cpp
325
* @brief LCD print api for u8glib

‎Marlin/src/lcd/dogm/marlinui_DOGM.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,19 @@
3838

3939
#if HAS_MEDIA
4040
#ifdef __SAMD21__
41-
#define U8G_CLASS U8GLIB_ST7920_128X64_4X_HAL
41+
#define U8G_CLASS U8GLIB_ST7920_128X64_4X_HAL // 2 stripes, HW SPI (Shared with SD card. Non-standard LCD adapter on AVR.)
4242
#else
4343
// Hardware SPI on DUE
44-
#define U8G_CLASS U8GLIB_ST7920_128X64_4X
44+
#define U8G_CLASS U8GLIB_ST7920_128X64_4X // 2 stripes, SW SPI (Original u8glib device)
4545
#endif
4646
#define U8G_PARAM LCD_PINS_RS
4747
#elif (LCD_PINS_D4 == SD_SCK_PIN) && (LCD_PINS_EN == SD_MOSI_PIN)
4848
// Hardware SPI shared with SD Card
49-
#define U8G_CLASS U8GLIB_ST7920_128X64_4X_HAL
49+
#define U8G_CLASS U8GLIB_ST7920_128X64_4X_HAL // 2 stripes, HW SPI (Shared with SD card. Non-standard LCD adapter on AVR.)
5050
#define U8G_PARAM LCD_PINS_RS
5151
#else
5252
// Software SPI
53-
#define U8G_CLASS U8GLIB_ST7920_128X64_4X
53+
#define U8G_CLASS U8GLIB_ST7920_128X64_4X // 2 stripes, SW SPI (Original u8glib device)
5454
#define U8G_PARAM LCD_PINS_D4, LCD_PINS_EN, LCD_PINS_RS
5555
#endif
5656

‎Marlin/src/lcd/dogm/u8g/u8g_dev_ssd1306_sh1106_128x64_I2C.cpp‎

Lines changed: 81 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -75,58 +75,58 @@
7575
#define HEIGHT 64
7676
#define PAGE_HEIGHT 8
7777

78-
uint8_t u8g_WriteEscSeqP_2_wire(u8g_t *u8g, u8g_dev_t *dev, const uint8_t *esc_seq);
78+
#define CMD_COL_ADR(N) (0x10 | ((N) >> 4)), ((N) & 0xF)
79+
#define CMD_PAGE_ADR(N) (0x20), (N)
80+
#define CMD_COLUMN_RANGE(N,O) (0x21), (N), (O)
81+
#define CMD_PAGE_RANGE(N,O) (0x22), (N), (O)
82+
#define CMD_SCROLL(N) ((N) ? 0x2F : 0x2E)
83+
#define CMD_START_LINE(N) (0x40 | (N))
84+
#define CMD_CONTRAST(N) (0x81), (N)
85+
#define CMD_CHARGE_PUMP(N) (0x8D), ((N) ? 0x14 : 0x10)
86+
#define CMD_ADC_REVERSE(N) ((N) ? 0xA1 : 0xA0)
87+
#define CMD_ALL_PIX(N) ((N) ? 0xA5 : 0xA4)
88+
#define CMD_INVERTED(N) ((N) ? 0xA7 : 0xA6)
89+
#define CMD_MUX_RATIO(N) (0xA8), (N)
90+
#define CMD_ON(N) ((N) ? 0xAF : 0xAE)
91+
#define CMD_OUT_MODE(N) ((N) ? 0xC8 : 0xC0)
92+
#define CMD_DISP_OFFS(N) (0xD3), (N)
93+
#define CMD_OSC_FREQ(R,F) (0xD5), ((F) << 4 | (R))
94+
#define CMD_CHARGE_PER(P,D) (0xD9), ((D) << 4 | (P))
95+
#define CMD_COM_CONFIG(N) (0xDA), ((N) ? 0x12 : 0x02)
96+
#define CMD_VCOM_DESEL(N) (0xDB), (N)
97+
#define CMD_NOOP() (0xE3)
7998

80-
// SH1106 (132x64) is compatible with SSD1306 (128x64) by adding a small margin to the larger display
99+
uint8_t u8g_WriteEscSeqP_2_wire(u8g_t *u8g, u8g_dev_t *dev, const uint8_t *esc_seq);
81100

82-
#define SH1106_PAGE_ADR(N) (0x20), (N)
83-
#define SH1106_COL_ADR(N) (0x10 | ((N) >> 4)), ((N) & 0xFF)
84-
#define SH1106_COLUMN_RANGE(N,O) (0x21), (N), (O)
85-
#define SH1106_PAGE_RANGE(N,O) (0x22), (N), (O)
86-
#define SH1106_SCROLL(N) ((N) ? 0x2F : 0x2E)
87-
#define SH1106_START_LINE(N) (0x40 | (N))
88-
#define SH1106_CONTRAST(N) (0x81), (N)
89-
#define SH1106_CHARGE_PUMP(N) (0x8D), ((N) ? 0x14 : 0x10)
90-
#define SH1106_ADC_REVERSE(N) ((N) ? 0xA1 : 0xA0)
91-
#define SH1106_ALL_PIX(N) ((N) ? 0xA5 : 0xA4)
92-
#define SH1106_INVERTED(N) ((N) ? 0xA7 : 0xA6)
93-
#define SH1106_MUX_RATIO(N) (0xA8), (N)
94-
#define SH1106_ON(N) ((N) ? 0xAF : 0xAE)
95-
#define SH1106_OUT_MODE(N) ((N) ? 0xC8 : 0xC0)
96-
#define SH1106_DISP_OFFS(N) (0xD3), (N)
97-
#define SH1106_OSC_FREQ(R,F) (0xD5), ((F) << 4 | (R))
98-
#define SH1106_CHARGE_PER(P,D) (0xD9), ((D) << 4 | (P))
99-
#define SH1106_COM_CONFIG(N) (0xDA), ((N) ? 0x12 : 0x02)
100-
#define SH1106_VCOM_DESEL(N) (0xDB), (N)
101-
#define SH1106_NOOP() (0xE3)
101+
// SH1106 is compatible with SSD1306, but is 132x64. Display 128x64 centered within the 132x64.
102102

103103
static const uint8_t u8g_dev_sh1106_128x64_data_start_2_wire[] PROGMEM = {
104-
SH1106_COL_ADR(2), // Column 2 to center 128 pixels in 132 pixels
105-
U8G_ESC_END // End of sequence
104+
CMD_COL_ADR(2), // Column 2 to center 128 pixels in 132 pixels
105+
U8G_ESC_END // End of sequence
106106
};
107107

108108
static const uint8_t u8g_dev_sh1106_128x64_init_seq_2_wire[] PROGMEM = {
109-
U8G_ESC_ADR(0), // Initiate command mode
110-
SH1106_ON(0), // Display off, sleep mode
111-
SH1106_MUX_RATIO(0x3F), // Mux ratio
112-
SH1106_DISP_OFFS(0), // Display offset
113-
SH1106_START_LINE(0), // Start line
114-
SH1106_ADC_REVERSE(1), // Segment remap A0/A1
115-
SH1106_OUT_MODE(1), // 0: scan dir normal, 1: reverse
116-
SH1106_COM_CONFIG(1), // COM pin HW config, sequential com pin config (bit 4), disable left/right remap (bit 5)
117-
SH1106_CONTRAST(0xCF), // Set contrast control
118-
SH1106_PAGE_ADR(0x02), // page addressing mode
119-
SH1106_COLUMN_RANGE(2, 129), // Set column range 2 .. 129
120-
SH1106_PAGE_RANGE(0, 7), // Set page range 0 .. 7
121-
SH1106_CHARGE_PER(0x1, 0xF), // Pre-charge period
122-
SH1106_VCOM_DESEL(0x40), // Vcomh deselect level
123-
SH1106_ALL_PIX(0), // Output RAM to display
124-
SH1106_INVERTED(0), // Normal display mode
125-
SH1106_OSC_FREQ(0, 8), // Clock divide ratio (0:1) and oscillator frequency (8)
126-
SH1106_CHARGE_PUMP(1), // Charge pump setting
127-
SH1106_SCROLL(0), // Deactivate scroll
128-
SH1106_ON(1), // Display on
129-
U8G_ESC_END // End of sequence
109+
U8G_ESC_ADR(0), // Initiate command mode
110+
CMD_ON(0), // Display off, sleep mode
111+
CMD_MUX_RATIO(0x3F), // Mux ratio
112+
CMD_DISP_OFFS(0), // Display offset
113+
CMD_START_LINE(0), // Start line
114+
CMD_ADC_REVERSE(1), // Segment remap A0/A1
115+
CMD_OUT_MODE(1), // 0: scan dir normal, 1: reverse
116+
CMD_COM_CONFIG(1), // COM pin HW config, sequential com pin config (bit 4), disable left/right remap (bit 5)
117+
CMD_CONTRAST(0xCF), // Set contrast control
118+
CMD_PAGE_ADR(0x02), // page addressing mode
119+
CMD_COLUMN_RANGE(2, 129), // Set column range 2 .. 129
120+
CMD_PAGE_RANGE(0, 7), // Set page range 0 .. 7
121+
CMD_CHARGE_PER(0x1, 0xF), // Pre-charge period
122+
CMD_VCOM_DESEL(0x40), // Vcomh deselect level
123+
CMD_ALL_PIX(0), // Output RAM to display
124+
CMD_INVERTED(0), // Normal display mode
125+
CMD_OSC_FREQ(0, 8), // Clock divide ratio (0:1) and oscillator frequency (8)
126+
CMD_CHARGE_PUMP(1), // Charge pump setting
127+
CMD_SCROLL(0), // Deactivate scroll
128+
CMD_ON(1), // Display ON
129+
U8G_ESC_END // End of sequence
130130
};
131131

132132
uint8_t u8g_dev_sh1106_128x64_2x_2_wire_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t msg, void *arg) {
@@ -142,7 +142,7 @@ uint8_t u8g_dev_sh1106_128x64_2x_2_wire_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t m
142142
u8g_WriteEscSeqP_2_wire(u8g, dev, u8g_dev_sh1106_128x64_data_start_2_wire);
143143
u8g_WriteByte(u8g, dev, 0xB0 | (pb->p.page*2)); // Select current page
144144
u8g_SetAddress(u8g, dev, 1); // Data mode
145-
u8g_WriteSequence(u8g, dev, pb->width, (uint8_t *) pb->buf);
145+
u8g_WriteSequence(u8g, dev, pb->width, (uint8_t *)pb->buf);
146146
u8g_SetChipSelect(u8g, dev, 0);
147147
u8g_SetAddress(u8g, dev, 0); // Instruction mode
148148
u8g_WriteEscSeqP_2_wire(u8g, dev, u8g_dev_sh1106_128x64_data_start_2_wire);
@@ -157,39 +157,39 @@ uint8_t u8g_dev_sh1106_128x64_2x_2_wire_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t m
157157
return u8g_dev_pb16v1_base_fn(u8g, dev, msg, arg);
158158
}
159159

160-
uint8_t u8g_dev_sh1106_128x64_2x_i2c_2_wire_buf[WIDTH*2] U8G_NOCOMMON ;
161-
u8g_pb_t u8g_dev_sh1106_128x64_2x_i2c_2_wire_pb = { {16, HEIGHT, 0, 0, 0}, WIDTH, u8g_dev_sh1106_128x64_2x_i2c_2_wire_buf};
160+
uint8_t u8g_dev_sh1106_128x64_2x_i2c_2_wire_buf[WIDTH * 2] U8G_NOCOMMON;
161+
u8g_pb_t u8g_dev_sh1106_128x64_2x_i2c_2_wire_pb = { { 16, HEIGHT, 0, 0, 0 }, WIDTH, u8g_dev_sh1106_128x64_2x_i2c_2_wire_buf };
162162
u8g_dev_t u8g_dev_sh1106_128x64_2x_i2c_2_wire = { u8g_dev_sh1106_128x64_2x_2_wire_fn, &u8g_dev_sh1106_128x64_2x_i2c_2_wire_pb, U8G_COM_SSD_I2C_HAL };
163163

164164
/////////////////////////////////////////////////////////////////////////////////////////////
165165

166166
static const uint8_t u8g_dev_ssd1306_128x64_data_start_2_wire[] PROGMEM = {
167-
SH1106_COL_ADR(0), // Column 0
168-
U8G_ESC_END // End of sequence
167+
CMD_COL_ADR(0), // Column 0
168+
U8G_ESC_END // End of sequence
169169
};
170170

171171
static const uint8_t u8g_dev_ssd1306_128x64_init_seq_2_wire[] PROGMEM = {
172-
U8G_ESC_CS(0), // Disable chip
173-
SH1106_ON(0), // Display off, sleep mode
174-
SH1106_MUX_RATIO(0x3F), // Mux ratio
175-
SH1106_DISP_OFFS(0), // Display offset
176-
SH1106_START_LINE(0), // Start line
177-
SH1106_ADC_REVERSE(1), // Segment remap A0/A1
178-
SH1106_OUT_MODE(1), // 0: scan dir normal, 1: reverse
179-
SH1106_COM_CONFIG(1), // COM pin HW config, sequential com pin config (bit 4), disable left/right remap (bit 5)
180-
SH1106_CONTRAST(0xCF), // Set contrast control
181-
SH1106_PAGE_ADR(0x02), // page addressing mode
182-
SH1106_COLUMN_RANGE(0, 127), // Set column range 0 .. 127
183-
SH1106_PAGE_RANGE(0, 7), // Set page range from 0 .. 7
184-
SH1106_CHARGE_PER(0x1, 0xF), // Pre-charge period
185-
SH1106_VCOM_DESEL(0x40), // Vcomh deselect level
186-
SH1106_ALL_PIX(0), // Send RAM to display
187-
SH1106_INVERTED(0), // Normal display mode
188-
SH1106_OSC_FREQ(0, 8), // Clock divide ratio (0:1) and oscillator frequency (8)
189-
SH1106_CHARGE_PUMP(1), // Charge pump setting
190-
SH1106_SCROLL(0), // Deactivate scroll
191-
SH1106_ON(1), // Display on
192-
U8G_ESC_END // End of sequence
172+
U8G_ESC_CS(0), // Disable chip
173+
CMD_ON(0), // Display OFF, sleep mode
174+
CMD_MUX_RATIO(0x3F), // Mux ratio
175+
CMD_DISP_OFFS(0), // Display offset
176+
CMD_START_LINE(0), // Start line
177+
CMD_ADC_REVERSE(1), // Segment remap A0/A1
178+
CMD_OUT_MODE(1), // 0: scan dir normal, 1: reverse
179+
CMD_COM_CONFIG(1), // COM pin HW config, sequential COM pin config (bit 4), disable left/right remap (bit 5)
180+
CMD_CONTRAST(0xCF), // Set contrast control
181+
CMD_PAGE_ADR(2), // Page addressing mode
182+
CMD_COLUMN_RANGE(0, 127), // Set column range 0 .. 127
183+
CMD_PAGE_RANGE(0, 7), // Set page range from 0 .. 7
184+
CMD_CHARGE_PER(0x1, 0xF), // Pre-charge period
185+
CMD_VCOM_DESEL(0x40), // Vcomh deselect level
186+
CMD_ALL_PIX(0), // Send RAM to display
187+
CMD_INVERTED(0), // Normal display mode
188+
CMD_OSC_FREQ(0, 8), // Clock divide ratio (0:1) and oscillator frequency (8)
189+
CMD_CHARGE_PUMP(1), // Charge pump setting
190+
CMD_SCROLL(0), // Deactivate scroll
191+
CMD_ON(1), // Display ON
192+
U8G_ESC_END // End of sequence
193193
};
194194

195195
uint8_t u8g_dev_ssd1306_128x64_2x_2_wire_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t msg, void *arg) {
@@ -205,7 +205,7 @@ uint8_t u8g_dev_ssd1306_128x64_2x_2_wire_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t
205205
u8g_WriteEscSeqP_2_wire(u8g, dev, u8g_dev_ssd1306_128x64_data_start_2_wire);
206206
u8g_WriteByte(u8g, dev, 0xB0 | (pb->p.page*2)); // Select current page
207207
u8g_SetAddress(u8g, dev, 1); // Data mode
208-
u8g_WriteSequence(u8g, dev, pb->width, (uint8_t *) pb->buf);
208+
u8g_WriteSequence(u8g, dev, pb->width, (uint8_t *)pb->buf);
209209
u8g_SetChipSelect(u8g, dev, 0);
210210
u8g_SetAddress(u8g, dev, 0); // Instruction mode
211211
u8g_WriteEscSeqP_2_wire(u8g, dev, u8g_dev_ssd1306_128x64_data_start_2_wire);
@@ -220,8 +220,8 @@ uint8_t u8g_dev_ssd1306_128x64_2x_2_wire_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t
220220
return u8g_dev_pb16v1_base_fn(u8g, dev, msg, arg);
221221
}
222222

223-
uint8_t u8g_dev_ssd1306_128x64_2x_i2c_2_wire_buf[WIDTH*2] U8G_NOCOMMON ;
224-
u8g_pb_t u8g_dev_ssd1306_128x64_2x_i2c_2_wire_pb = { {16, HEIGHT, 0, 0, 0}, WIDTH, u8g_dev_ssd1306_128x64_2x_i2c_2_wire_buf};
223+
uint8_t u8g_dev_ssd1306_128x64_2x_i2c_2_wire_buf[WIDTH * 2] U8G_NOCOMMON;
224+
u8g_pb_t u8g_dev_ssd1306_128x64_2x_i2c_2_wire_pb = { {16, HEIGHT, 0, 0, 0}, WIDTH, u8g_dev_ssd1306_128x64_2x_i2c_2_wire_buf };
225225
u8g_dev_t u8g_dev_ssd1306_128x64_2x_i2c_2_wire = { u8g_dev_ssd1306_128x64_2x_2_wire_fn, &u8g_dev_ssd1306_128x64_2x_i2c_2_wire_pb, U8G_COM_SSD_I2C_HAL };
226226

227227
/////////////////////////////////////////////////////////////////////////////////////////////
@@ -236,7 +236,7 @@ uint8_t u8g_WriteEscSeqP_2_wire(u8g_t *u8g, u8g_dev_t *dev, const uint8_t *esc_s
236236
for (;;) {
237237
uint8_t value = u8g_pgm_read(esc_seq);
238238
if (is_escape == 0) {
239-
if (value != 255) {
239+
if (value != 0xFF) {
240240
if (u8g_WriteByte(u8g, dev, value) == 0) return 0;
241241
if (u8g_WriteByte(u8g, dev, I2C_CMD_MODE) == 0) return 0;
242242
}
@@ -245,17 +245,17 @@ uint8_t u8g_WriteEscSeqP_2_wire(u8g_t *u8g, u8g_dev_t *dev, const uint8_t *esc_s
245245
}
246246
}
247247
else {
248-
if (value == 255) {
248+
if (value == 0xFF) {
249249
if (u8g_WriteByte(u8g, dev, value) == 0) return 0;
250250
if (u8g_WriteByte(u8g, dev, I2C_CMD_MODE) == 0) return 0;
251251
}
252-
else if (value == 254) {
252+
else if (value == 0xFE) {
253253
break;
254254
}
255255
else if (value >= 0xF0) {
256-
// not yet used, do nothing
256+
// Not yet used, do nothing
257257
}
258-
else if (value >= 0xE0 ) {
258+
else if (value >= 0xE0) {
259259
u8g_SetAddress(u8g, dev, value & 0x0F);
260260
}
261261
else if (value >= 0xD0) {
@@ -270,11 +270,10 @@ uint8_t u8g_WriteEscSeqP_2_wire(u8g_t *u8g, u8g_dev_t *dev, const uint8_t *esc_s
270270
u8g_SetResetHigh(u8g, dev);
271271
u8g_Delay(value);
272272
}
273-
else if (value >= 0xBE) {
274-
// not yet implemented
273+
else if (value >= 0xBE) { // Not yet implemented
275274
//u8g_SetVCC(u8g, dev, value & 0x01);
276275
}
277-
else if (value <= 127) {
276+
else if (value <= 0x7F) {
278277
u8g_Delay(value);
279278
}
280279
is_escape = 0;

‎Marlin/src/lcd/dogm/u8g/u8g_dev_ssd1306_sh1106_128x64_SWSPI.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
#define PAGE_HEIGHT 8
6565

6666
#define SH1106_PAGE_ADR(N) (0x20), (N)
67-
#define SH1106_COL_ADR(N) (0x10 | ((N) >> 4)), ((N) & 0xFF)
67+
#define SH1106_COL_ADR(N) (0x10 | ((N) >> 4)), ((N) & 0xF)
6868
#define SH1106_COLUMN_RANGE(N,O) (0x21), (N), (O)
6969
#define SH1106_PAGE_RANGE(N,O) (0x22), (N), (O)
7070
#define SH1106_SCROLL(N) ((N) ? 0x2F : 0x2E)

‎Marlin/src/lcd/dogm/u8g/u8g_dev_ssd1309_12864.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#define PAGE_HEIGHT 8
3333

3434
#define SSD1309_PAGE_ADR(N) (0x20), (N)
35-
#define SSD1309_COL_ADR(N) (0x10 | ((N) >> 4)), ((N) & 0xFF)
35+
#define SSD1309_COL_ADR(N) (0x10 | ((N) >> 4)), ((N) & 0xF)
3636
#define SSD1309_COLUMN_RANGE(N,O) (0x21), (N), (O)
3737
#define SSD1309_PAGE_RANGE(N,O) (0x22), (N), (O)
3838
#define SSD1309_SCROLL(N) ((N) ? 0x2F : 0x2E)

0 commit comments

Comments
 (0)