alex/SSD1306
1
0
Fork 0
mirror of https://github.com/Matiasus/SSD1306.git synced 2024-10-03 18:18:46 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Underline & bod & normal added

Browse Source
This commit is contained in:
matiasus 2022-12-08 22:35:51 +01:00
parent 1cfabae208
commit 82a23aba04
2 changed files with 139 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
lib/ssd1306.c
View File

@ -6,7 +6,7 @@
* Written by Marian Hrinko (mato.hrinko@gmail.com) * Written by Marian Hrinko (mato.hrinko@gmail.com)
* *
* @author Marian Hrinko * @author Marian Hrinko
* @datum 06.10.2020 * @date 06.10.2020
* @update 06.12.2022 * @update 06.12.2022
* @file ssd1306.c * @file ssd1306.c
* @version 3.0 * @version 3.0
@ -20,7 +20,8 @@
* --------------------------------------------------------------------------------------+ * --------------------------------------------------------------------------------------+
* @usage Basic Setup for OLED Display * @usage Basic Setup for OLED Display
*/ */
// @includes
// @includes
#include "ssd1306.h" #include "ssd1306.h"
// +---------------------------+ // +---------------------------+
@ -141,7 +142,7 @@ unsigned short int _indexPage = START_PAGE_ADDR; // @var global
uint8_t SSD1306_Init (void) uint8_t SSD1306_Init (void)
{ {
const uint8_t *commands = INIT_SSD1306; // variables const uint8_t *commands = INIT_SSD1306; // variables
uint8_t no_of_commands = pgm_read_byte(commands++); // number of commands uint8_t no_of_commands = pgm_read_byte (commands++); // number of commands
uint8_t no_of_arguments; // number od arguments uint8_t no_of_arguments; // number od arguments
uint8_t command; // command uint8_t command; // command
uint8_t status = INIT_STATUS; // TWI init status 0xFF uint8_t status = INIT_STATUS; // TWI init status 0xFF
@ -342,11 +343,13 @@ uint8_t SSD1306_ClearScreen (void)
* @desc SSD1306 Set position * @desc SSD1306 Set position
* *
* @param uint8_t column -> 0 ... 127 * @param uint8_t column -> 0 ... 127
* @param uint8_t column -> 0 ... 127
* @param uint8_t page -> 0 ... 7
* @param uint8_t page -> 0 ... 7 * @param uint8_t page -> 0 ... 7
* *
* @return void * @return void
*/ */
uint8_t SSD1306_SetPosition (uint8_t x, uint8_t y) uint8_t SSD1306_SetWindow (uint8_t x1, uint8_t x2, uint8_t y1, uint8_t y2)
{ {
uint8_t status = INIT_STATUS; // TWI init status 0xFF uint8_t status = INIT_STATUS; // TWI init status 0xFF
@ -362,30 +365,30 @@ uint8_t SSD1306_SetPosition (uint8_t x, uint8_t y)
if (SSD1306_SUCCESS != status) { // check status if (SSD1306_SUCCESS != status) { // check status
return status; // error return status; // error
} }
status = SSD1306_Send_Command (x); // start COLUMN status = SSD1306_Send_Command (x1); // start COLUMN
if (SSD1306_SUCCESS != status) { // check status if (SSD1306_SUCCESS != status) { // check status
return status; // error return status; // error
} }
status = SSD1306_Send_Command (END_COLUMN_ADDR); // end COLUMN status = SSD1306_Send_Command (x2); // end COLUMN
if (SSD1306_SUCCESS != status) { // check status if (SSD1306_SUCCESS != status) { // check status
return status; // error return status; // error
} }
_indexCol = x; // update column index _indexCol = x1; // update column index
// PAGE // PAGE
// ------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------
status = SSD1306_Send_Command (SSD1306_SET_PAGE_ADDR); // 0x22 status = SSD1306_Send_Command (SSD1306_SET_PAGE_ADDR); // 0x22
if (SSD1306_SUCCESS != status) { // check status if (SSD1306_SUCCESS != status) { // check status
return status; // error return status; // error
} }
status = SSD1306_Send_Command (y); // start PAGE status = SSD1306_Send_Command (y1); // start PAGE
if (SSD1306_SUCCESS != status) { // check status if (SSD1306_SUCCESS != status) { // check status
return status; // error return status; // error
} }
status = SSD1306_Send_Command (END_PAGE_ADDR); // end PAGE status = SSD1306_Send_Command (y2); // end PAGE
if (SSD1306_SUCCESS != status) { // check status if (SSD1306_SUCCESS != status) { // check status
return status; // error return status; // error
} }
_indexPage = y; // update column index _indexPage = y1; // update column index
// TWI STOP // TWI STOP
// ------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------
@ -394,6 +397,28 @@ uint8_t SSD1306_SetPosition (uint8_t x, uint8_t y)
return SSD1306_SUCCESS; // success return SSD1306_SUCCESS; // success
} }
/**
* @desc SSD1306 Set position
*
* @param uint8_t column -> 0 ... 127
* @param uint8_t page -> 0 ... 7
*
* @return void
*/
uint8_t SSD1306_SetPosition (uint8_t x, uint8_t y)
{
uint8_t status = INIT_STATUS; // TWI init status 0xFF
uint8_t x_end = END_COLUMN_ADDR;
uint8_t y_end = END_PAGE_ADDR;
status = SSD1306_SetWindow (x, x_end, y, y_end); // end COLUMN
if (SSD1306_SUCCESS != status) { // check status
return status; // error
}
return SSD1306_SUCCESS; // success
}
/** /**
* @desc SSD1306 Update text poisition - this ensure that character will not be divided * @desc SSD1306 Update text poisition - this ensure that character will not be divided
* at the end of row, the whole character will be depicted on the new row * at the end of row, the whole character will be depicted on the new row
@ -403,10 +428,9 @@ uint8_t SSD1306_SetPosition (uint8_t x, uint8_t y)
* *
* @return uint8_t * @return uint8_t
*/ */
uint8_t SSD1306_UpdatePosition (x, p) uint8_t SSD1306_UpdatePosition (uint8_t x, uint8_t p)
{ {
uint8_t status = INIT_STATUS; // TWI init status 0xFF uint8_t status = INIT_STATUS; // TWI init status 0xFF
//uint8_t x = _indexCol + CHARS_COLS_LENGTH + 1; // check end col position
// check position // check position
// ------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------
@ -444,34 +468,44 @@ uint8_t SSD1306_DrawChar (char ch, enum E_Font font)
uint8_t byte; uint8_t byte;
uint8_t status = INIT_STATUS; // TWI init status 0xFF uint8_t status = INIT_STATUS; // TWI init status 0xFF
uint16_t i = 0; // counter uint16_t i = 0; // counter
uint8_t next_x = _indexCol + CHARS_COLS_LENGTH + 1; uint8_t next_x;
uint8_t next_p = _indexPage; uint8_t next_p;
uint8_t mask = 0x00;
// UPDATE / CHECK TEXT POSITION
// -------------------------------------------------------------------------------------
status = SSD1306_UpdatePosition(next_x, next_p);
if (SSD1306_SUCCESS != status) { // check status
return status; // error
}
// TWI START & SLAW
// -------------------------------------------------------------------------------------
status = SSD1306_Send_StartAndSLAW (SSD1306_ADDR); // start & SLAW
if (SSD1306_SUCCESS != status) { // check status
return status; // error
}
// TWI control byte data stream
// -------------------------------------------------------------------------------------
status = TWI_MT_Send_Data (SSD1306_DATA_STREAM); // send data 0x40
if (SSD1306_SUCCESS != status) { // check status
return status; // error
}
// NORMAL FONT // NORMAL FONT
// ------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------
if (font == NORMAL) { if ((font & 0x0f) == NORMAL) {
if (font & 0xf0) {
mask = 0x80;
}
next_x = _indexCol + CHARS_COLS_LENGTH;
next_p = _indexPage;
// UPDATE / CHECK TEXT POSITION
// -----------------------------------------------------------------------------------
status = SSD1306_UpdatePosition (next_x, next_p);
if (SSD1306_SUCCESS != status) { // check status
return status; // error
}
// TWI START & SLAW
// -----------------------------------------------------------------------------------
status = SSD1306_Send_StartAndSLAW (SSD1306_ADDR); // start & SLAW
if (SSD1306_SUCCESS != status) { // check status
return status; // error
}
// TWI control byte data stream
// -----------------------------------------------------------------------------------
status = TWI_MT_Send_Data (SSD1306_DATA_STREAM); // send data 0x40
if (SSD1306_SUCCESS != status) { // check status
return status; // error
}
while (i < CHARS_COLS_LENGTH) { while (i < CHARS_COLS_LENGTH) {
byte = pgm_read_byte (&FONTS[ch-32][i]); byte = pgm_read_byte (&FONTS[ch-32][i]);
status = TWI_MT_Send_Data (byte); // send data col status = TWI_MT_Send_Data (byte | mask); // send data col
if (SSD1306_SUCCESS != status) { // check status if (SSD1306_SUCCESS != status) { // check status
return status; // error return status; // error
} }
@ -480,33 +514,49 @@ uint8_t SSD1306_DrawChar (char ch, enum E_Font font)
} }
// BOLD FONT // BOLD FONT
// ------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------
} else if (font == BOLD) { } else if ((font & 0x0f) == BOLD) {
if (font & 0xf0) {
mask = 0x80;
}
next_x = _indexCol + 2*CHARS_COLS_LENGTH;
next_p = _indexPage;
// UPDATE / CHECK TEXT POSITION
// -----------------------------------------------------------------------------------
status = SSD1306_UpdatePosition (next_x, next_p);
if (SSD1306_SUCCESS != status) { // check status
return status; // error
}
// TWI START & SLAW
// -----------------------------------------------------------------------------------
status = SSD1306_Send_StartAndSLAW (SSD1306_ADDR); // start & SLAW
if (SSD1306_SUCCESS != status) { // check status
return status; // error
}
// TWI control byte data stream
// -----------------------------------------------------------------------------------
status = TWI_MT_Send_Data (SSD1306_DATA_STREAM); // send data 0x40
if (SSD1306_SUCCESS != status) { // check status
return status; // error
}
while (i < CHARS_COLS_LENGTH) { while (i < CHARS_COLS_LENGTH) {
byte = pgm_read_byte (&FONTS[ch-32][i]); byte = pgm_read_byte (&FONTS[ch-32][i]);
status = TWI_MT_Send_Data (byte); // send data col status = TWI_MT_Send_Data (byte | mask); // send data col
status = TWI_MT_Send_Data (byte); // send data col status = TWI_MT_Send_Data (byte | mask); // send data col
if (SSD1306_SUCCESS != status) { // check status if (SSD1306_SUCCESS != status) { // check status
return status; // error return status; // error
} }
i++; // update counter i++; // update counter
_indexCol++; // update global col _indexCol = _indexCol + 2; // update global col
} }
// UNDERLINE FONT }
// -------------------------------------------------------------------------------------
} else if (font == UNDERLINE) {
while (i < CHARS_COLS_LENGTH) {
byte = pgm_read_byte (&FONTS[ch-32][i]) | 0x80;
status = TWI_MT_Send_Data (byte); // send data col
if (SSD1306_SUCCESS != status) { // check status
return status; // error
}
i++; // update counter
_indexCol++; // update global col
}
}
// send empty column to memory lcd // send empty column to memory lcd
// ------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------
status = TWI_MT_Send_Data (CLEAR_COLOR); // ONE empty column status = TWI_MT_Send_Data (mask); // ONE empty column
if (SSD1306_SUCCESS != status) { // check status if (SSD1306_SUCCESS != status) { // check status
return status; // error return status; // error
} }
@ -586,14 +636,14 @@ uint8_t SSD1306_DrawCharBig (char ch)
* *
* @return uint8_t * @return uint8_t
*/ */
uint8_t SSD1306_DrawString (char *str) uint8_t SSD1306_DrawString (char *str, enum E_Font font)
{ {
uint8_t i = 0; // char counter uint8_t i = 0; // char counter
// send characters of string // send characters of string
// ------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------
while (str[i] != '\0') { while (str[i] != '\0') {
SSD1306_DrawChar (str[i++]); // send char SSD1306_DrawChar (str[i++], font); // send char
} }
return SSD1306_SUCCESS; // success return SSD1306_SUCCESS; // success

38
lib/ssd1306.h
View File

@ -6,7 +6,7 @@
* Written by Marian Hrinko (mato.hrinko@gmail.com) * Written by Marian Hrinko (mato.hrinko@gmail.com)
* *
* @author Marian Hrinko * @author Marian Hrinko
* @datum 06.10.2020 * @date 06.10.2020
* @update 21.11.2022 * @update 21.11.2022
* @file ssd1306.h * @file ssd1306.h
* @version 3.0 * @version 3.0
@ -92,6 +92,13 @@
#define MAX_X END_COLUMN_ADDR #define MAX_X END_COLUMN_ADDR
#define MAX_Y (END_PAGE_ADDR + 1) * 8 #define MAX_Y (END_PAGE_ADDR + 1) * 8
// @enum
enum E_Font {
NORMAL = 0x00,
BOLD = 0x01,
UNDERLINE = 0x10
};
/** /**
* @desc SSD1306 Init * @desc SSD1306 Init
* *
@ -153,7 +160,7 @@
* *
* @return uint8_t * @return uint8_t
*/ */
uint8_t SSD1306_UpdatePosition (void); uint8_t SSD1306_UpdatePosition (uint8_t, uint8_t);
/** /**
* @desc SSD1306 Set position * @desc SSD1306 Set position
@ -165,14 +172,37 @@
*/ */
uint8_t SSD1306_SetPosition (uint8_t, uint8_t); uint8_t SSD1306_SetPosition (uint8_t, uint8_t);
/**
* @desc SSD1306 Set window
*
* @param uint8_t column -> 0 ... 127
* @param uint8_t column -> 0 ... 127
* @param uint8_t page -> 0 ... 7
* @param uint8_t page -> 0 ... 7
*
* @return void
*/
uint8_t SSD1306_SetWindow (uint8_t, uint8_t, uint8_t, uint8_t);
/** /**
* @desc SSD1306 Draw character * @desc SSD1306 Draw character
* *
* @param char * @param char
* @param enum E_Font
* *
* @return uint8_t * @return uint8_t
*/ */
uint8_t SSD1306_DrawChar (char); uint8_t SSD1306_DrawChar (char, enum E_Font);
/**
* @desc SSD1306 Draw character big
*
* @param char
* @param enum E_Font
*
* @return uint8_t
*/
uint8_t SSD1306_DrawCharBig (char);
/** /**
* @desc SSD1306 Draw string * @desc SSD1306 Draw string
@ -181,7 +211,7 @@
* *
* @return uint8_t * @return uint8_t
*/ */
uint8_t SSD1306_DrawString (char *); uint8_t SSD1306_DrawString (char *, enum E_Font);
/** /**
* @desc Draw pixel * @desc Draw pixel