From e82c75258adc22009cdf1e0dbded363d11482e7a Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Sun, 29 Dec 2019 16:35:29 +1100 Subject: [PATCH] Add readback for the current font --- workspace/TS100/Core/Inc/OLED.hpp | 225 +++++++++++++++--------------- workspace/TS100/Core/Src/OLED.cpp | 8 ++ 2 files changed, 121 insertions(+), 112 deletions(-) diff --git a/workspace/TS100/Core/Inc/OLED.hpp b/workspace/TS100/Core/Inc/OLED.hpp index 009c4d7b..56f14b2e 100644 --- a/workspace/TS100/Core/Inc/OLED.hpp +++ b/workspace/TS100/Core/Inc/OLED.hpp @@ -1,112 +1,113 @@ -/* - * OLED.hpp - * - * Created on: 20Jan.,2017 - * Author: Ben V. Brown - * Designed for the SSD1307 - * Cleared for release for TS100 2017/08/20 - */ - -#ifndef OLED_HPP_ -#define OLED_HPP_ -#include -#include "stm32f1xx_hal.h" -#include -#include -#include "FRToSI2C.hpp" -#include "Font.h" -#ifdef __cplusplus -extern "C" { -#endif -#include "FreeRTOS.h" -#ifdef __cplusplus -} -#endif -#define DEVICEADDR_OLED (0x3c<<1) -#define OLED_WIDTH 96 -#define FRAMEBUFFER_START 17 - -class OLED { -public: - - enum DisplayState : bool { - OFF = false, - ON = true - }; - - static void initialize(); // Startup the I2C coms (brings screen out of reset etc) - - // Draw the buffer out to the LCD using the DMA Channel - static void refresh() { - FRToSI2C::Transmit( DEVICEADDR_OLED, screenBuffer, - FRAMEBUFFER_START + (OLED_WIDTH * 2)); - //DMA tx time is ~ 20mS Ensure after calling this you delay for at least 25ms - //or we need to goto double buffering - } - - static void setDisplayState(DisplayState state) { - displayState = state; - screenBuffer[1] = (state == ON) ? 0xAF : 0xAE; - } - - static void setRotation(bool leftHanded); // Set the rotation for the screen - // Get the current rotation of the LCD - static bool getRotation() { - return inLeftHandedMode; - } - static int16_t getCursorX() { - return cursor_x; - } - static void print(const char* string);// Draw a string to the current location, with current font - // Set the cursor location by pixels - static void setCursor(int16_t x, int16_t y) { - cursor_x = x; - cursor_y = y; - } - //Set cursor location by chars in current font - static void setCharCursor(int16_t x, int16_t y) { - cursor_x = x * fontWidth; - cursor_y = y * fontHeight; - } - static void setFont(uint8_t fontNumber); // (Future) Set the font that is being used - static void drawImage(const uint8_t* buffer, uint8_t x, uint8_t width) { - drawArea(x, 0, width, 16, buffer); - } - // Draws an image to the buffer, at x offset from top to bottom (fixed height renders) - static void printNumber(uint16_t number, uint8_t places); - // Draws a number at the current cursor location - // Clears the buffer - static void clearScreen() { - memset(&screenBuffer[FRAMEBUFFER_START], 0, OLED_WIDTH * 2); - } - // Draws the battery level symbol - static void drawBattery(uint8_t state) { - drawSymbol(3 + (state > 10 ? 10 : state)); - } - // Draws a checkbox - static void drawCheckbox(bool state) { - drawSymbol((state) ? 16 : 17); - } - static void debugNumber(int32_t val); - static void drawSymbol(uint8_t symbolID);//Used for drawing symbols of a predictable width - static void drawArea(int16_t x, int8_t y, uint8_t wide, uint8_t height, - const uint8_t* ptr); //Draw an area, but y must be aligned on 0/8 offset - static void fillArea(int16_t x, int8_t y, uint8_t wide, uint8_t height, - const uint8_t value); //Fill an area, but y must be aligned on 0/8 offset - static void drawFilledRect(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, - bool clear); - static void drawHeatSymbol(uint8_t state); -private: - static void drawChar(char c); // Draw a character to a specific location - static const uint8_t* currentFont;// Pointer to the current font used for rendering to the buffer - static uint8_t* firstStripPtr; // Pointers to the strips to allow for buffer having extra content - static uint8_t* secondStripPtr; //Pointers to the strips - static bool inLeftHandedMode; // Whether the screen is in left or not (used for offsets in GRAM) - static DisplayState displayState; - static uint8_t fontWidth, fontHeight; - static int16_t cursor_x, cursor_y; - static uint8_t displayOffset; - static uint8_t screenBuffer[16 + (OLED_WIDTH * 2) + 10]; // The data buffer -}; - -#endif /* OLED_HPP_ */ +/* + * OLED.hpp + * + * Created on: 20Jan.,2017 + * Author: Ben V. Brown + * Designed for the SSD1307 + * Cleared for release for TS100 2017/08/20 + */ + +#ifndef OLED_HPP_ +#define OLED_HPP_ +#include +#include "stm32f1xx_hal.h" +#include +#include +#include "FRToSI2C.hpp" +#include "Font.h" +#ifdef __cplusplus +extern "C" { +#endif +#include "FreeRTOS.h" +#ifdef __cplusplus +} +#endif +#define DEVICEADDR_OLED (0x3c<<1) +#define OLED_WIDTH 96 +#define FRAMEBUFFER_START 17 + +class OLED { +public: + + enum DisplayState : bool { + OFF = false, + ON = true + }; + + static void initialize(); // Startup the I2C coms (brings screen out of reset etc) + + // Draw the buffer out to the LCD using the DMA Channel + static void refresh() { + FRToSI2C::Transmit( DEVICEADDR_OLED, screenBuffer, + FRAMEBUFFER_START + (OLED_WIDTH * 2)); + //DMA tx time is ~ 20mS Ensure after calling this you delay for at least 25ms + //or we need to goto double buffering + } + + static void setDisplayState(DisplayState state) { + displayState = state; + screenBuffer[1] = (state == ON) ? 0xAF : 0xAE; + } + + static void setRotation(bool leftHanded); // Set the rotation for the screen + // Get the current rotation of the LCD + static bool getRotation() { + return inLeftHandedMode; + } + static int16_t getCursorX() { + return cursor_x; + } + static void print(const char* string);// Draw a string to the current location, with current font + // Set the cursor location by pixels + static void setCursor(int16_t x, int16_t y) { + cursor_x = x; + cursor_y = y; + } + //Set cursor location by chars in current font + static void setCharCursor(int16_t x, int16_t y) { + cursor_x = x * fontWidth; + cursor_y = y * fontHeight; + } + static void setFont(uint8_t fontNumber); // (Future) Set the font that is being used + static uint8_t getFont(); + static void drawImage(const uint8_t* buffer, uint8_t x, uint8_t width) { + drawArea(x, 0, width, 16, buffer); + } + // Draws an image to the buffer, at x offset from top to bottom (fixed height renders) + static void printNumber(uint16_t number, uint8_t places); + // Draws a number at the current cursor location + // Clears the buffer + static void clearScreen() { + memset(&screenBuffer[FRAMEBUFFER_START], 0, OLED_WIDTH * 2); + } + // Draws the battery level symbol + static void drawBattery(uint8_t state) { + drawSymbol(3 + (state > 10 ? 10 : state)); + } + // Draws a checkbox + static void drawCheckbox(bool state) { + drawSymbol((state) ? 16 : 17); + } + static void debugNumber(int32_t val); + static void drawSymbol(uint8_t symbolID);//Used for drawing symbols of a predictable width + static void drawArea(int16_t x, int8_t y, uint8_t wide, uint8_t height, + const uint8_t* ptr); //Draw an area, but y must be aligned on 0/8 offset + static void fillArea(int16_t x, int8_t y, uint8_t wide, uint8_t height, + const uint8_t value); //Fill an area, but y must be aligned on 0/8 offset + static void drawFilledRect(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, + bool clear); + static void drawHeatSymbol(uint8_t state); +private: + static void drawChar(char c); // Draw a character to a specific location + static const uint8_t* currentFont;// Pointer to the current font used for rendering to the buffer + static uint8_t* firstStripPtr; // Pointers to the strips to allow for buffer having extra content + static uint8_t* secondStripPtr; //Pointers to the strips + static bool inLeftHandedMode; // Whether the screen is in left or not (used for offsets in GRAM) + static DisplayState displayState; + static uint8_t fontWidth, fontHeight; + static int16_t cursor_x, cursor_y; + static uint8_t displayOffset; + static uint8_t screenBuffer[16 + (OLED_WIDTH * 2) + 10]; // The data buffer +}; + +#endif /* OLED_HPP_ */ diff --git a/workspace/TS100/Core/Src/OLED.cpp b/workspace/TS100/Core/Src/OLED.cpp index 646d24c4..71c06f16 100644 --- a/workspace/TS100/Core/Src/OLED.cpp +++ b/workspace/TS100/Core/Src/OLED.cpp @@ -155,6 +155,14 @@ void OLED::setFont(uint8_t fontNumber) { fontWidth = 12; } } +uint8_t OLED::getFont() { + if (currentFont == USER_FONT_6x8) + return 1; + else if (currentFont == ExtraFontChars) + return 2; + else + return 0; +} inline void stripLeaderZeros(char *buffer) { //Removing the leading zero's by swapping them to SymbolSpace // Stop 1 short so that we dont blank entire number if its zero