Apple-2-SW
/
lawless-legends
mirror of https://github.com/badvision/lawless-legends.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed broken transwarp implemetation

This commit is contained in:
Brendan Robert 2024-04-25 14:50:49 -05:00
parent 24fd496d31
commit f572feade0
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Platform/Apple/tools/jace/src/main/java/jace/apple2e/Apple2e.java
View File

@ -93,7 +93,7 @@ public class Apple2e extends Computer {
@ConfigurableField(name = "No-Slot Clock Enabled", shortName = "clock", description = "If checked, no-slot clock will be enabled", enablesDevice = true)
public boolean clockEnabled = true;
@ConfigurableField(name = "Accelerator Enabled", shortName = "zip", description = "If checked, add support for Zip/Transwarp", enablesDevice = true)
public boolean acceleratorEnabled = PRODUCTION_MODE;
public boolean acceleratorEnabled = true;
public Joystick joystick1;
public Joystick joystick2;

14
Platform/Apple/tools/jace/src/main/java/jace/hardware/ZipWarpAccelerator.java
View File

@ -24,7 +24,6 @@ import jace.core.RAMListener;
/**
* Implements a basic hardware accelerator that is able to adjust the speed of the emulator
*/
// TODO: Support the registers used here: https://github.com/a2-4am/4cade/blob/main/src/hw.accel.a#L238
public class ZipWarpAccelerator extends Device {
@ConfigurableField(category = "debug", name = "Debug messages")
public boolean debugMessagesEnabled = false;
@ -38,8 +37,14 @@ public class ZipWarpAccelerator extends Device {
public static final double UNLOCK_PENALTY_PER_TICK = 0.19;
public static final double UNLOCK_MIN = 4.0;
/**
* Valid values for C074 are:
* 0: Enable full speed
* 1: Set speed to 1mhz (temporarily disable)
* 3: Disable completely (requres cold-start to re-enable -- this isn't implemented)
*/
public static final int TRANSWARP = 0x0c074;
public static final int TRANSWARP_ON = 1; // Any other value written disables acceleration
public static final int TRANSWARP_ON = 0; // Any other value written disables acceleration
boolean zipLocked = true;
double zipUnlockCount = 0;
@ -187,7 +192,10 @@ public class ZipWarpAccelerator extends Device {
private void turnOffAcceleration() {
// The UI Logic retains the user's desired normal speed, reset to that
Emulator.getUILogic().reconfigure();
Emulator.withComputer(c -> {
c.getMotherboard().setMaxSpeed(false);
c.getMotherboard().setSpeedInPercentage(100);
});
}
@Override