From 4ead38b31e7564b3d8957843ef61bc2a63376f1f Mon Sep 17 00:00:00 2001
From: Andrew Dunai <a@dun.ai>
Date: Sun, 3 Mar 2024 15:25:17 +0200
Subject: [PATCH] lib: increase SD card SPI clock speed to 10 MHz (was 1 MHz)
 lib: fix incorrect pressed states in controller handlers

---
 sdk/lib/lilka/src/lilka/controller.cpp | 2 +-
 sdk/lib/lilka/src/lilka/sdcard.cpp     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sdk/lib/lilka/src/lilka/controller.cpp b/sdk/lib/lilka/src/lilka/controller.cpp
index ac141ea8..ba3d1cc5 100644
--- a/sdk/lib/lilka/src/lilka/controller.cpp
+++ b/sdk/lib/lilka/src/lilka/controller.cpp
@@ -39,6 +39,7 @@ void Controller::inputTask(void *arg) {
             if (pressed != state->pressed) {
                 state->justPressed = pressed;
                 state->justReleased = !pressed;
+                state->pressed = pressed;
                 if (self->handlers[i] != NULL) {
                     self->handlers[i](state->pressed);
                 }
@@ -46,7 +47,6 @@ void Controller::inputTask(void *arg) {
                     self->globalHandler((Button)i, state->pressed);
                 }
             }
-            state->pressed = pressed;
             state->time = millis();
         }
         xSemaphoreGive(self->semaphore);
diff --git a/sdk/lib/lilka/src/lilka/sdcard.cpp b/sdk/lib/lilka/src/lilka/sdcard.cpp
index 56d982f5..04b9fb00 100644
--- a/sdk/lib/lilka/src/lilka/sdcard.cpp
+++ b/sdk/lib/lilka/src/lilka/sdcard.cpp
@@ -17,7 +17,7 @@ void SDCard::begin() {
 #if LILKA_SDCARD_CS < 0
     serial_err("SD init failed: no CS pin");
 #else
-    fs->begin(LILKA_SDCARD_CS, SPI1, 1000000, LILKA_SDROOT);
+    fs->begin(LILKA_SDCARD_CS, SPI1, 10000000, LILKA_SDROOT); // TODO: is 10 MHz OK for all cards?
     sdcard_type_t cardType = fs->cardType();
 
     if (cardType == CARD_NONE) {