ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added 'Get Tape Status' keybinding - fires an OSD message with state info about the current tape

This commit is contained in:
Asnivor 2018-03-12 14:37:45 +00:00
parent ccb5947ade
commit deba6b18b8
6 changed files with 145 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/defctrl.json
View File

@ -532,7 +532,8 @@
"Insert Next Tape": "F6", "Insert Next Tape": "F6",
"Insert Previous Tape": "F5", "Insert Previous Tape": "F5",
"Next Tape Block": "F8", "Next Tape Block": "F8",
"Prev Tape Block": "F7" "Prev Tape Block": "F7",
"Get Tape Status": "F10"
}, },
"Intellivision Controller": { "Intellivision Controller": {
"P1 Up": "UpArrow, J1 POV1U, X1 DpadUp, X1 LStickUp", "P1 Up": "UpArrow, J1 POV1U, X1 DpadUp, X1 LStickUp",

123
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Hardware/Datacorder/DatacorderDevice.cs
View File

@ -137,8 +137,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
/// </summary> /// </summary>
public const ushort ERROR_ROM_ADDRESS = 0x0008; public const ushort ERROR_ROM_ADDRESS = 0x0008;
Stopwatch sw = new Stopwatch();
/// <summary> /// <summary>
/// Should be fired at the end of every frame /// Should be fired at the end of every frame
/// Primary purpose is to detect tape traps and manage auto play (if/when this is ever implemented) /// Primary purpose is to detect tape traps and manage auto play (if/when this is ever implemented)
@ -373,6 +371,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
// decide how many cycles worth of data we are capturing // decide how many cycles worth of data we are capturing
long cycles = cpuCycle - _lastCycle; long cycles = cpuCycle - _lastCycle;
bool is48k = _machine.IsIn48kMode();
// check whether tape is actually playing // check whether tape is actually playing
if (_tapeIsPlaying == false) if (_tapeIsPlaying == false)
{ {
@ -398,11 +398,11 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
// flip the current state // flip the current state
currentState = !currentState; currentState = !currentState;
if (_position == 0) if (_position == 0 && _tapeIsPlaying)
{ {
// start of block // start of block
// notify about the current block
// notify about the current block
var bl = _dataBlocks[_currentDataBlockIndex]; var bl = _dataBlocks[_currentDataBlockIndex];
StringBuilder sbd = new StringBuilder(); StringBuilder sbd = new StringBuilder();
@ -427,47 +427,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
{ {
// we have reached the end of the current block // we have reached the end of the current block
// check for any commands
var command = _dataBlocks[_currentDataBlockIndex].Command;
var block = _dataBlocks[_currentDataBlockIndex];
switch (command)
{
// Stop the tape command found - if this is the end of the tape RTZ
// otherwise just STOP and move to the next block
case TapeCommand.STOP_THE_TAPE:
_machine.Spectrum.OSD_TapeStoppedAuto();
if (_currentDataBlockIndex >= _dataBlocks.Count())
RTZ();
else
{
Stop();
}
break;
case TapeCommand.STOP_THE_TAPE_48K:
if ((_machine.GetType() != typeof(ZX128) &&
_machine.GetType() != typeof(ZX128Plus2) &&
_machine.GetType() != typeof(ZX128Plus3)) ||
(_machine.GetType() == typeof(ZX128) ||
_machine.GetType() != typeof(ZX128Plus2) ||
_machine.GetType() != typeof(ZX128Plus3)) &&
_machine._ROMpaged == 1)
{
_machine.Spectrum.OSD_TapeStoppedAuto();
if (_currentDataBlockIndex >= _dataBlocks.Count())
RTZ();
else
{
Stop();
}
}
break;
}
if (_dataBlocks[_currentDataBlockIndex].DataPeriods.Count() == 0) if (_dataBlocks[_currentDataBlockIndex].DataPeriods.Count() == 0)
{ {
// notify about the current block (we are skipping it because its empty) // notify about the current block (we are skipping it because its empty)
@ -487,11 +446,77 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
} }
// skip any empty blocks // skip any empty blocks (and process any command blocks)
while (_position >= _dataBlocks[_currentDataBlockIndex].DataPeriods.Count()) while (_position >= _dataBlocks[_currentDataBlockIndex].DataPeriods.Count())
{ {
// check for any commands
var command = _dataBlocks[_currentDataBlockIndex].Command;
var block = _dataBlocks[_currentDataBlockIndex];
bool shouldStop = false;
switch (command)
{
// Stop the tape command found - if this is the end of the tape RTZ
// otherwise just STOP and move to the next block
case TapeCommand.STOP_THE_TAPE:
_machine.Spectrum.OSD_TapeStoppedAuto();
if (_currentDataBlockIndex >= _dataBlocks.Count())
RTZ();
else
{
Stop();
}
_monitorTimeOut = 2000;
break;
case TapeCommand.STOP_THE_TAPE_48K:
if (is48k)
{
_machine.Spectrum.OSD_TapeStoppedAuto();
if (_currentDataBlockIndex >= _dataBlocks.Count())
RTZ();
else
{
Stop();
}
_monitorTimeOut = 2000;
}
/*
if ((_machine.GetType() != typeof(ZX128) &&
_machine.GetType() != typeof(ZX128Plus2) &&
_machine.GetType() != typeof(ZX128Plus3)) ||
(_machine.GetType() == typeof(ZX128) ||
_machine.GetType() != typeof(ZX128Plus2) ||
_machine.GetType() != typeof(ZX128Plus3)) &&
_machine._ROMpaged == 1)
{
_machine.Spectrum.OSD_TapeStoppedAuto();
if (_currentDataBlockIndex >= _dataBlocks.Count())
RTZ();
else
{
Stop();
}
_monitorTimeOut = 2000;
}
*/
break;
}
if (shouldStop)
break;
_position = 0; _position = 0;
_currentDataBlockIndex++; _currentDataBlockIndex++;
if (_currentDataBlockIndex >= _dataBlocks.Count()) if (_currentDataBlockIndex >= _dataBlocks.Count())
{ {
break; break;
@ -584,7 +609,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
{ {
_monitorCount++; _monitorCount++;
if (_monitorCount >= 8 && _machine.Spectrum.Settings.AutoLoadTape) if (_monitorCount >= 16 && _cpu.RegPC == 1523 && _machine.Spectrum.Settings.AutoLoadTape)
{ {
if (!_tapeIsPlaying) if (!_tapeIsPlaying)
{ {
@ -592,7 +617,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
_machine.Spectrum.OSD_TapePlayingAuto(); _machine.Spectrum.OSD_TapePlayingAuto();
} }
_monitorTimeOut = 500; _monitorTimeOut = 90;
} }
} }
else else

16
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Input.cs
View File

@ -17,6 +17,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
string PrevTape = "Insert Previous Tape"; string PrevTape = "Insert Previous Tape";
string NextBlock = "Next Tape Block"; string NextBlock = "Next Tape Block";
string PrevBlock = "Prev Tape Block"; string PrevBlock = "Prev Tape Block";
string TapeStatus = "Get Tape Status";
bool pressed_Play = false; bool pressed_Play = false;
bool pressed_Stop = false; bool pressed_Stop = false;
@ -25,6 +26,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
bool pressed_PrevTape = false; bool pressed_PrevTape = false;
bool pressed_NextBlock = false; bool pressed_NextBlock = false;
bool pressed_PrevBlock = false; bool pressed_PrevBlock = false;
bool pressed_TapeStatus = false;
public void PollInput() public void PollInput()
{ {
@ -85,8 +87,6 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
} }
} }
// Tape control // Tape control
if (Spectrum._controller.IsPressed(Play)) if (Spectrum._controller.IsPressed(Play))
{ {
@ -175,6 +175,18 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
} }
else else
pressed_PrevBlock = false; pressed_PrevBlock = false;
if (Spectrum._controller.IsPressed(TapeStatus))
{
if (!pressed_TapeStatus)
{
//Spectrum.OSD_FireInputMessage(TapeStatus);
Spectrum.OSD_ShowTapeStatus();
pressed_TapeStatus = true;
}
}
else
pressed_TapeStatus = false;
} }
/// <summary> /// <summary>

13
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/SpectrumBase.Memory.cs
View File

@ -105,6 +105,19 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
/// Helper function to refresh memory array (probably not the best way to do things) /// Helper function to refresh memory array (probably not the best way to do things)
/// </summary> /// </summary>
public abstract void ReInitMemory(); public abstract void ReInitMemory();
/// <summary>
/// Detects whether the 48k rom is resident (or paged in) at 0x0001
/// </summary>
/// <returns></returns>
public virtual bool IsIn48kMode()
{
var data = ReadBus(0x0001);
if (data == 0xaf)
return true;
return false;
}
} }
} }

3
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.Controllers.cs
View File

@ -86,7 +86,8 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
List<string> tape = new List<string> List<string> tape = new List<string>
{ {
// Tape functions // Tape functions
"Play Tape", "Stop Tape", "RTZ Tape", "Record Tape", "Insert Next Tape", "Insert Previous Tape", "Next Tape Block", "Prev Tape Block" "Play Tape", "Stop Tape", "RTZ Tape", "Record Tape", "Insert Next Tape",
"Insert Previous Tape", "Next Tape Block", "Prev Tape Block", "Get Tape Status"
}; };
foreach (var s in tape) foreach (var s in tape)

40
BizHawk.Emulation.Cores/Computers/SinclairSpectrum/ZXSpectrum.Messaging.cs
View File

@ -200,6 +200,46 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
SendMessage(sb.ToString().TrimEnd('\n'), MessageCategory.Tape); SendMessage(sb.ToString().TrimEnd('\n'), MessageCategory.Tape);
} }
/// <summary>
/// Tape message that prints the current status of the tape device
/// </summary>
public void OSD_ShowTapeStatus()
{
StringBuilder sb = new StringBuilder();
sb.Append("Status: ");
if (_machine.TapeDevice.TapeIsPlaying)
sb.Append("PLAYING");
else
sb.Append("STOPPED");
SendMessage(sb.ToString().TrimEnd('\n'), MessageCategory.Tape);
sb.Clear();
sb.Append("Tape: " + _machine.TapeMediaIndex + ": " + _gameInfo[_machine.TapeMediaIndex].Name);
SendMessage(sb.ToString().TrimEnd('\n'), MessageCategory.Tape);
sb.Clear();
sb.Append("Block: ");
sb.Append("(" + (_machine.TapeDevice.CurrentDataBlockIndex + 1) +
" of " + _machine.TapeDevice.DataBlocks.Count() + ") " +
_machine.TapeDevice.DataBlocks[_machine.TapeDevice.CurrentDataBlockIndex].BlockDescription);
SendMessage(sb.ToString().TrimEnd('\n'), MessageCategory.Tape);
sb.Clear();
sb.Append("Block Pos: ");
int pos = _machine.TapeDevice.Position;
int end = _machine.TapeDevice.DataBlocks[_machine.TapeDevice.CurrentDataBlockIndex].DataPeriods.Count;
double p = 0;
if (end != 0)
p = ((double)pos / (double)end) * (double)100;
sb.Append(p.ToString("N0") + "%");
SendMessage(sb.ToString().TrimEnd('\n'), MessageCategory.Tape);
sb.Clear();
}
#endregion #endregion
/// <summary> /// <summary>