resiX/M5Cardputer-C64-Emulator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: resiX:M5Stick-Launcher_patch
Branches Tags
resiX:M5Stick-Launcher_patch
resiX:original
..
compare: resiX:original
Branches Tags
resiX:M5Stick-Launcher_patch
resiX:original

No commits in common. "M5Stick-Launcher_patch" and "original" have entirely different histories.
M5Stick-La ... original

5 changed files with 4 additions and 6 deletions
Show stats Expand all files Collapse all files

2
src/sd.cpp
View file

@ -347,7 +347,7 @@ start:
}
case 1:
{
auto path = loopSD(SD);
auto path = loopSD(SD_MMC);
if (path.equals(""))
{
redraw = true;

1
src/sd.hpp
View file

@ -1,7 +1,6 @@
#pragma once
#include <FS.h>
#include <SD.h>
#include <SD_MMC.h>
#define MAXFILES 256

2
src/t-hmi-c64/C64.cpp
View file

@ -303,7 +303,7 @@ void loadFile(void *parameter)
}
else if (ext.compare(".prg") == 0)
{
uint16_t addr = sdcard.loadFile(SD, path.c_str(), ram);
uint16_t addr = sdcard.loadFile(SD_MMC, path.c_str(), ram);
if (sdcard.loadAddr == 0)
{
ESP_LOGI(TAG, "error loading file");

4
src/t-hmi-c64/SDCard.cpp
View file

@ -36,8 +36,8 @@ bool SDCard::init()
vTaskDelay(500 / portTICK_PERIOD_MS);
pinMode(PWR_EN_PIN, OUTPUT);
digitalWrite(PWR_EN_PIN, HIGH);
SPI.begin(SD_SCLK_PIN, SD_MISO_PIN, SD_MOSI_PIN);
bool rlst = SD.begin(PWR_EN_PIN, SPI, 4000000, "/sdcard", 5, false);
SD_MMC.setPins(SD_SCLK_PIN, SD_MOSI_PIN, SD_MISO_PIN);
bool rlst = SD_MMC.begin("/sdcard", true);
if (!rlst)
{
return false;

1
src/t-hmi-c64/SDCard.h
View file

@ -18,7 +18,6 @@
#pragma once
#include <FS.h>
#include <SD.h>
#include <SD_MMC.h>
#include <cstdint>