diff --git a/kernel/jessy_os.cpp b/kernel/jessy_os.cpp index a5e2e76..322b168 100644 --- a/kernel/jessy_os.cpp +++ b/kernel/jessy_os.cpp @@ -21,17 +21,23 @@ #include #include -static fabgl::ILI9341Controller DisplayController; +static fabgl::VGATextController DisplayController; static fabgl::PS2Controller PS2Controller; static fabgl::Terminal Terminal; +ArduinoNvs NvsStorage; SPIClass sdSpi(HSPI); void JessyOS::initDevices() { PS2Controller.begin(PS2Preset::KeyboardPort0); - DisplayController.begin(TFT_SCK, TFT_MOSI, TFT_DC, TFT_RESET, TFT_CS, TFT_SPIBUS); - DisplayController.setResolution("\"TFT_320x240\" 320 240"); + // Put these lines to comment for ILI9341 version + DisplayController.begin(); + DisplayController.setResolution(); + + // Uncomment these lines for ILI9341 version + // DisplayController.begin(TFT_SCK, TFT_MOSI, TFT_DC, TFT_RESET, TFT_CS, TFT_SPIBUS); + // DisplayController.setResolution("\"TFT_320x240\" 320 240"); } void JessyOS::initTerminal() { @@ -65,7 +71,16 @@ void JessyOS::initPSRAM() { } void JessyOS::startVM(RishkaVM* vm) { - vm->initialize(&Terminal, &DisplayController); + if(!NvsStorage.begin()) { + Terminal.println("Unable to \e[94initialize\e[97m non-volatile storage."); + return; + } + + vm->initialize( + &Terminal, + &DisplayController, + &NvsStorage + ); Terminal.onVirtualKeyItem = [&](VirtualKeyItem * vkItem) { if(vkItem->CTRL && vkItem->vk == VirtualKey::VK_c && vm->isRunning()) { @@ -102,4 +117,4 @@ String JessyOS::readLine() { line.edit(); return String(line.get()); -} \ No newline at end of file +} diff --git a/kernel/jessy_os_configs.h b/kernel/jessy_os_configs.h index 227af8b..c2bb167 100644 --- a/kernel/jessy_os_configs.h +++ b/kernel/jessy_os_configs.h @@ -27,9 +27,9 @@ #define TFT_RESET 4 // TFT reset pin #define TFT_SPIBUS VSPI_HOST // TFT SPI bus -#define SD_CS 2 // SD card chip select pin +#define SD_CS 13 // SD card chip select pin (2 for ILI9341 version) #define SD_SCK 14 // SD card SPI clock pin -#define SD_MOSI 13 // SD card SPI MOSI pin -#define SD_MISO 12 // SD card SPI MISO pin +#define SD_MOSI 12 // SD card SPI MOSI pin (13 for ILI9341 version) +#define SD_MISO 35 // SD card SPI MISO pin (12 for ILI9341 version) -#endif \ No newline at end of file +#endif