emul/pico-zxspectrum
emul/pico-zxspectrum
1
0
Fork 0
mirror of https://github.com/fruit-bat/pico-zxspectrum.git synced 2025-04-19 00:04:01 +03:00
Code

MURMULATOR2

Browse Source
This commit is contained in:
Phil 2024-12-16 17:18:21 +00:00
parent 860ec12aaf
commit 10937f5fbd
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ZxSpectrumMenu.cpp
View File

@ -158,7 +158,7 @@ ZxSpectrumMenu::ZxSpectrumMenu(
bool k2 = _zxSpectrum->keyboard2() && _zxSpectrum->keyboard2()->isMounted();
bool m = _zxSpectrum->mouse() && _zxSpectrum->mouse()->isMounted();
const float v = read_voltage_sensor();
pen->printAtF(0, 0, false,"USB: joy %s%s%s, kbd %s%s%s, mice %s VSYS: %3.1fv",
pen->printAtF(0, 0, false,"USB: joy %s%s%s, kbd %s%s%s, mice %s, VSYS: %3.1fv",
(jl ? "L" : ""), (!jl && !jr ? "0" : (!!jl & !!jr ? "&" : "")), (jr ? "R" : ""),
(k1 ? "1" : ""), (!k1 && !k2 ? "0" : (k1 & k2 ? "&" : "")), (k2 ? "2" : ""),
(m ? "1" : "0"),

8
src/vga/CMakeLists.txt
View File

@ -225,6 +225,10 @@ foreach(target
${zxspectrum_audio_i2s_pio}
)
pico_generate_pio_header(${target}
${zxspectrum_pwm_pio}
)
pico_enable_stdio_usb(${target} 0)
# create map/bin/hex file etc.
@ -255,7 +259,7 @@ target_compile_definitions(ZxSpectrumPicoMiteVGA_640x480x60Hz PRIVATE
# ZX MURMULATOR
#========================================================
set(ZX-MURMULATOR_VGA_defines
ZX_PLATFORM=MURMULATOR
ZX_PLATFORM="MURMULATOR"
# Configure the SPI sd card to use SPI0
SDCARD_PIN_SPI0_CS=5
SDCARD_PIN_SPI0_SCK=2
@ -348,7 +352,7 @@ target_compile_definitions(ZX-MURMULATOR_VGA_I2S_AUDIO_720x576x50Hz PRIVATE
# ZX MURMULATOR2
#========================================================
set(ZX-MURMULATOR2_VGA_defines
ZX_PLATFORM=MURMULATOR2
ZX_PLATFORM="MURMULATOR2"
# Configure the SPI sd card to use SPI0
SDCARD_PIN_SPI0_CS=5
SDCARD_PIN_SPI0_SCK=6