From c3ce551769772a34e8b40c1ed864a010bcaaa89a Mon Sep 17 00:00:00 2001 From: Sylvain Munaut Date: Sat, 28 May 2022 19:21:06 +0200 Subject: [PATCH 1/2] fpga_download: Remove debug messages Those are left over and can't even be uncommented (causes compilation to fail). Signed-off-by: Sylvain Munaut --- main/fpga_download.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/main/fpga_download.c b/main/fpga_download.c index c3dc076..dac5b54 100644 --- a/main/fpga_download.c +++ b/main/fpga_download.c @@ -66,8 +66,6 @@ esp_err_t fpga_process_events(xQueueHandle buttonQueue, ICE40* ice40, uint16_t * while (xQueueReceive(buttonQueue, &buttonMessage, 0) == pdTRUE) { uint8_t pin = buttonMessage.input; bool value = buttonMessage.state; - //snprintf(message, sizeof(message), "button %d %d\n", pin, value); - //fpga_uart_mess(message); uint16_t key_mask = 0; switch(pin) { case RP2040_INPUT_JOYSTICK_DOWN: @@ -113,8 +111,6 @@ esp_err_t fpga_process_events(xQueueHandle buttonQueue, ICE40* ice40, uint16_t * else { *key_state &= ~key_mask; } - //snprintf(message, sizeof(message), "send %04X %04X\n", key_state, key_mask); - //fpga_uart_mess(message); uint8_t spi_message[5] = { 0xf4 }; spi_message[1] = *key_state & 0xff; From db3d5365aa78ce818d76b28bf96bc465ac7ddfbb Mon Sep 17 00:00:00 2001 From: Sylvain Munaut Date: Sat, 28 May 2022 19:21:57 +0200 Subject: [PATCH 2/2] fpga_download: Fix endianness of key report SPI messages SPI uses big endian conventionally. Signed-off-by: Sylvain Munaut --- main/fpga_download.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/main/fpga_download.c b/main/fpga_download.c index dac5b54..7a0550f 100644 --- a/main/fpga_download.c +++ b/main/fpga_download.c @@ -113,10 +113,10 @@ esp_err_t fpga_process_events(xQueueHandle buttonQueue, ICE40* ice40, uint16_t * } uint8_t spi_message[5] = { 0xf4 }; - spi_message[1] = *key_state & 0xff; - spi_message[2] = *key_state >> 8; - spi_message[3] = key_mask & 0xff; - spi_message[4] = key_mask >> 8; + spi_message[1] = *key_state >> 8; + spi_message[2] = *key_state & 0xff; + spi_message[3] = key_mask >> 8; + spi_message[4] = key_mask & 0xff; esp_err_t res = ice40_send(ice40, spi_message, 5); if (res != ESP_OK) { return res;