Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix shift back in screenshot and mayhem hub #1910

Merged
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,11 @@ CMakeFiles/
.DS_Store
/firmware/CMakeCache.txt

# Python env/ venv
# Python env/ venv and cache
env/
venv/
**/__pycache__/
*.pyc

# Other
*.bak
4 changes: 0 additions & 4 deletions firmware/application/apps/ui_text_editor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
#include "log_file.hpp"
#include "string_format.hpp"

#include "portapack_persistent_memory.hpp"

using namespace portapack;
namespace fs = std::filesystem;

Expand Down Expand Up @@ -556,8 +554,6 @@ void TextEditorView::open_file(const fs::path& path) {
viewer.set_file(*file_);
}

portapack::persistent_memory::set_apply_fake_brightness(false); // work around to resolve the display issue in notepad app. not elegant i know, so TODO.

refresh_ui();
}

Expand Down
32 changes: 24 additions & 8 deletions firmware/common/portapack_io.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* Copyright (C) 2014 Jared Boone, ShareBrained Technology, Inc.
* Copyleft (ɔ) 2024 zxkmm under GPL license
* Copyright (C) 2024 u-foka
* Copyright (C) 2023 Mark Thompson
NotherNgineer marked this conversation as resolved.
Show resolved Hide resolved
*
* This file is part of PortaPack.
*
Expand Down Expand Up @@ -147,7 +148,7 @@ class IO {

void lcd_write_pixel(ui::Color pixel) {
if (get_dark_cover()) {
darken_color(pixel, get_brightness()); // Darken the pixel color
shift_color(pixel, get_brightness(), false); // Darken the pixel color
}
lcd_write_data(pixel.v);
}
Expand All @@ -158,7 +159,7 @@ class IO {

void lcd_write_pixels(ui::Color pixel, size_t n) {
if (get_dark_cover()) {
darken_color(pixel, get_brightness()); // Darken the pixel color
shift_color(pixel, get_brightness(), false); // Darken the pixel color
}
while (n--) {
lcd_write_data(pixel.v);
Expand All @@ -167,7 +168,7 @@ class IO {

void lcd_write_pixels_unrolled8(ui::Color pixel, size_t n) {
if (get_dark_cover()) {
darken_color(pixel, get_brightness()); // Darken the pixel color
shift_color(pixel, get_brightness(), false); // Darken the pixel color
}
auto v = pixel.v;
n >>= 3;
Expand Down Expand Up @@ -331,7 +332,7 @@ class IO {
addr(1); /* Set up for data phase (most likely after a command) */
}

void darken_color(ui::Color& pixel, uint8_t darken_level_shift) {
void shift_color(ui::Color& pixel, uint8_t shift_level, bool shift_left) {
// TODO: 1. do we need edge control?
// currently didn't see and issue without edge control
// but maybe hurts screen hardware without one?
Expand All @@ -343,9 +344,15 @@ class IO {
uint16_t g = (pixel.v >> 5) & 0x3F; // Extract green
uint16_t b = pixel.v & 0x1F; // Extract blue

r = r >> darken_level_shift; // Darken red
g = g >> darken_level_shift; // Darken green
b = b >> darken_level_shift; // Darken blue
if (shift_left) { // Shfting
r = r << shift_level;
g = g << shift_level;
zxkmm marked this conversation as resolved.
Show resolved Hide resolved
b = b << shift_level;
} else if (!shift_left) {
r = r >> shift_level;
g = g >> shift_level;
b = b >> shift_level;
}

pixel.v = (r << 11) | (g << 5) | b; // Combine back to color, check UI::color for the color layout
}
Expand Down Expand Up @@ -417,7 +424,16 @@ class IO {
halPolledDelay(18); // 90ns

const auto value_low = data_read();
return (value_high << 8) | value_low;
uint32_t original_value = (value_high << 8) | value_low;

if (get_dark_cover()) {
ui::Color pixel;
pixel.v = original_value;
shift_color(pixel, get_brightness(), true);
original_value = pixel.v;
}

return original_value;
}

void io_write(const bool address, const uint_fast16_t value) {
Expand Down
Loading