Merge pull request #799 from Ralim/fix-bootlogo

Fix logo drawing swapped
Ralim · Jan 16, 2021 · ad37c75 · ad37c75
2 parents 2785813 + 308eee4
commit ad37c75
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/Translations/make_translation.py b/Translations/make_translation.py
@@ -80,9 +80,6 @@ def writeStart(f):
             """// WARNING: THIS FILE WAS AUTO GENERATED BY make_translation.py. PLEASE DO NOT EDIT.
 
 #include "Translation.h"
-#ifndef LANG
-#define LANG_EN
-#endif
 """
         )
     )

diff --git a/workspace/TS100/Core/BSP/Miniware/Power.cpp b/workspace/TS100/Core/BSP/Miniware/Power.cpp
@@ -28,7 +28,6 @@ void power_check() {
 uint8_t usb_pd_detect() {
 #ifdef POW_PD
 	FUSB302_present = fusb302_detect();
-
 	return FUSB302_present;
 #endif
 	return false;

diff --git a/workspace/TS100/Core/Drivers/OLED.cpp b/workspace/TS100/Core/Drivers/OLED.cpp
@@ -391,15 +391,17 @@ void OLED::drawAreaSwapped(int16_t x, int8_t y, uint8_t wide, uint8_t height, co
 	}
 
 	if (y == 0) {
-// Splat first line of data
-		for (uint8_t xx = visibleStart; xx < visibleEnd; xx ++) {
+		// Splat first line of data
+		for (uint8_t xx = visibleStart; xx < visibleEnd; xx += 2) {
 			firstStripPtr[xx + x] = ptr[xx + 1];
+			firstStripPtr[xx + x + 1] = ptr[xx];
 		}
 	}
 	if (y == 8 || height == 16) {
-// Splat the second line
-		for (uint8_t xx = visibleStart; xx < visibleEnd; xx++) {
+		// Splat the second line
+		for (uint8_t xx = visibleStart; xx < visibleEnd; xx += 2) {
 			secondStripPtr[x + xx] = ptr[xx + 1 + (height == 16 ? wide : 0)];
+			secondStripPtr[x + xx + 1] = ptr[xx + (height == 16 ? wide : 0)];
 		}
 	}
 }

diff --git a/workspace/TS100/Core/Threads/GUIThread.cpp b/workspace/TS100/Core/Threads/GUIThread.cpp
@@ -805,6 +805,7 @@ void startGUITask(void const *argument __unused) {
 		ButtonState buttons = getButtonState();
 		if (buttons)
 			ticks = xTaskGetTickCount(); // make timeout now so we will exit
+		OLED::refresh();
 		GUIDelay();
 	}
 

diff --git a/workspace/TS100/Core/Threads/POWThread.cpp b/workspace/TS100/Core/Threads/POWThread.cpp
@@ -16,8 +16,6 @@
 
 // Small worker thread to handle power (mostly QC) related steps
 
-
-
 void startPOWTask(void const *argument __unused) {
 	postRToSInit();
 	for (;;) {