keira: fix v1 regressions

lib: fix v1 regressions lib: fix FreeRTOS includes not working for C3
and3rson · Mar 17, 2024 · 0ba0f1a · 0ba0f1a
1 parent 61c00e5
commit 0ba0f1a
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 16 deletions.
diff --git a/firmware/keira/legacy/v1_partitions.csv b/firmware/keira/legacy/v1_partitions.csv
@@ -0,0 +1,8 @@
+# Таблиця розділів для Лілки 1.0
+# (В ній лише 4 МБ флеш-пам'яті, тому app1 відсутній, і, як наслідок, OTA не підтримується)
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x5000,
+otadata,  data, ota,     0xe000,  0x2000,
+app0,     app,  ota_0,   0x10000, 0x280000,
+spiffs,   data, spiffs,  0x290000,0x160000,
+coredump, data, coredump,0x3F0000,0x10000,
diff --git a/firmware/keira/platformio.ini b/firmware/keira/platformio.ini
@@ -1,12 +1,5 @@
-; PlatformIO Project Configuration File
-;
-;   Build options: build flags, source filter
-;   Upload options: custom upload port, speed and extra flags
-;   Library options: dependencies, extra library storages
-;   Advanced options: extra scripting
-;
-; Please visit documentation for the other options and examples
-; https://docs.platformio.org/page/projectconf.html
+; Це - конфігураційний файл PlatformIO. Він використовується для налаштування проєкту та його залежностей.
+; Докладніше про конфігурацію PlatformIO можна прочитати тут: https://docs.platformio.org/en/latest/projectconf/index.html
 
 [platformio]
 boards_dir = ../../sdk/boards
@@ -21,6 +14,7 @@ lib_deps =
     mischief/lua @ ^0.1.1
 	https://github.com/moononournation/arduino-nofrendo.git
 build_flags = -D LILKA_VERSION=1
+board_build.partitions = ./legacy/v1_partitions.csv
 
 [env:v2]
 platform = espressif32
@@ -30,6 +24,3 @@ lib_deps =
     lilka
     mischief/lua @ ^0.1.1
 	https://github.com/moononournation/arduino-nofrendo.git
