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

Update lcd.c

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Sylaina 2018-01-01 12:12:04 +01:00 committet von GitHub
Ursprung e0d8d74fd1
Commit 5220d51e34
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23
1 geänderte Dateien mit 7 neuen und 1 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

8
lcd.c
Datei anzeigen

@ -44,6 +44,7 @@
#include "lcd.h" #include "lcd.h"
#include <string.h> #include <string.h>
uint8_t cursorPosition=0;
#if defined GRAPHICMODE #if defined GRAPHICMODE
#include <stdlib.h> #include <stdlib.h>
static uint8_t displayBuffer[DISPLAYSIZE]; static uint8_t displayBuffer[DISPLAYSIZE];
@ -251,6 +252,7 @@ void lcd_clrscr(void){
} }
void lcd_gotoxy(uint8_t x, uint8_t y) { void lcd_gotoxy(uint8_t x, uint8_t y) {
if( x > (DISPLAY_WIDTH/6) || y > (DISPLAY_HEIGHT/8-1)) return;// out of display if( x > (DISPLAY_WIDTH/6) || y > (DISPLAY_HEIGHT/8-1)) return;// out of display
cursorPosition=x;
x = x * 6; // one char: 6 pixel width x = x * 6; // one char: 6 pixel width
#if defined SSD1306 #if defined SSD1306
uint8_t commandSequence[] = {0xb0+y, 0x21, x, 0x7f}; uint8_t commandSequence[] = {0xb0+y, 0x21, x, 0x7f};
@ -261,6 +263,7 @@ void lcd_gotoxy(uint8_t x, uint8_t y) {
} }
void lcd_putc(char c){ void lcd_putc(char c){
if((c > 127 || if((c > 127 ||
cursorPosition > 20 ||
c < 32) && c < 32) &&
(c != 'ü' && (c != 'ü' &&
c != 'ö' && c != 'ö' &&
@ -270,7 +273,7 @@ void lcd_putc(char c){
c != 'Ü' && c != 'Ü' &&
c != 'Ö' && c != 'Ö' &&
c != 'Ä' ) ) return; c != 'Ä' ) ) return;
cursorPosition++;
i2c_start(LCD_I2C_ADR); i2c_start(LCD_I2C_ADR);
i2c_byte(0x40); // 0x00 for command, 0x40 for data i2c_byte(0x40); // 0x00 for command, 0x40 for data
switch (c) { switch (c) {
@ -362,6 +365,7 @@ void lcd_clrscr(void){
} }
void lcd_gotoxy(uint8_t x, uint8_t y){ void lcd_gotoxy(uint8_t x, uint8_t y){
if( x > (DISPLAY_WIDTH/6) || y > (DISPLAY_HEIGHT/8-1)) return;// out of display if( x > (DISPLAY_WIDTH/6) || y > (DISPLAY_HEIGHT/8-1)) return;// out of display
cursorPosition=x;
x = x * 6; // one char: 6 pixel width x = x * 6; // one char: 6 pixel width
actualIndex = (x)+(y*DISPLAY_WIDTH); actualIndex = (x)+(y*DISPLAY_WIDTH);
#if defined SSD1306 #if defined SSD1306
@ -374,6 +378,7 @@ void lcd_gotoxy(uint8_t x, uint8_t y){
void lcd_putc(char c){ void lcd_putc(char c){
if((actualIndex+1)%127 != 0){ if((actualIndex+1)%127 != 0){
if((c > 127 || if((c > 127 ||
cursorPosition > 20 ||
c < 32) && c < 32) &&
(c != 'ü' && (c != 'ü' &&
c != 'ö' && c != 'ö' &&
@ -383,6 +388,7 @@ void lcd_putc(char c){
c != 'Ü' && c != 'Ü' &&
c != 'Ö' && c != 'Ö' &&
c != 'Ä' ) ) return; c != 'Ä' ) ) return;
cursorPosition++;
switch (c) { switch (c) {
case 'ü': case 'ü':
c = 95; // ü - 188 c = 95; // ü - 188