added more robust SD-card support + changed a vga pin

jaleck0 · Jan 6, 2025 · 7def04e · 7def04e
1 parent 13f5cfc
commit 7def04e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/Core/src/OS/CluaShell.c b/Core/src/OS/CluaShell.c
@@ -33,17 +33,21 @@ void InitShell()
     // Initialize SD card
     if (!sd_init_driver()) 
     {
-        TerminalPutString("ERROR: Could not initialize SD card\r\n");
+        TerminalPutString("ERROR: could not initialize sd-card\r\n> ");
         //while (true);
     }
 
     // Mount drive
     fr = f_mount(&fs, "0:", 1);
     if (fr != FR_OK) 
     {
-        TerminalPutString("ERROR: Could not mount filesystem \r\n");
+        TerminalPutString("ERROR: could not mount filesystem \r\n> ");
         //while (true);
     }
+    else
+    {
+        TerminalPutString("sd-card has been found\r\n> ");
+    }
 }
 
 void StartShell()

diff --git a/Core/src/OS/Commands.c b/Core/src/OS/Commands.c
@@ -454,17 +454,18 @@ static int l_loadfilesd(lua_State* L)
     //FIL fil;
     //int ret;
 
+
     fr = f_open(&fil, filename, FA_READ);
     if (fr != FR_OK) {
-        TerminalPutString("ERROR: Could not open file \r\n");
+        TerminalPutString("ERROR: could not open file \r\n");
         //while (true);
     }
 
 
     file[0] = '\0';
     file[1] = '\0';
 
-    TerminalPutString("Loading ");
+    TerminalPutString("loading ");
     TerminalPutString(filename);
     TerminalPutString(" into the text editor\r\n");
 

diff --git a/Core/src/scanvideo/scanvideo.h b/Core/src/scanvideo/scanvideo.h
@@ -22,11 +22,11 @@
 #endif
 
 #ifndef PICO_SCANVIDEO_DPI_PIXEL_RSHIFT
-#define PICO_SCANVIDEO_DPI_PIXEL_RSHIFT 1u
+#define PICO_SCANVIDEO_DPI_PIXEL_RSHIFT 0u
 #endif
 
 #ifndef PICO_SCANVIDEO_DPI_PIXEL_GSHIFT
-#define PICO_SCANVIDEO_DPI_PIXEL_GSHIFT 6u
+#define PICO_SCANVIDEO_DPI_PIXEL_GSHIFT 5u
 #endif
 
 #ifndef PICO_SCANVIDEO_DPI_PIXEL_BSHIFT

diff --git a/Core/src/sd/sd_driver/spi.h b/Core/src/sd/sd_driver/spi.h
@@ -56,7 +56,7 @@ extern "C" {
 }
 #endif
 
-#define USE_LED 1
+#define USE_LED 0
 #if USE_LED
 #   define LED_PIN 25
 #   include "hardware/gpio.h"