Skip to content

Commit dd5585b

Browse files
fdebrabanderfdebrabander
committed
Reformatting source code,
1 parent f2b3401 commit dd5585b

File tree

2 files changed

+78
-86
lines changed

2 files changed

+78
-86
lines changed

‎LiquidCrystal_I2C.cpp

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -61,25 +61,24 @@ void LiquidCrystal_I2C::begin(uint8_t cols, uint8_t lines, uint8_t dotsize) {
6161
expanderWrite(_backlightval); // reset expanderand turn backlight off (Bit 8 =1)
6262
delay(1000);
6363

64-
//put the LCD into 4 bit mode
64+
//put the LCD into 4 bit mode
6565
// this is according to the hitachi HD44780 datasheet
6666
// figure 24, pg 46
67-
68-
// we start in 8bit mode, try to set 4 bit mode
69-
write4bits(0x03 << 4);
70-
delayMicroseconds(4500); // wait min 4.1ms
71-
72-
// second try
73-
write4bits(0x03 << 4);
74-
delayMicroseconds(4500); // wait min 4.1ms
75-
76-
// third go!
77-
write4bits(0x03 << 4);
78-
delayMicroseconds(150);
79-
80-
// finally, set to 4-bit interface
81-
write4bits(0x02 << 4);
8267

68+
// we start in 8bit mode, try to set 4 bit mode
69+
write4bits(0x03 << 4);
70+
delayMicroseconds(4500); // wait min 4.1ms
71+
72+
// second try
73+
write4bits(0x03 << 4);
74+
delayMicroseconds(4500); // wait min 4.1ms
75+
76+
// third go!
77+
write4bits(0x03 << 4);
78+
delayMicroseconds(150);
79+
80+
// finally, set to 4-bit interface
81+
write4bits(0x02 << 4);
8382

8483
// set # lines, font size, etc.
8584
command(LCD_FUNCTIONSET | _displayfunction);
@@ -98,11 +97,8 @@ void LiquidCrystal_I2C::begin(uint8_t cols, uint8_t lines, uint8_t dotsize) {
9897
command(LCD_ENTRYMODESET | _displaymode);
9998

10099
home();
101-
102100
}
103101

104-
105-
106102
/********** high level commands, for the user! */
107103
void LiquidCrystal_I2C::clear(){
108104
command(LCD_CLEARDISPLAY);// clear display, set cursor position to zero
@@ -116,7 +112,7 @@ void LiquidCrystal_I2C::home(){
116112

117113
void LiquidCrystal_I2C::setCursor(uint8_t col, uint8_t row){
118114
int row_offsets[] = { 0x00, 0x40, 0x14, 0x54 };
119-
if ( row > _numlines ) {
115+
if (row > _numlines) {
120116
row = _numlines-1; // we count rows starting w/0
121117
}
122118
command(LCD_SETDDRAMADDR | (col + row_offsets[row]));
@@ -205,8 +201,6 @@ void LiquidCrystal_I2C::backlight(void) {
205201
expanderWrite(0);
206202
}
207203

208-
209-
210204
/*********** mid level commands, for sending data/cmds */
211205

212206
inline void LiquidCrystal_I2C::command(uint8_t value) {
@@ -218,14 +212,13 @@ inline size_t LiquidCrystal_I2C::write(uint8_t value) {
218212
}
219213

220214

221-
222215
/************ low level data pushing commands **********/
223216

224217
// write either command or data
225218
void LiquidCrystal_I2C::send(uint8_t value, uint8_t mode) {
226219
uint8_t highnib=value&0xf0;
227220
uint8_t lownib=(value<<4)&0xf0;
228-
write4bits((highnib)|mode);
221+
write4bits((highnib)|mode);
229222
write4bits((lownib)|mode);
230223
}
231224

@@ -249,13 +242,13 @@ void LiquidCrystal_I2C::pulseEnable(uint8_t _data){
249242
}
250243

251244
void LiquidCrystal_I2C::load_custom_character(uint8_t char_num, uint8_t *rows){
252-
createChar(char_num, rows);
245+
createChar(char_num, rows);
253246
}
254247

255248
void LiquidCrystal_I2C::setBacklight(uint8_t new_val){
256-
if(new_val){
249+
if (new_val) {
257250
backlight(); // turn backlight on
258-
}else{
251+
} else {
259252
noBacklight(); // turn backlight off
260253
}
261254
}

‎LiquidCrystal_I2C.h

Lines changed: 58 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -53,70 +53,69 @@
5353

5454
class LiquidCrystal_I2C : public Print {
5555
public:
56-
LiquidCrystal_I2C(uint8_t lcd_Addr,uint8_t lcd_cols,uint8_t lcd_rows);
57-
void begin(uint8_t cols, uint8_t rows, uint8_t charsize = LCD_5x8DOTS );
58-
void clear();
59-
void home();
60-
void noDisplay();
61-
void display();
62-
void noBlink();
63-
void blink();
64-
void noCursor();
65-
void cursor();
66-
void scrollDisplayLeft();
67-
void scrollDisplayRight();
68-
void printLeft();
69-
void printRight();
70-
void leftToRight();
71-
void rightToLeft();
72-
void shiftIncrement();
73-
void shiftDecrement();
74-
void noBacklight();
75-
void backlight();
76-
void autoscroll();
77-
void noAutoscroll();
78-
void createChar(uint8_t, uint8_t[]);
79-
void setCursor(uint8_t, uint8_t);
80-
virtual size_t write(uint8_t);
81-
void command(uint8_t);
82-
void init();
56+
LiquidCrystal_I2C(uint8_t lcd_Addr,uint8_t lcd_cols,uint8_t lcd_rows);
57+
void begin(uint8_t cols, uint8_t rows, uint8_t charsize = LCD_5x8DOTS );
58+
void clear();
59+
void home();
60+
void noDisplay();
61+
void display();
62+
void noBlink();
63+
void blink();
64+
void noCursor();
65+
void cursor();
66+
void scrollDisplayLeft();
67+
void scrollDisplayRight();
68+
void printLeft();
69+
void printRight();
70+
void leftToRight();
71+
void rightToLeft();
72+
void shiftIncrement();
73+
void shiftDecrement();
74+
void noBacklight();
75+
void backlight();
76+
void autoscroll();
77+
void noAutoscroll();
78+
void createChar(uint8_t, uint8_t[]);
79+
void setCursor(uint8_t, uint8_t);
80+
virtual size_t write(uint8_t);
81+
void command(uint8_t);
82+
void init();
8383

84-
void blink_on() { blink(); }
85-
void blink_off() { noBlink(); }
86-
void cursor_on() { cursor(); }
87-
void cursor_off() { noCursor(); }
84+
inline void blink_on() { blink(); }
85+
inline void blink_off() { noBlink(); }
86+
inline void cursor_on() { cursor(); }
87+
inline void cursor_off() { noCursor(); }
8888

89-
////compatibility API function aliases
90-
void setBacklight(uint8_t new_val); // alias for backlight() and nobacklight()
91-
void load_custom_character(uint8_t char_num, uint8_t *rows); // alias for createChar()
92-
void printstr(const char[]);
89+
// Compatibility API function aliases
90+
void setBacklight(uint8_t new_val); // alias for backlight() and nobacklight()
91+
void load_custom_character(uint8_t char_num, uint8_t *rows); // alias for createChar()
92+
void printstr(const char[]);
9393

94-
////Unsupported API functions (not implemented in this library)
95-
uint8_t status();
96-
void setContrast(uint8_t new_val);
97-
uint8_t keypad();
98-
void setDelay(int,int);
99-
void on();
100-
void off();
101-
uint8_t init_bargraph(uint8_t graphtype);
102-
void draw_horizontal_graph(uint8_t row, uint8_t column, uint8_t len, uint8_t pixel_col_end);
103-
void draw_vertical_graph(uint8_t row, uint8_t column, uint8_t len, uint8_t pixel_col_end);
94+
// Unsupported API functions (not implemented in this library)
95+
uint8_t status();
96+
void setContrast(uint8_t new_val);
97+
uint8_t keypad();
98+
void setDelay(int,int);
99+
void on();
100+
void off();
101+
uint8_t init_bargraph(uint8_t graphtype);
102+
void draw_horizontal_graph(uint8_t row, uint8_t column, uint8_t len, uint8_t pixel_col_end);
103+
void draw_vertical_graph(uint8_t row, uint8_t column, uint8_t len, uint8_t pixel_col_end);
104104

105-
106105
private:
107-
void init_priv();
108-
void send(uint8_t, uint8_t);
109-
void write4bits(uint8_t);
110-
void expanderWrite(uint8_t);
111-
void pulseEnable(uint8_t);
112-
uint8_t _Addr;
113-
uint8_t _displayfunction;
114-
uint8_t _displaycontrol;
115-
uint8_t _displaymode;
116-
uint8_t _numlines;
117-
uint8_t _cols;
118-
uint8_t _rows;
119-
uint8_t _backlightval;
106+
void init_priv();
107+
void send(uint8_t, uint8_t);
108+
void write4bits(uint8_t);
109+
void expanderWrite(uint8_t);
110+
void pulseEnable(uint8_t);
111+
uint8_t _Addr;
112+
uint8_t _displayfunction;
113+
uint8_t _displaycontrol;
114+
uint8_t _displaymode;
115+
uint8_t _numlines;
116+
uint8_t _cols;
117+
uint8_t _rows;
118+
uint8_t _backlightval;
120119
};
121120

122121
#endif // FDB_LIQUID_CRYSTAL_I2C_H

0 commit comments

Comments
 (0)