GitMigration/oled-display
1
0
Fork 0
Code Issues Pull-Requests Projekte Releases Wiki Aktivität

Update lcd.c

Quellcode durchsuchen 
Cleanup code
Dieser Commit ist enthalten in:
Sylaina 2019-09-13 06:13:55 +02:00 committet von GitHub
Ursprung eae35b14aa
Commit 2693043cf2
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23
1 geänderte Dateien mit 12 neuen und 16 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

28
lcd.c
Datei anzeigen

@ -264,15 +264,14 @@ void lcd_putc(char c){
} }
} }
} }
i2c_start(LCD_I2C_ADR << 1); uint8_t data[sizeof(FONT[0])*2];
i2c_byte(0x40);
for (uint8_t i = 0; i < sizeof(FONT[0]); i++) for (uint8_t i = 0; i < sizeof(FONT[0]); i++)
{ {
// print font to ram, print 6 columns // print font to ram, print 6 columns
i2c_byte(doubleChar[i] & 0xff); data[i<<1]=(doubleChar[i] & 0xff);
i2c_byte(doubleChar[i] & 0xff); data[(i<<1)+1]=(doubleChar[i] & 0xff);
} }
i2c_stop(); lcd_data(data, sizeof(FONT[0])*2);
#if defined SSD1306 #if defined SSD1306
uint8_t commandSequence[] = {0xb0+cursorPosition.y+1, uint8_t commandSequence[] = {0xb0+cursorPosition.y+1,
@ -288,15 +287,13 @@ void lcd_putc(char c){
#endif #endif
lcd_command(commandSequence, sizeof(commandSequence)); lcd_command(commandSequence, sizeof(commandSequence));
i2c_start(LCD_I2C_ADR << 1); for (uint8_t i = 0; i < sizeof(FONT[0]); i++)
i2c_byte(0x40);
for (uint8_t j = 0; j < sizeof(FONT[0]); j++)
{ {
// print font to ram, print 6 columns // print font to ram, print 6 columns
i2c_byte(doubleChar[j] >> 8); data[i<<1]=(doubleChar[i] >> 8);
i2c_byte(doubleChar[j] >> 8); data[(i<<1)+1]=(doubleChar[i] >> 8);
} }
i2c_stop(); lcd_data(data, sizeof(FONT[0])*2);
commandSequence[0] = 0xb0+cursorPosition.y; commandSequence[0] = 0xb0+cursorPosition.y;
#if defined SSD1306 #if defined SSD1306
@ -308,14 +305,13 @@ void lcd_putc(char c){
lcd_command(commandSequence, sizeof(commandSequence)); lcd_command(commandSequence, sizeof(commandSequence));
cursorPosition.x += sizeof(FONT[0])*2; cursorPosition.x += sizeof(FONT[0])*2;
} else { } else {
i2c_start(LCD_I2C_ADR << 1); uint8_t data[sizeof(FONT[0])];
i2c_byte(0x40); for (uint8_t i = 0; i < sizeof(FONT[0]); i++)
for (uint8_t i = 0; i < sizeof(FONT[0]); i++)
{ {
// print font to ram, print 6 columns // print font to ram, print 6 columns
i2c_byte(pgm_read_byte(&(FONT[(uint8_t)c][i]))); data[i]=(pgm_read_byte(&(FONT[(uint8_t)c][i])));
} }
i2c_stop(); lcd_data(data, sizeof(FONT[0]));
cursorPosition.x += sizeof(FONT[0]); cursorPosition.x += sizeof(FONT[0]);
} }
#endif #endif