diff --git a/qtBuildSystem/Mu/mainwindow.cpp b/qtBuildSystem/Mu/mainwindow.cpp index 0f1b418..a21eb6d 100644 --- a/qtBuildSystem/Mu/mainwindow.cpp +++ b/qtBuildSystem/Mu/mainwindow.cpp @@ -11,6 +11,7 @@ #include #include +#include #include #include #include @@ -23,9 +24,10 @@ uint32_t screenHeight; static QImage video; static QTimer* refreshDisplay; static QSettings settings; +std::mutex emuMutex; static std::atomic emuOn; -static std::atomic emuLock; -static bool emuInited; +static std::atomic emuInited; +static uint8_t romBuffer[ROM_SIZE]; void popupErrorDialog(std::string error){ @@ -84,13 +86,14 @@ MainWindow::MainWindow(QWidget* parent) : ui(new Ui::MainWindow){ ui->setupUi(this); emuOn = false; - emuLock = false; emuInited = false; screenWidth = 160; - screenHeight = 160; + screenHeight = 160 + 60; loadRom(); + ui->ctrlBtn->setText("Start"); + refreshDisplay = new QTimer(this); connect(refreshDisplay, SIGNAL(timeout()), this, SLOT(updateDisplay())); //update display every 16.67 miliseconds = 60*second @@ -98,8 +101,9 @@ MainWindow::MainWindow(QWidget* parent) : } MainWindow::~MainWindow(){ - while(emuLock)usleep(10); + emuMutex.lock(); emulatorExit(); + emuMutex.unlock(); delete ui; } @@ -117,7 +121,7 @@ void MainWindow::loadRom(){ uint8_t* romData = getFileBuffer(rom, size, error); if(romData){ size_t romSize = size < ROM_SIZE ? size : ROM_SIZE; - memcpy(palmRom, romData, romSize); + memcpy(romBuffer, romData, romSize); delete[] romData; } @@ -160,13 +164,14 @@ void MainWindow::on_install_pressed(){ //display void MainWindow::updateDisplay(){ - if(emuOn && !emuLock){ - emuLock = true; - emulateFrame(); - video = QImage((unsigned char*)palmFramebuffer, screenWidth, screenHeight, QImage::Format_RGB16);//16 bit - ui->display->setPixmap(QPixmap::fromImage(video).scaled(ui->display->size(), Qt::KeepAspectRatio, Qt::SmoothTransformation)); - ui->display->update(); - emuLock = false; + if(emuOn){ + if(emuMutex.try_lock()){ + emulateFrame(); + video = QImage((unsigned char*)palmFramebuffer, screenWidth, screenHeight, QImage::Format_RGB16);//16 bit + ui->display->setPixmap(QPixmap::fromImage(video).scaled(ui->display->size(), Qt::KeepAspectRatio, Qt::SmoothTransformation)); + ui->display->update(); + emuMutex.unlock(); + } } } @@ -243,3 +248,25 @@ void MainWindow::on_joyRight_clicked(){ void MainWindow::on_settings_clicked(){ //setprocess(SETUP); } + +//emu control +void MainWindow::on_ctrlBtn_clicked() +{ + emuMutex.lock(); + if(!emuOn && !emuInited){ + //start emu + emulatorInit(romBuffer, ACCURATE); + emuInited = true; + emuOn = true; + ui->ctrlBtn->setText("Pause"); + } + else if(emuOn){ + emuOn = false; + ui->ctrlBtn->setText("Resume"); + } + else if(!emuOn){ + emuOn = true; + ui->ctrlBtn->setText("Pause"); + } + emuMutex.unlock(); +} diff --git a/qtBuildSystem/Mu/mainwindow.h b/qtBuildSystem/Mu/mainwindow.h index 72214f2..957618f 100644 --- a/qtBuildSystem/Mu/mainwindow.h +++ b/qtBuildSystem/Mu/mainwindow.h @@ -60,6 +60,8 @@ private slots: void on_joyRight_clicked(); void on_settings_clicked(); + void on_ctrlBtn_clicked(); + private: Ui::MainWindow *ui; }; diff --git a/qtBuildSystem/Mu/mainwindow.ui b/qtBuildSystem/Mu/mainwindow.ui index a50cf32..a5d6e64 100644 --- a/qtBuildSystem/Mu/mainwindow.ui +++ b/qtBuildSystem/Mu/mainwindow.ui @@ -85,7 +85,7 @@ - 1 + 0 @@ -277,7 +277,7 @@ - + @@ -290,6 +290,19 @@ + + + + + 0 + 0 + + + + ctrl_btn + + + diff --git a/src/emulator.c b/src/emulator.c index 006cb67..2aed4dd 100644 --- a/src/emulator.c +++ b/src/emulator.c @@ -321,5 +321,5 @@ void emulateFrame(){ } palmCycleCounter -= CPU_FREQUENCY / EMU_FPS; - printf("Ran frame, executed %f cycles.\n", palmCycleCounter + CPU_FREQUENCY / EMU_FPS); + //printf("Ran frame, executed %f cycles.\n", palmCycleCounter + CPU_FREQUENCY / EMU_FPS); } diff --git a/src/sed1376.c b/src/sed1376.c index 47dc87a..433535e 100644 --- a/src/sed1376.c +++ b/src/sed1376.c @@ -20,7 +20,7 @@ //The LCD power-off sequence is activated by programming the Power Save Mode Enable bit (REG[A0h] bit 0) to 1. uint8_t sed1376Registers[SED1376_REG_SIZE]; -uint8_t sed1376Framebuffer[SED1376_FB_SIZE]; +uint8_t sed1376Framebuffer[SED1376_FB_SIZE + 3];//+ 3 to prevent 32 bit writes on last byte from corrupting memory unsigned int sed1376GetRegister(unsigned int address){ @@ -49,6 +49,6 @@ void sed1376Render(){ } else{ - + //black screen } }