Skip to content

Commit 3f69087

Browse files
committed
Merge branch 'main' of github.com:Nicolai-Electronics/tanmatsu-launcher into renze/coprocessor-update
2 parents 4af92f0 + 6eb1158 commit 3f69087

3 files changed

Lines changed: 10 additions & 3 deletions

File tree

main/hardware_test/test_keyboard.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,12 @@ key_t keys[] = {
100100
.was_pressed = false,
101101
.changed = true},
102102
{.name = "ALT", .scancode = BSP_INPUT_SCANCODE_LEFTALT, .pressed = false, .was_pressed = false, .changed = true},
103+
{.name = "\\", .scancode = BSP_INPUT_SCANCODE_BACKSLASH, .pressed = false, .was_pressed = false, .changed = true},
103104
{.name = "S", .scancode = BSP_INPUT_SCANCODE_SPACE, .pressed = false, .was_pressed = false, .changed = true},
104105
{.name = "P", .scancode = BSP_INPUT_SCANCODE_SPACE, .pressed = false, .was_pressed = false, .changed = true},
105106
{.name = "A", .scancode = BSP_INPUT_SCANCODE_SPACE, .pressed = false, .was_pressed = false, .changed = true},
106107
{.name = "C", .scancode = BSP_INPUT_SCANCODE_SPACE, .pressed = false, .was_pressed = false, .changed = true},
107108
{.name = "E", .scancode = BSP_INPUT_SCANCODE_SPACE, .pressed = false, .was_pressed = false, .changed = true},
108-
{.name = "\\", .scancode = BSP_INPUT_SCANCODE_BACKSLASH, .pressed = false, .was_pressed = false, .changed = true},
109109
{.name = "ALTGR",
110110
.scancode = BSP_INPUT_SCANCODE_ESCAPED_RALT,
111111
.pressed = false,

main/idf_component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ dependencies:
22
idf:
33
version: ">=5.5.0"
44
badgeteam/badge-bsp:
5-
version: ">=0.5.1"
5+
version: ">=0.6.0"
66
robotman2412/pax-gfx:
77
version: ">=2.0.4"
88
badgeteam/appfs:

main/main.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,14 @@ void app_main(void) {
219219
ESP_ERROR_CHECK(res);
220220

221221
// Initialize the Board Support Package
222-
esp_err_t bsp_init_result = bsp_device_initialize();
222+
const bsp_configuration_t bsp_configuration = {
223+
.display =
224+
{
225+
.requested_color_format = LCD_COLOR_PIXEL_FORMAT_RGB565,
226+
.num_fbs = 1,
227+
},
228+
};
229+
esp_err_t bsp_init_result = bsp_device_initialize(&bsp_configuration);
223230

224231
if (bsp_init_result == ESP_OK) {
225232
ESP_ERROR_CHECK(bsp_input_get_queue(&input_event_queue));

0 commit comments

Comments
 (0)