Skip to content

Commit 0d6371d

Browse files
renzenicolairenzenicolai
committed
Fixes for Hackerhotel 2024 target
1 parent 7699dd5 commit 0d6371d

16 files changed

Lines changed: 23 additions & 23 deletions

‎main/common/display.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ static lcd_color_rgb_pixel_format_t display_color_format = LCD_COLOR_PIXEL_FORMA
2525
static lcd_rgb_data_endian_t display_data_endian = LCD_RGB_DATA_ENDIAN_LITTLE;
2626
static pax_buf_t fb = {0};
2727

28-
#if defined(CONFIG_BSP_TARGET_KAMI)
28+
#if defined(CONFIG_BSP_TARGET_KAMI) || defined(CONFIG_BSP_TARGET_HACKERHOTEL_2024)
2929
static pax_col_t palette[] = {0xffffffff, 0xff000000, 0xffff0000}; // white, black, red
3030
#endif
3131

@@ -53,14 +53,14 @@ void display_init(void) {
5353
break;
5454
}
5555

56-
#if defined(CONFIG_BSP_TARGET_KAMI)
56+
#if defined(CONFIG_BSP_TARGET_KAMI) || defined(CONFIG_BSP_TARGET_HACKERHOTEL_2024)
5757
format = PAX_BUF_2_PAL;
5858
#endif
5959

6060
pax_buf_init(&fb, NULL, display_h_res, display_v_res, format);
6161
pax_buf_reversed(&fb, display_data_endian == LCD_RGB_DATA_ENDIAN_BIG);
6262

63-
#if defined(CONFIG_BSP_TARGET_KAMI)
63+
#if defined(CONFIG_BSP_TARGET_KAMI) || defined(CONFIG_BSP_TARGET_HACKERHOTEL_2024)
6464
fb.palette = palette;
6565
fb.palette_size = sizeof(palette) / sizeof(pax_col_t);
6666
#endif

