Merge remote-tracking branch 'upstream/master'
This commit is contained in:
Andrea Odetti
commit
b4098867bb
5 changed files with 68 additions and 66 deletions
|
|
@ -9,9 +9,10 @@ https://github.com/AppleWin/AppleWin/issues/new
|
|||
Tom Charlesworth
|
||||
|
||||
|
||||
1.26.3.2 (Experimental) - 21 Oct 2017
|
||||
1.26.3.4 (Experimental) - 12 Nov 2017
|
||||
-------------------------------------
|
||||
Changes:
|
||||
. [Bug #504] Full-screen: hide mouse pointer after 2 seconds of inactivity (and show again if mouse is moved)
|
||||
. [Bug #469] New -no-printscreen-key switch to prevent the PrintScreen key from being registered.
|
||||
. [Bug #488] New -fs-height=<best|nnnn> switch.
|
||||
- best: picks the highest resolution where the height is an integer multiple of (192*2)
|
||||
|
|
@ -21,6 +22,7 @@ Changes:
|
|||
. [Bug #428] Input option to use PC Joystick 1 Thumbstick 2 for emulated Joystick 2
|
||||
. Swapping disks while a drive is on now warns and prompts if you still wish to do this instead of silently failing with no feedback.
|
||||
. [Bug #323] Skip hard disk boot by holding down the Open-Apple key during an Apple II restart
|
||||
. [Bug #224] Added Config checkbox for 'Full-Screen: Show drive/keyboard status'
|
||||
. [PR #441] Update zlib to latest version 1.2.11
|
||||
|
||||
Fixes:
|
||||
|
|
@ -28,6 +30,7 @@ Fixes:
|
|||
. [Bug #496] Support polling of Mockingboard's & Phasor's 6522 IFR.Timer1
|
||||
. [Bug #492] UI fixes for full-screen & 2x windowed-mode
|
||||
. [Bug #486] Peripheral card's expansion ROM ($C800-CFFF, eg. SSC) wasn't being correctly restored from a save-state
|
||||
- Resulting in regression: Mousecard crash to monitor (#495).
|
||||
. [Bug #464] Fix for full-screen: bottom line missing when vertical resolution is 768
|
||||
. [Bug #460] Debugger: F2 whilst debugger active will immediately stop the drive spinning (allowing disk swap)
|
||||
. [Bug #456] Fix strange speaker clicks when changing configuration - DirectSound wasn't being uninitialised on a restart
|
||||
|
|
@ -52,6 +55,7 @@ Fixes:
|
|||
- Experimental support for 6551's control bit: DTR via -dtr switch
|
||||
- Experimental support for 6551's status bits: DCD and DSR via -dcd and -dsr switches
|
||||
. [Bug #383] "Enhanced disk speed" is very slow when debugger is active
|
||||
. [Bug #320] Mockingboard/Phasor: support 'inactive' function like real hardware
|
||||
. [Bug #269] When stepping, ESC no longer exits back to debugger (use F7, Pause keys or Debugger button instead).
|
||||
. [Bug #250] Debugger: When MODE_STEPPING, fix issue with disk LEDs staying on
|
||||
. [Bug #217] Debugger G(o) command should use normal speed
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@
|
|||
<br>
|
||||
<P style="FONT-WEIGHT: bold">Debug arguments:
|
||||
</P>
|
||||
-l<br>
|
||||
-l or -log<br>
|
||||
Enable logging. Creates an AppleWin.log file<br><br>
|
||||
-m<br>
|
||||
Disable DirectSound support<br><br>
|
||||
|
|
|
|||
|
|
@ -9,85 +9,83 @@
|
|||
<h2 style="COLOR: rgb(0,128,0)">Configuration Settings</h2>
|
||||
<hr size="4">
|
||||
<img style="FLOAT: right; WIDTH: 344px; HEIGHT: 460px" src="img/config.png" alt="Configuration settings"
|
||||
hspace="5" vspace="5"><strong>Model:</strong><br>
|
||||
hspace="5" vspace="5">
|
||||
|
||||
<strong>Model:</strong><br>
|
||||
This describes the mode of emulation. You have the option of emulating
|
||||
the predecessors of the Apple //e: the Apple ][ and Apple ][+. Besides running
|
||||
with a different Apple system ROM, some differences are discussed below.<br>
|
||||
<ul>
|
||||
<li>
|
||||
Apple ][ : Non-autobooting, 64K machine, no lower-case, no 80-column, 6502 CPU
|
||||
<li>
|
||||
Apple ][+ : Autobooting version of the Apple ][
|
||||
<li>
|
||||
Apple //e : 128K machine, lower-case, 80-column, 6502 CPU</li>
|
||||
<li>
|
||||
Enhanced Apple //e : 128K machine, lower-case, 80-column, 65C02 CPU</li>
|
||||
<li>
|
||||
Clone (specific model selectable from Advanced page)</li>
|
||||
<li>Apple ][ : Non-autobooting, 64K machine, no lower-case, no 80-column, 6502 CPU
|
||||
<li>Apple ][+ : Autobooting version of the Apple ][
|
||||
<li>Apple //e : 128K machine, lower-case, 80-column, 6502 CPU</li>
|
||||
<li>Enhanced Apple //e : 128K machine, lower-case, 80-column, 65C02 CPU</li>
|
||||
<li>Clone (specific model selectable from Advanced page)</li>
|
||||
</ul>
|
||||
|
||||
<strong>Confirm reboot:</strong><br>
|
||||
Show "Confirm reboot" message box when F2 is pressed.<br>
|
||||
<br>
|
||||
|
||||
<strong>Video:</strong><br>
|
||||
AppleWin can display Apple video in a variety of modes. The display can also be
|
||||
run in a standard window or full-screen. This option describes the type of
|
||||
video emulation to be used for the emulator. The differences are
|
||||
discussed below.<br>
|
||||
<ul>
|
||||
<li>
|
||||
<strong>Monochrome (custom) :</strong> This mode emulates a monochrome
|
||||
<li><strong>Monochrome (custom) :</strong> This mode emulates a monochrome
|
||||
monitor. You can choose your monochrome color from the <em>Monochrome Color</em>
|
||||
button described below.
|
||||
<li>
|
||||
<strong>Color Monitor :</strong> This mode emulates a standard color monitor.
|
||||
<li>
|
||||
<strong>B&W TV :</strong> This mode emulates an NTSC black and white TV.
|
||||
<li>
|
||||
<strong>Color TV :</strong> This mode emulates an NTSC color TV.
|
||||
<li>
|
||||
<strong>Monochrome (Amber/Green/White) :</strong> Monochrome with specified color.
|
||||
</li>
|
||||
<li><strong>50% Scan line :</strong> Only draw alternate scanline (for better monitor
|
||||
authenticity).</li>
|
||||
<li><strong>Color Monitor :</strong> This mode emulates a standard color monitor.
|
||||
<li><strong>B&W TV :</strong> This mode emulates an NTSC black and white TV.
|
||||
<li><strong>Color TV :</strong> This mode emulates an NTSC color TV.
|
||||
<li><strong>Monochrome (Amber/Green/White) :</strong> Monochrome with specified color.
|
||||
</ul>
|
||||
<P>
|
||||
<strong>Serial Port:<br>
|
||||
</strong>This option will remap the emulated Apple's serial port to your PC's
|
||||
serial port (or TCP port 1977). The Apple Super Serial Card (SSC) is emulated in slot-2.<br>
|
||||
The TCP interface to the Apple SSC can be used by the <a href="http://sourceforge.net/projects/a2gameserver">Apple // Game Server</a>.
|
||||
For details see the notes that comes with AGS:<br>
|
||||
<li>Boot the Apple II to AppleSoft (ie. power on and hit Ctrl-Reset) and type IN#2.
|
||||
</li>
|
||||
<li>From a Windows DOS box, start AGS with "localhost 1977 apple2e". This will boot the emulated Apple II from AGS.</li>
|
||||
<li>Nb. Only Enhanced Apple //e is working at the moment.
|
||||
<br>
|
||||
<STRONG>
|
||||
<BR>
|
||||
Ethernet Settings...:</STRONG>
|
||||
<br>
|
||||
This allows to choose which network interface card (NIC) you want to
|
||||
use with the Uthernet card.<P><STRONG>Monochrome Color:</STRONG><br>
|
||||
This is the color to use when you choose a monochrome video mode.<br>
|
||||
<br>
|
||||
<strong>Emulation Speed Control:</strong><br>
|
||||
This option let's you control the processor speed of the emulated system. You
|
||||
may choose to use an authentic speed (matching the speed of the original
|
||||
processor from the system) or you can underclock or overclock the emulated
|
||||
processor speed from half-speed to as fast as your PC can emulate.<br>
|
||||
<br>
|
||||
<strong>Confirm reboot:</strong><br>
|
||||
Show "Confirm reboot" message box when F2 is pressed.<br>
|
||||
<br>
|
||||
<strong>Benchmark Emulator:</strong><br>
|
||||
This will run a benchmark test that will show how fast your PC can emulate an
|
||||
Apple //e system with this emulator. In order to run the benchmark, the
|
||||
emulated machine must be reset and you will lose any unsaved work. You will be
|
||||
prompted before you continue this action. The results given are:<br>
|
||||
</P>
|
||||
|
||||
<strong>Monochrome Color:</strong><br>
|
||||
This is the color to use when you choose a monochrome video mode.<br>
|
||||
<br>
|
||||
|
||||
<strong>50% Scan line:</strong><br>
|
||||
Only draw alternate scanline (for better monitor authenticity).<br>
|
||||
<br>
|
||||
|
||||
<strong>Full-Screen: Show drive/keyboard status:</strong><br>
|
||||
When in full-screen mode, show floppy (activity and track) and harddisk status (activity); keyboard caps-lock status and if emulation is paused.<br>
|
||||
<br>
|
||||
|
||||
<strong>Serial Port:</strong><br>
|
||||
This option will remap the emulated Apple's serial port to your PC's
|
||||
serial port (or TCP port 1977). The Apple Super Serial Card (SSC) is emulated in slot-2.<br>
|
||||
The TCP interface to the Apple SSC can be used by the <a href="http://sourceforge.net/projects/a2gameserver">Apple // Game Server</a>.
|
||||
For details see the notes that comes with AGS:<br>
|
||||
<li>Boot the Apple II to AppleSoft (ie. power on and hit Ctrl-Reset) and type IN#2.
|
||||
<li>From a Windows DOS box, start AGS with "localhost 1977 apple2e". This will boot the emulated Apple II from AGS.
|
||||
<li>Nb. Only Enhanced Apple //e is working at the moment.
|
||||
<br>
|
||||
<br>
|
||||
|
||||
<strong>Ethernet Settings...:</strong><br>
|
||||
This allows to choose which network interface card (NIC) you want to
|
||||
use with the Uthernet card.<br>
|
||||
<br>
|
||||
|
||||
<strong>Emulation Speed Control:</strong><br>
|
||||
This option let's you control the processor speed of the emulated system. You
|
||||
may choose to use an authentic speed (matching the speed of the original
|
||||
processor from the system) or you can underclock or overclock the emulated
|
||||
processor speed from half-speed to as fast as your PC can emulate.<br>
|
||||
<br>
|
||||
|
||||
<strong>Benchmark Emulator:</strong><br>
|
||||
This will run a benchmark test that will show how fast your PC can emulate an
|
||||
Apple //e system with this emulator. In order to run the benchmark, the
|
||||
emulated machine must be reset and you will lose any unsaved work. You will be
|
||||
prompted before you continue this action. The results given are:<br>
|
||||
<ul>
|
||||
<li>
|
||||
Pure Video FPS
|
||||
<li>
|
||||
Pure CPU MHz
|
||||
<li>
|
||||
Expected average video game performance (in FPS)</li>
|
||||
<li> Pure Video FPS
|
||||
<li> Pure CPU MHz
|
||||
<li> Expected average video game performance (in FPS)
|
||||
</ul>
|
||||
</li>
|
||||
</body>
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 36 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
Loading…
Add table
Reference in a new issue