-; Define LILKA_BREADBOARD to lower SPI speed to 40 MHz (instead of normal 80)
-; TODO: Remove this when we have PCBs!
-; build_flags = -D LILKA_BREADBOARD
diff --git a/firmware/keira/src/apps/demos/scan_i2c.cpp b/firmware/keira/src/apps/demos/scan_i2c.cpp
@@ -7,6 +7,7 @@ ScanI2CApp::ScanI2CApp() : App("I2C Scanner") {
 }
 
 void ScanI2CApp::run() {
+#if LILKA_VERSION >= 2
     lilka::Canvas buffer(canvas->width(), canvas->height());
     buffer.begin();
     buffer.fillScreen(0);
@@ -47,4 +48,12 @@ void ScanI2CApp::run() {
     while (!lilka::controller.getState().a.justPressed) {
         taskYIELD();
     }
+#else
+    lilka::Alert alert("Помилка", "Ця програма потребує Лілку версії 2 або вище.");
+    alert.draw(canvas);
+    queueDraw();
+    while (!alert.isDone()) {
+        alert.update();
+    }
+#endif
 }
diff --git a/firmware/keira/src/apps/launcher.cpp b/firmware/keira/src/apps/launcher.cpp
@@ -237,6 +237,14 @@ void LauncherApp::selectFile(String path) {
     if (path.endsWith(".rom") || path.endsWith(".nes")) {
         AppManager::getInstance()->runApp(new NesApp(path));
     } else if (path.endsWith(".bin")) {
+#if LILKA_VERSION < 2
+        lilka::Alert alert("Помилка", "Ця операція потребує Лілку 2.0");
+        alert.draw(canvas);
+        queueDraw();
+        while (!alert.isDone()) {
+            alert.update();
+        }
+#else
         int error;
         error = lilka::multiboot.start(path);
         if (error) {
@@ -267,6 +275,7 @@ void LauncherApp::selectFile(String path) {
             alert("Помилка", String("Етап: 3\nКод: ") + error);
             return;
         }
+#endif
     } else if (path.endsWith(".lua")) {
         AppManager::getInstance()->runApp(new LuaFileRunnerApp(path));
     } else if (path.endsWith(".js")) {

diff --git a/firmware/keira/src/apps/nes/osd.cpp b/firmware/keira/src/apps/nes/osd.cpp
@@ -1,7 +1,7 @@
 #include <esp_heap_caps.h>
 #include <lilka.h>
 
-#include <FreeRTOS.h>
+#include <freertos/FreeRTOS.h>
 #include <freertos/timers.h>
 
 #include "driver.h"

diff --git a/sdk/lib/lilka/platformio.ini b/sdk/lib/lilka/platformio.ini
@@ -1,6 +1,15 @@
 [platformio]
 boards_dir = ../../boards
 
+[env:v1]
+platform = espressif32
+board = adafruit_qtpy_esp32c3
+framework = arduino
+lib_deps =
+    moononournation/GFX Library for Arduino@^1.4.5
+	olikraus/U8g2@^2.35.9
+build_flags = -D LILKA_VERSION=1
+
 [env:v2]
 platform = espressif32
 board = lilka_v2

diff --git a/sdk/lib/lilka/src/lilka/buzzer.cpp b/sdk/lib/lilka/src/lilka/buzzer.cpp
@@ -71,6 +71,9 @@ void Buzzer::playMelody(const Tone* melody, uint32_t length, uint32_t tempo) {
 
 void Buzzer::melodyTask(void* arg) {
     Buzzer* buzzer = static_cast<Buzzer*>(arg);
+#if LILKA_VERSION < 2
+    serial_err("Buzzer is not supported on this board");
+#else
     // Serial.println("Melody task started");
     for (uint32_t i = 0; i < buzzer->currentMelodyLength; i++) {
         // Serial.println("Playing note " + String(i) + " with frequency " + String(buzzer->currentMelody[i].frequency));
@@ -91,8 +94,11 @@ void Buzzer::melodyTask(void* arg) {
         xSemaphoreGive(buzzer->buzzerMutex);
         vTaskDelay(duration / portTICK_PERIOD_MS);
     }
+#endif
     xSemaphoreTake(buzzer->buzzerMutex, portMAX_DELAY);
+#if LILKA_VERSION >= 2
     noTone(LILKA_BUZZER);
+#endif
     // Release the mutex & delete task.
     buzzer->melodyTaskHandle = NULL;
     xSemaphoreGive(buzzer->buzzerMutex);
@@ -110,7 +116,9 @@ void Buzzer::stop() {
 }
 
 void Buzzer::_stop() {
+#if LILKA_VERSION >= 2
     noTone(LILKA_BUZZER);
+#endif
     TaskHandle_t handle = melodyTaskHandle;
     if (handle != NULL) {
         melodyTaskHandle = NULL;

diff --git a/sdk/lib/lilka/src/lilka/buzzer.h b/sdk/lib/lilka/src/lilka/buzzer.h
@@ -2,7 +2,7 @@
 #define LILKA_BUZZER_H
 
 #include <stdint.h>
-#include <FreeRTOS.h>
+#include <freertos/FreeRTOS.h>
 #include <freertos/task.h>
 #include <freertos/semphr.h>
 

diff --git a/sdk/lib/lilka/src/lilka/controller.h b/sdk/lib/lilka/src/lilka/controller.h
@@ -4,8 +4,8 @@
 #include "config.h"
 
 #include <stdint.h>
-#include <FreeRTOS.h>
-#include <semphr.h>
+#include <freertos/FreeRTOS.h>
+#include <freertos/semphr.h>
 
 namespace lilka {