me/IronOS
1
0
Fork 1
mirror of https://github.com/Ralim/IronOS.git synced 2025-02-26 07:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1723 from Ralim/OLEd-round-two

Browse Source 
Adjust divider
This commit is contained in:
discip
2023-06-29 21:30:19 +02:00
committed by GitHub
parent 0a3dfb34ec c43063ee8c
commit 96c7fe1757
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/Core/BSP/Miniware/Software_I2C.h
View File

@@ -33,7 +33,7 @@
#define SOFT_I2C_DELAY() \ #define SOFT_I2C_DELAY() \
{ \ { \
for (int xx = 0; xx < 10; xx++) { \ for (int xx = 0; xx < 15; xx++) { \
asm("nop"); \ asm("nop"); \
} \ } \
} }

14
source/Core/Drivers/OLED.cpp
View File

@@ -32,7 +32,7 @@ uint32_t OLED::displayChecksum;
I2C_CLASS::I2C_REG OLED_Setup_Array[] = { I2C_CLASS::I2C_REG OLED_Setup_Array[] = {
/**/ /**/
{0x80, 0xAE, 0}, /*Display off*/ {0x80, 0xAE, 0}, /*Display off*/
{0x80, 0xD3, 0}, /*Set display clock divide ratio / osc freq*/ {0x80, OLED_DIVIDER, 0}, /*Set display clock divide ratio / osc freq*/
{0x80, 0x52, 0}, /*Divide ratios*/ {0x80, 0x52, 0}, /*Divide ratios*/
{0x80, 0xA8, 0}, /*Set Multiplex Ratio*/ {0x80, 0xA8, 0}, /*Set Multiplex Ratio*/
{0x80, OLED_HEIGHT - 1, 0}, /*Multiplex ratio adjusts how far down the matrix it scans*/ {0x80, OLED_HEIGHT - 1, 0}, /*Multiplex ratio adjusts how far down the matrix it scans*/
@@ -90,7 +90,7 @@ const uint8_t REFRESH_COMMANDS[17] = {
0x80, 0x80,
0x00, // A 0x00, // A
0x80, 0x80,
(OLED_HEIGHT / 8), // B (OLED_HEIGHT / 8) - 1, // B
// Start of data // Start of data
0x40, 0x40,
@@ -127,6 +127,7 @@ void OLED::initialize() {
#endif #endif
displayOffset = 0; displayOffset = 0;
memcpy(&screenBuffer[0], &REFRESH_COMMANDS[0], sizeof(REFRESH_COMMANDS)); memcpy(&screenBuffer[0], &REFRESH_COMMANDS[0], sizeof(REFRESH_COMMANDS));
memcpy(&secondFrameBuffer[0], &REFRESH_COMMANDS[0], sizeof(REFRESH_COMMANDS));
// Set the display to be ON once the settings block is sent and send the // Set the display to be ON once the settings block is sent and send the
// initialisation data to the OLED. // initialisation data to the OLED.
@@ -271,7 +272,7 @@ void OLED::transitionSecondaryFramebuffer(bool forwardNavigation) {
TickType_t duration = 0; TickType_t duration = 0;
TickType_t start = xTaskGetTickCount(); TickType_t start = xTaskGetTickCount();
uint8_t offset = 0; uint8_t offset = 0;
TickType_t startDraw = xTaskGetTickCount();
while (duration <= totalDuration) { while (duration <= totalDuration) {
duration = xTaskGetTickCount() - start; duration = xTaskGetTickCount() - start;
uint16_t progress = ((duration * 100) / totalDuration); // Percentage of the period we are through for animation uint16_t progress = ((duration * 100) / totalDuration); // Percentage of the period we are through for animation
@@ -308,9 +309,8 @@ void OLED::transitionSecondaryFramebuffer(bool forwardNavigation) {
memmove(&stripPointers[3][newStart], &stripBackPointers[3][newEnd], progress); memmove(&stripPointers[3][newStart], &stripBackPointers[3][newEnd], progress);
#endif #endif
TickType_t start = xTaskGetTickCount();
refresh(); // Now refresh to write out the contents to the new page refresh(); // Now refresh to write out the contents to the new page
vTaskDelayUntil(&start, TICKS_100MS / 7); vTaskDelayUntil(&startDraw, TICKS_100MS / 7);
if (getButtonState() != BUTTON_NONE) { if (getButtonState() != BUTTON_NONE) {
return; return;
} }
@@ -332,6 +332,7 @@ void OLED::useSecondaryFramebuffer(bool useSecondary) {
* **This function blocks until the transition has completed or user presses button** * **This function blocks until the transition has completed or user presses button**
*/ */
void OLED::transitionScrollDown() { void OLED::transitionScrollDown() {
TickType_t startDraw = xTaskGetTickCount();
for (uint8_t heightPos = 0; heightPos < OLED_HEIGHT; heightPos++) { for (uint8_t heightPos = 0; heightPos < OLED_HEIGHT; heightPos++) {
// For each line, we shuffle all bits up a row // For each line, we shuffle all bits up a row
@@ -374,9 +375,8 @@ void OLED::transitionScrollDown() {
refresh(); // Now refresh to write out the contents to the new page refresh(); // Now refresh to write out the contents to the new page
return; return;
} }
TickType_t start = xTaskGetTickCount();
refresh(); // Now refresh to write out the contents to the new page refresh(); // Now refresh to write out the contents to the new page
vTaskDelayUntil(&start, TICKS_100MS / 7); vTaskDelayUntil(&startDraw, TICKS_100MS / 7);
} }
} }

3
source/Core/Drivers/OLED.hpp
View File

@@ -46,6 +46,7 @@ extern "C" {
#define OLED_VCOM_LAYOUT 0x12 #define OLED_VCOM_LAYOUT 0x12
#define OLED_SEGMENT_MAP_REVERSED #define OLED_SEGMENT_MAP_REVERSED
#define OLED_DIVIDER 0xD3
#else #else
#define OLED_WIDTH 96 #define OLED_WIDTH 96
#define OLED_HEIGHT 16 #define OLED_HEIGHT 16
@@ -55,7 +56,7 @@ extern "C" {
#define OLED_GRAM_END 0x7F #define OLED_GRAM_END 0x7F
#define OLED_GRAM_START_FLIP 0 #define OLED_GRAM_START_FLIP 0
#define OLED_GRAM_END_FLIP 95 #define OLED_GRAM_END_FLIP 95
#define OLED_DIVIDER 0xD5
#define OLED_SEGMENT_MAP 0xA0 #define OLED_SEGMENT_MAP 0xA0
#endif #endif