From c831562a7cf09cf7296facd926b527b65aaf5919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= Date: Fri, 14 Feb 2020 18:10:38 +0100 Subject: [PATCH] did an oupsie --- sources/PPU/PPU.cpp | 4 ++-- tests/PPU/testPpuWrite.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sources/PPU/PPU.cpp b/sources/PPU/PPU.cpp index 49adcf5..9a9a18c 100644 --- a/sources/PPU/PPU.cpp +++ b/sources/PPU/PPU.cpp @@ -206,7 +206,7 @@ namespace ComSquare::PPU int inc = 0; //uint32_t pixelTmp = 0xFFFFFFFF; //pixelTmp |= this->_inidisp.brightness; - std::cout << "update" << std::endl; + //std::cout << "update" << std::endl; if (!this->_inidisp.fblank) { for (int x = 0; x < 448; x++) { for (int y = 0; y < 512; y++) { @@ -217,7 +217,7 @@ namespace ComSquare::PPU } } } - std::cout << "cgadata2" << std::endl; + //std::cout << "cgadata2" << std::endl; this->_renderer.drawScreen(); } diff --git a/tests/PPU/testPpuWrite.cpp b/tests/PPU/testPpuWrite.cpp index 27e3b00..926771d 100644 --- a/tests/PPU/testPpuWrite.cpp +++ b/tests/PPU/testPpuWrite.cpp @@ -57,7 +57,7 @@ Test(PPU_write, obsel_111_object_size_and_all_null) pair.first->write(0x2101, 0b11100000); cr_assert_eq(pair.second.ppu->_obsel.objectSize, 0b111); cr_assert_eq(pair.second.ppu->_obsel.nameSelect, 0b00); - cr_assert_eq(pair.second.ppu->_obsel.baseSelect, 0b000); + cr_assert_eq(pair.second.ppu->_obsel.nameBaseSelect, 0b000); } Test(PPU_write, obsel_data_full) @@ -66,7 +66,7 @@ Test(PPU_write, obsel_data_full) pair.first->write(0x2101, 0b11111111); cr_assert_eq(pair.second.ppu->_obsel.objectSize, 0b111); cr_assert_eq(pair.second.ppu->_obsel.nameSelect, 0b11); - cr_assert_eq(pair.second.ppu->_obsel.baseSelect, 0b111); + cr_assert_eq(pair.second.ppu->_obsel.nameBaseSelect, 0b111); } Test(PPU_write, obsel_data_full_nameselect) @@ -75,7 +75,7 @@ Test(PPU_write, obsel_data_full_nameselect) pair.first->write(0x2101, 0b00011000); cr_assert_eq(pair.second.ppu->_obsel.objectSize, 0b000); cr_assert_eq(pair.second.ppu->_obsel.nameSelect, 0b11); - cr_assert_eq(pair.second.ppu->_obsel.baseSelect, 0b000); + cr_assert_eq(pair.second.ppu->_obsel.nameBaseSelect, 0b000); } Test(PPU_write, obsel_data_full_baseselect) @@ -84,7 +84,7 @@ Test(PPU_write, obsel_data_full_baseselect) pair.first->write(0x2101, 0b00000111); cr_assert_eq(pair.second.ppu->_obsel.objectSize, 0b000); cr_assert_eq(pair.second.ppu->_obsel.nameSelect, 0b00); - cr_assert_eq(pair.second.ppu->_obsel.baseSelect, 0b111); + cr_assert_eq(pair.second.ppu->_obsel.nameBaseSelect, 0b111); } Test(PPU_write, oamaddl_data_full)