‎main/common/theme.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,10 @@ const gui_theme_t theme = {
161161
.height = 16,
162162
.vertical_margin = 0,
163163
.horizontal_margin = 0,
164-
.text_height = 16,
164+
.text_height = 18,
165165
.vertical_padding = 5,
166166
.horizontal_padding = 0,
167-
.text_font = &chakrapetchmedium,
167+
.text_font = pax_font_saira_regular,
168168
.palette =
169169
{
170170
.color_foreground = 1,
@@ -181,10 +181,10 @@ const gui_theme_t theme = {
181181
.height = 32,
182182
.vertical_margin = 0,
183183
.horizontal_margin = 0,
184-
.text_height = 16,
184+
.text_height = 18,
185185
.vertical_padding = 0,
186186
.horizontal_padding = 0,
187-
.text_font = &chakrapetchmedium,
187+
.text_font = pax_font_saira_regular,
188188
.palette =
189189
{
190190
.color_foreground = 1,
@@ -201,10 +201,10 @@ const gui_theme_t theme = {
201201
.height = 240 - 32 - 16,
202202
.vertical_margin = 0,
203203
.horizontal_margin = 0,
204-
.text_height = 16,
204+
.text_height = 18,
205205
.vertical_padding = 3,
206206
.horizontal_padding = 3,
207-
.text_font = &chakrapetchmedium,
207+
.text_font = pax_font_saira_regular,
208208
.list_entry_height = 32,
209209
.grid_horizontal_count = 3,
210210
.grid_vertical_count = 3,

‎main/menu/about.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
defined(CONFIG_BSP_TARGET_HACKERHOTEL_2026)
1616
#define FOOTER_LEFT ((gui_element_icontext_t[]){{get_icon(ICON_ESC), "/"}, {get_icon(ICON_F1), "Back"}}), 2
1717
#define FOOTER_RIGHT NULL, 0
18-
#elif defined(CONFIG_BSP_TARGET_MCH2022)
18+
#elif defined(CONFIG_BSP_TARGET_MCH2022) || defined(CONFIG_BSP_TARGET_KAMI)
1919
#define FOOTER_LEFT NULL, 0
2020
#define FOOTER_RIGHT NULL, 0
2121
#else

‎main/menu/app_inspect.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#define FOOTER_RIGHT NULL, 0
2626
#define TEXT_FONT pax_font_sky_mono
2727
#define TEXT_SIZE 18
28-
#elif defined(CONFIG_BSP_TARGET_MCH2022)
28+
#elif defined(CONFIG_BSP_TARGET_MCH2022) || defined(CONFIG_BSP_TARGET_KAMI)
2929
#define FOOTER_LEFT ((gui_element_icontext_t[]){{NULL, "🅱 Back"}}), 1
3030
#define FOOTER_RIGHT NULL, 0
3131
#define TEXT_FONT pax_font_sky_mono

‎main/menu/apps.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ void execute_app(pax_buf_t* buffer, gui_theme_t* theme, pax_vec2_t position, app
148148
{get_icon(ICON_F5), "Remove"}}), \
149149
4
150150
#define FOOTER_RIGHT ((gui_element_icontext_t[]){{NULL, "↑ / ↓ | ⏎ Start app"}}), 1
151-
#elif defined(CONFIG_BSP_TARGET_MCH2022)
151+
#elif defined(CONFIG_BSP_TARGET_MCH2022) || defined(CONFIG_BSP_TARGET_KAMI)
152152
#define FOOTER_LEFT NULL, 0
153153
#define FOOTER_RIGHT ((gui_element_icontext_t[]){{NULL, "🅼 Info 🅴 Remove 🅰 Start"}}), 1
154154
#else

‎main/menu/home.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ static void execute_action(pax_buf_t* fb, menu_home_action_t action, gui_theme_t
6565
defined(CONFIG_BSP_TARGET_HACKERHOTEL_2026)
6666
#define FOOTER_LEFT ((gui_element_icontext_t[]){{get_icon(ICON_F5), "Settings"}, {get_icon(ICON_F6), "USB mode"}}), 2
6767
#define FOOTER_RIGHT ((gui_element_icontext_t[]){{NULL, "↑ / ↓ / ← / → | ⏎ Select"}}), 1
68-
#elif defined(CONFIG_BSP_TARGET_MCH2022)
68+
#elif defined(CONFIG_BSP_TARGET_MCH2022) || defined(CONFIG_BSP_TARGET_KAMI) || defined(CONFIG_BSP_TARGET_KAMI)
6969
#define FOOTER_LEFT NULL, 0
7070
#define FOOTER_RIGHT ((gui_element_icontext_t[]){{NULL, "🅼 Settings 🅰 Select"}}), 1
7171
#else

‎main/menu/menu_device_information.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#define FOOTER_RIGHT NULL, 0
2121
#define TEXT_FONT pax_font_sky_mono
2222
#define TEXT_SIZE 18
23-
#elif defined(CONFIG_BSP_TARGET_MCH2022)
23+
#elif defined(CONFIG_BSP_TARGET_MCH2022) || defined(CONFIG_BSP_TARGET_KAMI)
2424
#define FOOTER_LEFT ((gui_element_icontext_t[]){{NULL, "🅱 Back"}}), 1
2525
#define FOOTER_RIGHT NULL, 0
2626
#define TEXT_FONT pax_font_sky_mono

‎main/menu/menu_power_information.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define FOOTER_RIGHT NULL, 0
2020
#define TEXT_FONT pax_font_sky_mono
2121
#define TEXT_SIZE 18
22-
#elif defined(CONFIG_BSP_TARGET_MCH2022)
22+
#elif defined(CONFIG_BSP_TARGET_MCH2022) || defined(CONFIG_BSP_TARGET_KAMI)
2323
#define FOOTER_LEFT ((gui_element_icontext_t[]){{NULL, "🅱 Back"}}), 1
2424
#define FOOTER_RIGHT NULL, 0
2525
#define TEXT_FONT pax_font_sky_mono

‎main/menu/menu_repository_client.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
defined(CONFIG_BSP_TARGET_HACKERHOTEL_2026)
2222
#define FOOTER_LEFT ((gui_element_icontext_t[]){{get_icon(ICON_ESC), "/"}, {get_icon(ICON_F1), "Back"}}), 2
2323
#define FOOTER_RIGHT ((gui_element_icontext_t[]){{NULL, "↑ / ↓ | ⏎ Select"}}), 1
24-
#elif defined(CONFIG_BSP_TARGET_MCH2022)
24+
#elif defined(CONFIG_BSP_TARGET_MCH2022) || defined(CONFIG_BSP_TARGET_KAMI)
2525
#define FOOTER_LEFT NULL, 0
2626
#define FOOTER_RIGHT ((gui_element_icontext_t[]){{NULL, "↑ / ↓ | 🅱 Back 🅰 Select"}}), 1
2727
#else

‎main/menu/menu_settings.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
defined(CONFIG_BSP_TARGET_HACKERHOTEL_2026)
2727
#define FOOTER_LEFT ((gui_element_icontext_t[]){{get_icon(ICON_ESC), "/"}, {get_icon(ICON_F1), "Back"}}), 2
2828
#define FOOTER_RIGHT ((gui_element_icontext_t[]){{NULL, "↑ / ↓ | ⏎ Select"}}), 1
29-
#elif defined(CONFIG_BSP_TARGET_MCH2022)
29+
#elif defined(CONFIG_BSP_TARGET_MCH2022) || defined(CONFIG_BSP_TARGET_KAMI)
3030
#define FOOTER_LEFT NULL, 0
3131
#define FOOTER_RIGHT ((gui_element_icontext_t[]){{NULL, "↑ / ↓ | 🅱 Back 🅰 Select"}}), 1
3232
#else

0 commit comments

Comments
 (0)