diff --git a/bin/History.txt b/bin/History.txt index 57307087..85a9eb22 100644 --- a/bin/History.txt +++ b/bin/History.txt @@ -64,6 +64,7 @@ Changes: . Remove unsupported PC speaker sound types . [PR #235] New start-up title screen by Paulo Garcia . [PR #233] Configuration Dialog->Disk tab: Buttons replaced with drop-down menu for select/eject by Paulo Garcia +. Removed CTRL+F9 functionality to cycle through AppleWin's character sets (ie. original Apple II charsets and clones' char-sets) Fixes: . [Bug #129] Tight loop page-flipping causing heavy CPU load (fixed by NTSC / cycle-accurate video emulation) diff --git a/help/CommandLine.html b/help/CommandLine.html index f2ff3a14..940e9e7b 100644 --- a/help/CommandLine.html +++ b/help/CommandLine.html @@ -45,7 +45,17 @@ -load-state <savestate>
Load a save-state file

-

 

+ -modem
+ Shorthand for passing -dtr -dcd -dsr

+ -dtr
+ Support SSC's DTR (Data Terminal Ready) control bit

+ -dcd
+ Support SSC's DCD (Data Carrier Detect) status bit

+ -dtr
+ Support SSC's DSR (Data Set Ready) status bit

+ +
+

Debug arguments:

-l
diff --git a/help/cfg-sound.html b/help/cfg-sound.html index 3372ca3d..806d391f 100644 --- a/help/cfg-sound.html +++ b/help/cfg-sound.html @@ -23,23 +23,24 @@ system. Your choices are:
  • Sound Card (recommended)
    • +
    Volume Control:
    These slider controls allow you to control the sound levels of the built-in Apple //e speaker and/or an optional -Mockingboard -or Phasor speaker.
    +Mockingboard or Phasor speaker.

    - Mockingboard/Phasor Control:
    These options allow you to either enable a pair of Mockingboard sound -cards in slots 4 and -5, or enable a Phasor sound card in slot 4, or simply disable any -external -sound card for the emulated system.
    +cards in slots 4 and 5, or enable a Phasor sound card in slot 4, or simply disable any +external sound card for the emulated system.
    + +
    +SAM:
    + +SAM (Software Automatic Mouth) is an 8-bit DAC card than can be enabled in slot 5. -     diff --git a/help/dbg-entering-debugger.html b/help/dbg-entering-debugger.html index c4e9a130..159eb150 100644 --- a/help/dbg-entering-debugger.html +++ b/help/dbg-entering-debugger.html @@ -121,5 +121,73 @@ bug that has already been fixed.

    + +

    Exiting the Debugger

    +

    In general, press F7 to exit the debugger.
    + NB. If you have breakpoints set then you will exit the debugger in 'stepping' mode.

    + Other ways to exit the debugger and force 'stepping' mode are: +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +

    Command

    +     		+

    Run at normal speed?

    +     		+

    Run at full speed?

    +     		+

    Video quality

    +     		+

    Sound quality

    +
    +

    g

    +     		+

    yes

    +     		+

    only if disk active, etc

    +     		+

    precise

    +     		+

    precise

    +
    +

    gg

    +     		+

    no

    +     		+

    always

    +     		+

    periodic

    +     		+

    muted

    +
    +
    +

    Finally to exit 'stepping' and return to the debugger, use F7, the Pause key or the Debugger toolbar button. +

    diff --git a/help/dbg-toc-intro.html b/help/dbg-toc-intro.html index a6f7f08a..c387665e 100644 --- a/help/dbg-toc-intro.html +++ b/help/dbg-toc-intro.html @@ -13,7 +13,7 @@
  • Introduction
  • - Entering the Debugger + Entering and exiting the Debugger
  • Scrolling
  • diff --git a/help/img/sound.png b/help/img/sound.png index eeee5bb9..650181ff 100644 Binary files a/help/img/sound.png and b/help/img/sound.png differ diff --git a/help/keyboard.html b/help/keyboard.html index 931e89b3..31f5fd85 100644 --- a/help/keyboard.html +++ b/help/keyboard.html @@ -11,6 +11,7 @@

    Reset:
    On the Apple //e, you could usually press Control+Reset to interrupt a running program. With the Apple //e Emulator, you may emulate this key sequence with + Ctrl+F2 or Ctrl+Break.

    Open Apple:
    @@ -20,14 +21,14 @@ and Alt on a PC, in that it was used in conjunction with other keys. This key is - emulated with the PC's left - Alt + emulated with the PC's + Left Alt key, which is in the same position as the Open Apple key on the original //e.

    Solid Apple:
    The Solid Apple key was introduced on the Apple //e and later renamed to the - Option key. This key is emulated with the PC's right - Alt + Option key. This key is emulated with the PC's + Right Alt key, which is in the same position as the Solid Apple key on the original //e.

    Numeric Keypad:
    @@ -53,9 +54,11 @@ key is pressed down.

    Shift+Insert:
    Paste text from Windows' clipboard. Text gets fed a character at a time to the - Apple's keyboard hardware. The 'CR+LF' combination gets converted to CR.

    + Apple's keyboard hardware. The 'CR+LF' combination gets converted to CR.

    PrintScrn:
    - Save Apple screen to bitmap. The file is saved to the last directory you opened a disk image from. The default resolution is 560x384. Use Shift+PrintScrn to save a 280x192 bitmap. The filename + Save Apple screen to bitmap. The file is saved to the last directory you opened a disk image from. The default resolution is 560x384. Use + Shift+PrintScrn + to save a 280x192 bitmap. The filename generated depends if you have a floppy inserted in drive-1 or not. If you do then files are named "{DiskFilename}_#.bmp" otherwise they are named "AppleWin_ScreenShot_#.bmp".

    Shift+PrintScrn:
    @@ -67,23 +70,18 @@

    Function Keys F1-F8:
    These PC function keys correspond to buttons on the toolbar.

    Function Key F2 + Ctrl:
    - This PC function key combo acts like Ctrl+RESET (instead of power-cycle).

    + This PC function key combo acts like Ctrl+Reset (instead of power-cycle).

    Function Key F6 + Ctrl:
    This PC function key combo toggles between 1x and 2x window sizes.

    Function Key F9:
    - This PC function key will cycle through AppleWin's display modes:  - monochrome (custom), color (normal), color (text optimized), color (TV - emulation), etc. This shortcut allows you to switch display modes without going + This PC function key will cycle through AppleWin's display modes: + monochrome (custom), Color Monitor, B&W TV, Color TV, etc. This shortcut allows you to switch display modes without going through the configuration dialog.
    NB. Use Shift+F9 to reverse-cycle the display modes.

    Function Key F9 + Ctrl + Shift:
    This PC function key combo will toggle 50% scanline mode

    -

    Function Key F9 + Ctrl:
     - This PC function key combo will cycle through AppleWin's character sets:  - original Apple II charsets and clones' char-sets. This shortcut allows - you to override the default character sets of the Apple II model or clone.

    Function Key F10 (or Ctrl+left mouse button):
    - This PC function key will stop emulating an Apple joystick with the PC's mouse.
    In - Pravets 8A emulation mode it servers as Caps Lock and Ctrl+F10 shall + This PC function key will stop emulating an Apple joystick with the PC's mouse.
    + In Pravets 8A emulation mode it servers as Caps Lock and Ctrl+F10 shall be used to stop emulating an Apple joystick with the PC's mouse.

    Function Keys F11-F12:
    These PC function keys correspond to saving/loading a save-state diff --git a/help/sound.html b/help/sound.html index b8a12792..b068af40 100644 --- a/help/sound.html +++ b/help/sound.html @@ -10,8 +10,7 @@ Sound

    Sound:

    -

    AppleWin emulates both the internal speaker - and also the Mockingboard (or Phasor) sound card, using a PC sound card.

    +

    AppleWin emulates the internal speaker, the Mockingboard (or Phasor) sound card and also the SAM card; using a PC sound card.

    Use the AppleWin Configuration tab labelled Sound.

    If you want to use a sound card then use at least DirectX 9.

    Speaker:

    @@ -31,20 +30,24 @@

    Phasor:

    When Phasor is enabled, the card is physically plugged into slot 4 of the Apple II.

    Phasor is equivalent to 2 Mockingboards: so has 4x AY8910 & 1x SSI263.

    -

     

    +

    There are a number of games and demos that support Mockingboard (or Phasor), eg:

    +
    +

    SAM:

    +

    SAM (Software Automatic Mouth) is an 8-bit DAC card than can be enabled in slot 5.

    diff --git a/help/toolbar.html b/help/toolbar.html index 1b6692f4..9361f15d 100644 --- a/help/toolbar.html +++ b/help/toolbar.html @@ -23,7 +23,7 @@ Displays the help file that you are currently reading. F2 -- Run/Reboot:
    Starts the emulated machine if it is not currently running, or reboots (power-cycles) -it if it is currently running. (Use Ctrl+F2 to simulate Ctrl+RESET.) +it if it is currently running. (Use Ctrl+F2 or Ctrl+Break to simulate Ctrl+Reset.) Drive 1: