Skip to content

Adding OLED modes #22

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.

Sign up for GitHub

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

Open
NorbiZsemi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Adding OLED modes #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
65 changes: 58 additions & 7 deletions src/gui.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ static SceDisplayFrameBuf g_gui_fb = {
.pitch = 960,
};
static int g_gui_fb_last_width = 960;
static short osd_move_dir = 1;
static float osd_move_counter = 0;
static short fps_move_dir = 1;
static float fps_move_counter = 0;
static float g_gui_fb_w_ratio = 1.0f;
static float g_gui_fb_h_ratio = 1.0f;

Expand Down Expand Up @@ -51,6 +55,7 @@ static const unsigned char GUI_CORNERS_XD[GUI_CORNERS_XD_RADIUS] = {9, 7, 5, 4,
static const rgba_t WHITE = {.rgba = {.r = 255, .g = 255, .b = 255, .a = 255}};
static const rgba_t BLACK = {.rgba = {.r = 0, .g = 0, .b = 0, .a = 0}};
static const rgba_t FPS_COLOR = {.rgba = {.r = 0, .g = 255, .b = 0, .a = 255}};
static const rgba_t FPS_COLOR_OLED = { .rgba = {.r = 0, .g = 204, .b = 68, .a = 255} };

psvs_gui_mode_t psvs_gui_get_mode() {
return g_gui_mode;
Expand Down Expand Up @@ -224,7 +229,9 @@ static void _psvs_gui_dd_prchar(const char character, int x, int y) {
uint8_t charByte = g_gui_font[charPosH + (xx_font / 8)];

if ((charByte >> (7 - (xx_font % 8))) & 1) {
ksceKernelMemcpyKernelToUser((uintptr_t)(px + xx), &FPS_COLOR, sizeof(rgba_t));
ksceKernelMemcpyKernelToUser((uintptr_t)(px + xx),
g_gui_mode == PSVS_GUI_MODE_FPS_OLED ? &FPS_COLOR_OLED : &FPS_COLOR,
sizeof(rgba_t));
}
}
}
Expand All @@ -235,8 +242,27 @@ void psvs_gui_dd_fps() {
snprintf(buf, 4, "%d", psvs_perf_get_fps());
size_t len = strlen(buf);

float shift = 0;
if (g_gui_mode == PSVS_GUI_MODE_FPS_OLED) {
shift = fps_move_counter;
}

for (int i = 0; i < len; i++) {
_psvs_gui_dd_prchar(buf[i], 10 + i * g_gui_font_width * g_gui_font_scale, 10);
_psvs_gui_dd_prchar(buf[i], shift + i * g_gui_font_width * g_gui_font_scale, 10);
}
if (g_gui_mode == PSVS_GUI_MODE_FPS_OLED)
{
fps_move_counter += (float)fps_move_dir / 300;
if (fps_move_counter > g_gui_fb.width - 30)
{
fps_move_counter -= 3;
fps_move_dir = -1;
}
else if (fps_move_counter < 0)
{
fps_move_counter += 3;
fps_move_dir = 1;
}
}
}

Expand Down Expand Up @@ -424,7 +450,12 @@ static void _psvs_gui_draw_battery(int x, int y, int state, bool is_charging, rg

void psvs_gui_draw_osd_template() {
psvs_gui_set_back_color(0, 0, 0, 255);
psvs_gui_set_text_color(255, 255, 255, 255);
if (g_gui_mode == PSVS_GUI_MODE_OSD) {
psvs_gui_set_text_color(255, 255, 255, 255);
}
else {
psvs_gui_set_text_color(0, 255, 0, 255);
}
psvs_gui_clear();

// CPU
Expand Down Expand Up @@ -713,12 +744,32 @@ void psvs_gui_deinit() {
}

void psvs_gui_cpy() {
int height = (g_gui_mode == PSVS_GUI_MODE_OSD) ? GUI_OSD_HEIGHT : GUI_HEIGHT;

int height = (g_gui_mode == PSVS_GUI_MODE_OSD || g_gui_mode == PSVS_GUI_MODE_OSD_OLED) ? GUI_OSD_HEIGHT : GUI_HEIGHT;
int w = (int)(GUI_WIDTH * (g_gui_fb.width / 960.0f));
int h = (int)(height * (g_gui_fb.height / 544.0f));
int x = (g_gui_mode == PSVS_GUI_MODE_OSD) ? 10 : (g_gui_fb.width / 2) - (w / 2);
int y = (g_gui_mode == PSVS_GUI_MODE_OSD) ? 10 : (g_gui_fb.height / 2) - (h / 2);
int x = 0;
if (g_gui_mode == PSVS_GUI_MODE_OSD) {
x = 0;
}
else if (g_gui_mode == PSVS_GUI_MODE_OSD_OLED) {
osd_move_counter += (float)osd_move_dir / 300;
if (osd_move_counter > g_gui_fb.width - w)
{
osd_move_counter -= 3;
osd_move_dir = -1;
}
else if (osd_move_counter < 0)
{
osd_move_counter += 3;
osd_move_dir = 1;
}
x = osd_move_counter;
}
else {
x = (g_gui_fb.width / 2) - (w / 2);
}
int y = (g_gui_mode == PSVS_GUI_MODE_OSD || g_gui_mode == PSVS_GUI_MODE_OSD_OLED) ? 10 : (g_gui_fb.height / 2) - (h / 2);

for (int line = 0; line < h; line++) {
int xd = 0;
Expand Down
2 changes: 2 additions & 0 deletions src/gui.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ typedef enum {
PSVS_GUI_MODE_HIDDEN,
PSVS_GUI_MODE_FULL,
PSVS_GUI_MODE_FPS,
PSVS_GUI_MODE_FPS_OLED,
PSVS_GUI_MODE_OSD,
PSVS_GUI_MODE_OSD_OLED,
PSVS_GUI_MODE_MAX
} psvs_gui_mode_t;

Expand Down
10 changes: 5 additions & 5 deletions src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ int ksceDisplaySetFrameBufInternal_patched(int head, int index, const SceDisplay
psvs_perf_poll_memory();
}

if (mode == PSVS_GUI_MODE_FPS || mode == PSVS_GUI_MODE_FULL) {
if (mode == PSVS_GUI_MODE_FPS || mode == PSVS_GUI_MODE_FPS_OLED || mode == PSVS_GUI_MODE_FULL) {
psvs_gui_dd_fps(); // draw fps onto fb
}

if (mode == PSVS_GUI_MODE_OSD || mode == PSVS_GUI_MODE_FULL) {
if (mode == PSVS_GUI_MODE_OSD ||mode == PSVS_GUI_MODE_OSD_OLED || mode == PSVS_GUI_MODE_FULL) {
psvs_gui_cpy(); // cpy from buffer
}

Expand Down Expand Up @@ -227,22 +227,22 @@ static int psvs_thread(SceSize args, void *argp) {
psvs_gui_mode_t mode = psvs_gui_get_mode();

// If in OSD/FULL mode, poll shown info
if (mode == PSVS_GUI_MODE_OSD || mode == PSVS_GUI_MODE_FULL) {
if (mode == PSVS_GUI_MODE_OSD || mode == PSVS_GUI_MODE_OSD_OLED || mode == PSVS_GUI_MODE_FULL) {
psvs_perf_poll_cpu();
psvs_perf_poll_batt();
}

// Redraw buffer template on gui mode or fb change
if (fb_or_mode_changed) {
if (mode == PSVS_GUI_MODE_OSD) {
if (mode == PSVS_GUI_MODE_OSD || mode == PSVS_GUI_MODE_OSD_OLED) {
psvs_gui_draw_osd_template();
} else if (mode == PSVS_GUI_MODE_FULL) {
psvs_gui_draw_template();
}
}

// Draw OSD mode
if (mode == PSVS_GUI_MODE_OSD) {
if (mode == PSVS_GUI_MODE_OSD || mode == PSVS_GUI_MODE_OSD_OLED) {
psvs_gui_draw_osd_cpu();
psvs_gui_draw_osd_fps();
psvs_gui_draw_osd_batt();
Expand Down