Merge pull request #5 from brooksytech/fix_351files

Fix 351files resolution/font size & update version.
This commit is contained in:
fewtarius 2022-02-25 06:52:23 -05:00 committed by GitHub
commit 4ce5228be9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 12 deletions

View file

@ -2,7 +2,7 @@
# Copyright (C) 2021-present 351ELEC (https://github.com/351elec)
PKG_NAME="351files"
PKG_VERSION="bab7144d2b3dccdc090445608d0a21210e3d438b"
PKG_VERSION="a7bb75dafca5c3f8e50e0f456b7ec249a69e1346"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
@ -25,4 +25,3 @@ makeinstall_target() {
cp 351Files $INSTALL/usr/bin/
cp -rf res $INSTALL/usr/share/351files/
}

View file

@ -13,29 +13,30 @@ diff --git a/src/def.h b/src/def.h
index 92d1a01..db4fec4 100644
--- a/src/def.h
+++ b/src/def.h
@@ -85,6 +85,21 @@
@@ -85,6 +85,22 @@
#define KEYBOARD_MARGIN 8
#define KEYBOARD_KEY_SPACING 4
+// Parameters for RG552
+#elif defined(DEVICE_RG552)
+ #define SCREEN_WIDTH 1152
+ #define SCREEN_HEIGHT 1920
+ #define SCREEN_WIDTH 1920
+ #define SCREEN_HEIGHT 1152
+ #define HARDWARE_ACCELERATION 0
+ #define FULLSCREEN 1
+ #define FONT_NAME "NotoSans-Regular.ttf"
+ #define FONT_NAME_MONO "NotoSansMono-Regular.ttf"
+ #define FONT_SIZE 20
+ #define LINE_HEIGHT 32
+ #define ICON_SIZE 24
+ #define MARGIN_X 10
+ #define KEYBOARD_MARGIN 8
+ #define KEYBOARD_KEY_SPACING 4
+ #define FONT_SIZE 48
+ #define LINE_HEIGHT 72
+ #define ICON_SIZE 58
+ #define MARGIN_X 24
+ #define KEYBOARD_MARGIN 19
+ #define KEYBOARD_KEY_SPACING 10
+ #define KEYBOARD_SYMBOL_SIZE 58
+
// Paramaters for desktop PC
#else
#define SCREEN_WIDTH 640
@@ -124,7 +139,25 @@
@@ -124,7 +139,26 @@
#define VIEWER_SCROLL_SPEED 20
// Button events
@ -58,6 +59,7 @@ index 92d1a01..db4fec4 100644
+ #define BUTTON_HELD_PAGEUP SDL_JoystickGetButton(g_joystick, 4) || SDL_JoystickGetButton(g_joystick, 6)
+ #define BUTTON_HELD_PAGEDOWN SDL_JoystickGetButton(g_joystick, 5) || SDL_JoystickGetButton(g_joystick, 7)
+ #define BUTTON_HELD_SELECT SDL_JoystickGetButton(g_joystick, 3)
+ #define BUTTON_HELD_VALIDATE SDL_JoystickGetButton(g_joystick, 1)
+#elif defined(DEVICE_RG351P)
#define BUTTON_PRESSED_UP event.type == SDL_JOYHATMOTION && event.jhat.value == SDL_HAT_UP
#define BUTTON_PRESSED_DOWN event.type == SDL_JOYHATMOTION && event.jhat.value == SDL_HAT_DOWN