snark13/Xteink-X4-crosspoint-reader
1
0
Fork 0
mirror of https://github.com/daveallie/crosspoint-reader.git synced 2025-12-19 15:47:40 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Jonas Diemer 2025-12-17 13:09:57 +01:00
parent 9dcdcb02ba
commit 432cd66ca4
1 changed files with 16 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/screens/SleepScreen.cpp
View File

@ -34,16 +34,16 @@ struct BMPHeader {
uint8_t* loadBMP(const char* filename, int& width, int& height) { uint8_t* loadBMP(const char* filename, int& width, int& height) {
// Using rotation type 1: 90 degrees clockwise // Using rotation type 1: 90 degrees clockwise
const int rotationType = 1; const int rotationType = 1;
Serial.printf("[SleepScreen] Trying to load BMP: %s\n", filename); Serial.printf("[%lu] [SleepScreen] Trying to load BMP: %s\n", millis(), filename);
if (!SD.exists(filename)) { if (!SD.exists(filename)) {
Serial.printf("[SleepScreen] File not found: %s\n", filename); Serial.printf("[%lu] [SleepScreen] File not found: %s\n", millis(), filename);
return nullptr; return nullptr;
} }
File bmpFile = SD.open(filename); File bmpFile = SD.open(filename);
if (!bmpFile) { if (!bmpFile) {
Serial.printf("[SleepScreen] Failed to open file: %s\n", filename); Serial.printf("[%lu] [SleepScreen] Failed to open file: %s\n", millis(), filename);
return nullptr; return nullptr;
} }
@ -53,14 +53,14 @@ uint8_t* loadBMP(const char* filename, int& width, int& height) {
// Check if this is a valid BMP file // Check if this is a valid BMP file
if (header.signature != 0x4D42) { // "BM" in little-endian if (header.signature != 0x4D42) { // "BM" in little-endian
Serial.println("[SleepScreen] Invalid BMP signature"); Serial.printf("[%lu] [SleepScreen] Invalid BMP signature\n", millis());
bmpFile.close(); bmpFile.close();
return nullptr; return nullptr;
} }
// Check for supported bit depths // Check for supported bit depths
if (header.bitsPerPixel != 1 && header.bitsPerPixel != 24) { if (header.bitsPerPixel != 1 && header.bitsPerPixel != 24) {
Serial.printf("[SleepScreen] Unsupported bit depth: %d\n", header.bitsPerPixel); Serial.printf("[%lu] [SleepScreen] Unsupported bit depth: %d\n", millis(), header.bitsPerPixel);
bmpFile.close(); bmpFile.close();
return nullptr; return nullptr;
} }
@ -70,36 +70,23 @@ uint8_t* loadBMP(const char* filename, int& width, int& height) {
height = (header.height < 0) ? -header.height : header.height; // Handle top-down BMPs height = (header.height < 0) ? -header.height : header.height; // Handle top-down BMPs
bool topDown = (header.height < 0); bool topDown = (header.height < 0);
Serial.printf("[SleepScreen] BMP dimensions: %dx%d, %d bits/pixel\n", width, height, header.bitsPerPixel); Serial.printf("[%lu] [SleepScreen] BMP dimensions: %dx%d, %d bits/pixel\n", millis(), width, height, header.bitsPerPixel);
// Calculate destination dimensions based on rotation type // Calculate destination dimensions based on rotation type
int destWidth, destHeight; int destWidth, destHeight;
if (rotationType == 0 || rotationType == 2) { // 90 degree rotation to match display orientation
// No rotation or 180 degree rotation: keep same dimensions
destWidth = width;
destHeight = height;
} else {
// 90 degree rotations (clockwise or counterclockwise): swap width and height
destWidth = height; destWidth = height;
destHeight = width; destHeight = width;
}
Serial.printf("[SleepScreen] Output dimensions: %dx%d (rotation type: %d)\n",
destWidth, destHeight, rotationType);
// E-ink display: 1 bit per pixel (8 pixels per byte), MSB first format // E-ink display: 1 bit per pixel (8 pixels per byte), MSB first format
int bytesPerRow = (destWidth + 7) / 8; // Round up to nearest byte int bytesPerRow = (destWidth + 7) / 8; // Round up to nearest byte
int bufferSize = bytesPerRow * destHeight; int bufferSize = bytesPerRow * destHeight;
Serial.printf("[SleepScreen] Buffer dimensions: %d bytes per row, %d total bytes\n", bytesPerRow, bufferSize);
Serial.printf("[SleepScreen] Buffer size: %d bytes (%d bytes per row)\n", bufferSize, bytesPerRow);
// Allocate memory for the display image // Allocate memory for the display image
uint8_t* displayImage = (uint8_t*)malloc(bufferSize); uint8_t* displayImage = (uint8_t*)malloc(bufferSize);
if (!displayImage) { if (!displayImage) {
Serial.println("[SleepScreen] Failed to allocate memory for display image"); Serial.printf("[%lu] [SleepScreen] Failed to allocate memory for display image\n", millis());
bmpFile.close(); bmpFile.close();
return nullptr; return nullptr;
} }
@ -118,7 +105,7 @@ uint8_t* loadBMP(const char* filename, int& width, int& height) {
// Allocate buffer for reading BMP rows // Allocate buffer for reading BMP rows
uint8_t* rowBuffer = (uint8_t*)malloc(bmpRowSize); uint8_t* rowBuffer = (uint8_t*)malloc(bmpRowSize);
if (!rowBuffer) { if (!rowBuffer) {
Serial.println("[SleepScreen] Failed to allocate row buffer"); Serial.printf("[%lu] [SleepScreen] Failed to allocate row buffer\n", millis());
free(displayImage); free(displayImage);
bmpFile.close(); bmpFile.close();
return nullptr; return nullptr;
@ -183,7 +170,7 @@ uint8_t* loadBMP(const char* filename, int& width, int& height) {
free(rowBuffer); free(rowBuffer);
bmpFile.close(); bmpFile.close();
Serial.printf("[SleepScreen] Successfully loaded BMP: %dx%d\n", width, height); Serial.printf("[%lu] [SleepScreen] Successfully loaded BMP: %dx%d\n", millis(), width, height);
return displayImage; return displayImage;
} }
@ -191,8 +178,6 @@ void SleepScreen::onEnter() {
const auto pageWidth = GfxRenderer::getScreenWidth(); const auto pageWidth = GfxRenderer::getScreenWidth();
const auto pageHeight = GfxRenderer::getScreenHeight(); const auto pageHeight = GfxRenderer::getScreenHeight();
Serial.printf("[SleepScreen] Screen dimensions: %dx%d\n", pageWidth, pageHeight);
renderer.clearScreen(); renderer.clearScreen();
// Try to load custom sleep image // Try to load custom sleep image
@ -207,22 +192,14 @@ void SleepScreen::onEnter() {
for (const char* path : bmpPaths) { for (const char* path : bmpPaths) {
imageData = loadBMP(path, imageWidth, imageHeight); imageData = loadBMP(path, imageWidth, imageHeight);
if (imageData) { if (imageData) {
Serial.printf("[SleepScreen] Successfully loaded: %s\n", path); Serial.printf("[%lu] [SleepScreen] Successfully loaded: %s\n", millis(), path);
break; break;
} }
} }
if (imageData) { if (imageData) {
// Image loaded successfully // Image loaded successfully
Serial.printf("[SleepScreen] Drawing image: %dx%d\n", imageWidth, imageHeight); Serial.printf("[%lu] [SleepScreen] Drawing image: %dx%d\n", millis(), imageWidth, imageHeight);
Serial.printf("[SleepScreen] Screen dimensions: %dx%d\n", pageWidth, pageHeight);
// Print the first 16 bytes of image data (for debugging)
Serial.print("[SleepScreen] Image data sample: ");
for (int i = 0; i < 16 && i < (imageWidth+7)/8 * imageHeight; i++) {
Serial.printf("%02X ", imageData[i]);
}
Serial.println();
// Calculate position to center the image // Calculate position to center the image
int xPos = (pageWidth - imageWidth) / 2; int xPos = (pageWidth - imageWidth) / 2;
@ -234,7 +211,7 @@ void SleepScreen::onEnter() {
// Note: We've applied 90-degree clockwise rotation to compensate for // Note: We've applied 90-degree clockwise rotation to compensate for
// the renderer's behavior and ensure the image appears correctly // the renderer's behavior and ensure the image appears correctly
// on the e-ink display. // on the e-ink display.
Serial.printf("[SleepScreen] Drawing at position: %d,%d (dimensions: %dx%d)\n", Serial.printf("[%lu] [SleepScreen] Drawing at position: %d,%d (dimensions: %dx%d)\n", millis(),
xPos, yPos, imageWidth, imageHeight); xPos, yPos, imageWidth, imageHeight);
renderer.drawImage(imageData, xPos, yPos, imageWidth, imageHeight); renderer.drawImage(imageData, xPos, yPos, imageWidth, imageHeight);
@ -242,7 +219,7 @@ void SleepScreen::onEnter() {
free(imageData); free(imageData);
} else { } else {
// Fall back to default image // Fall back to default image
Serial.println("[SleepScreen] Failed to load sleep.bmp - using default image"); Serial.printf("[%lu] [SleepScreen] Failed to load sleep.bmp - using default image\n", millis());
renderer.drawImage(CrossLarge, (pageWidth - 128) / 2, (pageHeight - 128) / 2, 128, 128); renderer.drawImage(CrossLarge, (pageWidth - 128) / 2, (pageHeight - 128) / 2, 128, 128);
renderer.drawCenteredText(UI_FONT_ID, pageHeight / 2 + 70, "CrossPoint", true, BOLD); renderer.drawCenteredText(UI_FONT_ID, pageHeight / 2 + 70, "CrossPoint", true, BOLD);
renderer.drawCenteredText(SMALL_FONT_ID, pageHeight / 2 + 95, "SLEEPING"); renderer.drawCenteredText(SMALL_FONT_ID, pageHeight / 2 + 95, "SLEEPING");