Apple-2-Tools/jace
1
0
Fork 1
mirror of https://github.com/badvision/jace.git synced 2024-11-23 23:32:59 +00:00
Code Issues Projects Releases Wiki Activity

Add mockingboard register logging and workaround for routines that use high frequencies instead of muting channels

Browse Source
This commit is contained in:
Badvision 2024-08-27 16:49:23 -05:00
parent 3701cd5457
commit 14b0cfd967
3 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/jace/hardware/mockingboard/EnvelopeGenerator.java
View File

@ -75,7 +75,9 @@ public class EnvelopeGenerator extends TimedGenerator {
}
}
int shape;
public void setShape(int shape) {
this.shape = shape & 15;
oddEven = false;
counter = 0;
cont = (shape & 8) != 0;

28
src/main/java/jace/hardware/mockingboard/PSG.java
View File

@ -23,6 +23,8 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import jace.hardware.CardMockingboard;
/**
* Implementation of the AY sound PSG chip. This class manages register values
* and mixes the channels together (in the update method) The work of
@ -225,6 +227,32 @@ public class PSG {
case PortA, PortB -> {
}
}
if (CardMockingboard.DEBUG) {
debugStatus();
}
}
String lastStatus = "";
public void debugStatus() {
String status = String.format("b%02X: A %03X %s %01X | B %03X %s %01X | C %03X %s %01X | N %03X | E %01X %04X",
baseReg,
channels.get(0).period,
(channels.get(0).active ? "T" : "_") + (channels.get(0).noiseActive ? "N" : "_"),
channels.get(0).amplitude,
channels.get(1).period,
(channels.get(1).active ? "T" : "_") + (channels.get(1).noiseActive ? "N" : "_"),
channels.get(1).amplitude,
channels.get(2).period,
(channels.get(2).active ? "T" : "_") + (channels.get(2).noiseActive ? "N" : "_"),
channels.get(2).amplitude,
noiseGenerator.period,
envelopeGenerator.shape,
envelopeGenerator.period
);
if (!lastStatus.equals(status)) {
System.out.println(status);
lastStatus = status;
}
}
public void update(AtomicInteger bufA, boolean clearA, AtomicInteger bufB, boolean clearB, AtomicInteger bufC, boolean clearC) {

5
src/main/java/jace/hardware/mockingboard/TimedGenerator.java
View File

@ -62,6 +62,11 @@ public class TimedGenerator {
protected int updateCounter() {
counter += cyclesPerSample;
int numStateChanges = 0;
// Skyfox and Genius use a period value of 001 for silence instead of setting volume to 0.
if (period == 1) {
counter = 0;
return 0;
}
while (counter >= clocksPerPeriod) {
counter -= clocksPerPeriod;
numStateChanges++;