diff --git a/README.md b/README.md
index 3d0a35b05..3896668dd 100644
--- a/README.md
+++ b/README.md
@@ -32,19 +32,23 @@ Demos
---
Some pre-configured machines are shown below, ready to run BASIC, DOS, Windows 1.01, and assorted non-DOS software.
+


-
-

+
+
+
+
+



Check out the rest of the PCjs [Application](/apps/pc/), [Disk](/disks/pc/), and [Machine](/devices/pc/machine/)
demos, including an [IBM PC Dual Display System](/devices/pc/machine/5150/dual/64kb/) demo of multiple monitor support,
-and [IBM PC XT "Server Array"](/devices/pc/machine/5160/cga/256kb/array/) and [Windows 1.01 "Server Array"](/devices/pc/machine/5160/ega/640kb/array/)
-demos of multiple machines running side-by-side.
+and "Server Array" demos of multiple [IBM PC XT](/devices/pc/machine/5160/cga/256kb/array/) and
+[Windows 1.01](/devices/pc/machine/5160/ega/640kb/array/) machines running side-by-side.
C1Pjs
---
diff --git a/_includes/machine-engines.html b/_includes/machine-engines.html
index d80e4634b..233aa9d78 100644
--- a/_includes/machine-engines.html
+++ b/_includes/machine-engines.html
@@ -4,7 +4,8 @@ in the Front Matter of Markdown files, for compatibility with the Jekyll web ser
'id' (eg, "ibm5150")
'name' (eg, "IBM PC (Model 5150) with Monochrome Display")
- 'type' (eg, "pc" or "pc-dbg")
+ 'type' (eg, "pc" or "c1p")
+ 'debugger' (eg, true)
'config' (eg, "machine.xml")
'template' (eg, "machine.xsl")
'uncompiled' (eg, true)
@@ -12,8 +13,8 @@ in the Front Matter of Markdown files, for compatibility with the Jekyll web ser
And the following properties (along with any property not listed above) will be added to the 'parms' property:
- 'autopower' (eg, "true")
- 'automount' (eg, {"A":{"name":"OS/2 FOOTBALL Boot Disk (v7.68.17)","path":"/disks/pc/os2/misc/football/debugger/FOOTBALL-7.68.17.json"}})
+ 'autoPower' (eg, "true")
+ 'autoMount' (eg, {"A":{"name":"OS/2 FOOTBALL Boot Disk (v7.68.17)","path":"/disks/pc/os2/misc/football/debugger/FOOTBALL-7.68.17.json"}})
'state' (eg, "state.json")
'messages' (eg, "disk")
@@ -22,11 +23,24 @@ here and in markout.js. Examples include 'autopower' ('autoPower') and 'automou
{% endcomment %}
{% for machine in page.machines %}
- {% capture machine_embed %}embed{{ machine.type | remove:'-dbg' | upcase }}{% endcapture %}
- {% if machine.autopower == nil %}
- {% assign machine_autopower = "true" %}
+ {% capture machine_type %}{{ machine.type | remove:'-dbg' }}{% endcapture %}
+ {% if machine.debugger %}
+ {% capture machine_file %}{{ machine_type }}-dbg{% endcapture %}
{% else %}
- {% capture machine_autopower %}{{ machine.autopower }}{% endcapture %}
+ {% capture machine_file %}{{ machine.type }}{% endcapture %}
+ {% endif %}
+ {% capture machine_embed %}embed{{ machine_type | upcase }}{% endcapture %}
+ {% if machine.automount != nil %}
+ {% capture machine_autoMount %}{{ machine.automount|jsonify }}{% endcapture %}
+ {% else %}
+ {% capture machine_autoMount %}{{ machine.autoMount|jsonify }}{% endcapture %}
+ {% endif %}
+ {% if machine.autopower != nil %}
+ {% capture machine_autoPower %}{{ machine.autopower }}{% endcapture %}
+ {% elsif machine.autoPower != nil %}
+ {% capture machine_autoPower %}{{ machine.autoPower }}{% endcapture %}
+ {% else %}
+ {% assign machine_autoPower = "true" %}
{% endif %}
{% unless machine.config %}
{% assign machine_config = "machine.xml" %}
@@ -38,19 +52,19 @@ here and in markout.js. Examples include 'autopower' ('autoPower') and 'automou
{% else %}
{% assign machine_template = machine.template %}
{% endunless %}
- {% capture machine_parms %}{{ site.left_brace }}autoPower:{{ machine_autopower }},state:"{{ machine.state }}",autoMount:{{ machine.automount|jsonify }},messages:"{{ machine.messages }}"{{ site.right_brace }}{% endcapture %}
+ {% capture machine_parms %}{{ site.left_brace }}autoPower:{{ machine_autoPower }},state:"{{ machine.state }}",autoMount:{{ machine_autoMount }},messages:"{{ machine.messages }}"{{ site.right_brace }}{% endcapture %}
{% if site.pcjs.compiled == true and machine.uncompiled != true %}
- {% capture machine_script %}{% endcapture %}
+ {% capture machine_script %}{% endcapture %}
{% unless machine_scripts contains machine_script %}
{{ machine_script }}
{% endunless %}
{% capture machine_scripts %}{{ machine_scripts }}{{ machine_script }}{% endcapture %}
{% if machine_template == '' %}
- {% capture machine_template %}{{ site.baseurl }}/versions/{{ machine.type | remove:'-dbg' }}js/{{ site.pcjs.version }}/components.xsl{% endcapture %}
+ {% capture machine_template %}{{ site.baseurl }}/versions/{{ machine_type }}js/{{ site.pcjs.version }}/components.xsl{% endcapture %}
{% endif %}
{% else %}
- {% if machine.type == "pc" or machine.type == "pc-dbg" %}{% assign array_scripts = site.pcjs.pc_scripts %}{% endif %}
- {% if machine.type == "c1p" or machine.type == "c1p-dbg" %}{% assign array_scripts = site.pcjs.c1p_scripts %}{% endif %}
+ {% if machine_type == "pc" %}{% assign array_scripts = site.pcjs.pc_scripts %}{% endif %}
+ {% if machine_type == "c1p" %}{% assign array_scripts = site.pcjs.c1p_scripts %}{% endif %}
{% for script in array_scripts %}
{% capture machine_script %}{% endcapture %}
{% unless machine_scripts contains machine_script %}
@@ -59,7 +73,7 @@ here and in markout.js. Examples include 'autopower' ('autoPower') and 'automou
{% capture machine_scripts %}{{ machine_scripts }}{{ machine_script }}{% endcapture %}
{% endfor %}
{% if machine_template == '' %}
- {% capture machine_template %}{{ site.baseurl }}/modules/{{ machine.type | remove:'-dbg' }}js/templates/components.xsl{% endcapture %}
+ {% capture machine_template %}{{ site.baseurl }}/modules/{{ machine_type }}js/templates/components.xsl{% endcapture %}
{% endif %}
{% endif %}
diff --git a/_includes/screenshot.html b/_includes/screenshot.html
index a1e9689ff..fa7ef75f2 100644
--- a/_includes/screenshot.html
+++ b/_includes/screenshot.html
@@ -1,7 +1,15 @@
+{% assign include_width = "" %}
+{% assign include_height = "" %}
+{% if include.width %}
+ {% capture include_width %} width="{{ include.width }}"{% endcapture %}
+{% endif %}
+{% if include.height %}
+ {% capture include_height %} height="{{ include.height }}"{% endcapture %}
+{% endif %}
{{ include.title }}
diff --git a/_posts/2014-03-30-running-on-azure.md b/_posts/2014-03-30-running-on-azure.md
index de40a4958..0ca561bc4 100644
--- a/_posts/2014-03-30-running-on-azure.md
+++ b/_posts/2014-03-30-running-on-azure.md
@@ -48,7 +48,7 @@ would happily report:
but it would NEVER display anything but deployment information. Instead, I had to browse the log files using Azure's
"FTP DIAGNOSTIC LOGS" link on the web portal -- which presents the logs as one big, ugly, fragmented mess:
-
+
Sigh. But at least the site is up and fully operational now.
diff --git a/_posts/2014-03-31-browser-compatibility-woes.md b/_posts/2014-03-31-browser-compatibility-woes.md
index 2f29a656e..a58e37b90 100644
--- a/_posts/2014-03-31-browser-compatibility-woes.md
+++ b/_posts/2014-03-31-browser-compatibility-woes.md
@@ -24,7 +24,7 @@ I've done what testing I can with the Android SDK and the "Android Virtual Devic
looks fine -- you click/tap on the PC's screen, the soft keyboard pops up, and typing works. So I guess Silk is just
an outlier. I'm not sure what I'll do about it yet (or even what I can do).
-
+
---
diff --git a/_posts/2014-06-14-halt-and-catch-liar.md b/_posts/2014-06-14-halt-and-catch-liar.md
index fe2dd65c6..2a33cb5a8 100644
--- a/_posts/2014-06-14-halt-and-catch-liar.md
+++ b/_posts/2014-06-14-halt-and-catch-liar.md
@@ -27,7 +27,7 @@ And centerpiece of this whole conceit -- the cloning of the IBM PC ROM BIOS. Wh
scene from Episode 2, where Brilliant Engineer looks at Hot Programmer's whiteboard in awe. Apparently, he
is easily awed, because he did the same thing when Sales Guy wrote "2x fast, 1/2 price" on an earlier whiteboard.
-[

](/blog/images/halt-and-catch-liar.jpg)
+[

](/blog/images/halt-and-catch-liar.jpg)
So if you deconstruct the code on this whiteboard, you quickly notice that while it IS assembly language, it is
NOT the sort of assembly language you would find in a ROM BIOS, let alone ANYTHING that would leave you in awe.
diff --git a/_posts/2015-01-17-pcjs-uncompiled.md b/_posts/2015-01-17-pcjs-uncompiled.md
index 8d4bcd51e..df2b0a98f 100644
--- a/_posts/2015-01-17-pcjs-uncompiled.md
+++ b/_posts/2015-01-17-pcjs-uncompiled.md
@@ -5,10 +5,11 @@ date: 2015-01-17 11:00:00
category: Features
permalink: /blog/2015/01/17/
machines:
- - type: pc-dbg
+ - type: pc
id: at-ega-1152k-rev3
- config: /devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml
+ debugger: true
uncompiled: true
+ config: /devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml
---
Most machines on [{{ site.pcjs.domain }}](/) run with a compiled version of PCjs, which is produced
@@ -29,10 +30,11 @@ Here's what a typical Markdown file would look like:
---
...
machines:
- - type: pc-dbg
+ - type: pc
id: at-ega-1152k-rev3
- config: /devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml
+ debugger: true
uncompiled: true
+ config: /devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml
---
...
{% include machine.html id="at-ega-1152k-rev3" %}
diff --git a/_posts/2015-01-28-new-pcjs-control-panel.md b/_posts/2015-01-28-new-pcjs-control-panel.md
index 6179015bd..6665aafb2 100644
--- a/_posts/2015-01-28-new-pcjs-control-panel.md
+++ b/_posts/2015-01-28-new-pcjs-control-panel.md
@@ -5,8 +5,9 @@ date: 2015-01-28 11:00:00
category: Control Panel
permalink: /blog/2015/01/28/
machines:
- - type: pc-dbg
+ - type: pc
id: at-ega-1152k-rev3
+ debugger: true
config: /devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml
uncompiled: true
---
diff --git a/_posts/2015-02-22-compaq-deskpro-386.md b/_posts/2015-02-22-compaq-deskpro-386.md
index 194c1811a..9a9430f40 100644
--- a/_posts/2015-02-22-compaq-deskpro-386.md
+++ b/_posts/2015-02-22-compaq-deskpro-386.md
@@ -5,8 +5,9 @@ date: 2015-02-22 11:00:00
category: 80386
permalink: /blog/2015/02/22/
machines:
- - type: pc-dbg
+ - type: pc
id: deskpro386
+ debugger: true
config: /devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml
uncompiled: true
---
diff --git a/_posts/2015-04-16-compaq-deskpro-386-update.md b/_posts/2015-04-16-compaq-deskpro-386-update.md
index 59757f8a4..293bdd2e8 100644
--- a/_posts/2015-04-16-compaq-deskpro-386-update.md
+++ b/_posts/2015-04-16-compaq-deskpro-386-update.md
@@ -5,8 +5,9 @@ date: 2015-04-16 11:00:00
category: 80386
permalink: /blog/2015/04/16/
machines:
- - type: pc-dbg
+ - type: pc
id: deskpro386
+ debugger: true
config: /devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml
uncompiled: true
---
diff --git a/_posts/2015-09-21-windows-95-in-your-web-browser.md b/_posts/2015-09-21-windows-95-in-your-web-browser.md
index 0e0d63317..ac11bbf09 100644
--- a/_posts/2015-09-21-windows-95-in-your-web-browser.md
+++ b/_posts/2015-09-21-windows-95-in-your-web-browser.md
@@ -5,8 +5,9 @@ date: 2015-09-21 11:00:00
category: Windows 95
permalink: /blog/2015/09/21/
machines:
- - type: pc-dbg
+ - type: pc
id: deskpro386
+ debugger: true
config: /devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml
---
diff --git a/_posts/2015-12-27-revisiting-os2.md b/_posts/2015-12-27-revisiting-os2.md
index e6d28ec6e..b064f0ece 100644
--- a/_posts/2015-12-27-revisiting-os2.md
+++ b/_posts/2015-12-27-revisiting-os2.md
@@ -5,8 +5,9 @@ date: 2015-12-27 11:00:00
category: OS/2
permalink: /blog/2015/12/27/
machines:
- - type: pc-dbg
+ - type: pc
id: ibm5170
+ debugger: true
config: /disks/pc/os2/ibm/1.0/machine.xml
---
diff --git a/_posts/2016-02-24-remembering-compaq.md b/_posts/2016-02-24-remembering-compaq.md
index 7460999e6..6604a2131 100644
--- a/_posts/2016-02-24-remembering-compaq.md
+++ b/_posts/2016-02-24-remembering-compaq.md
@@ -61,22 +61,22 @@ Looking ahead to the day when PCjs will be able to simulate the original COMPAQ
idea to create my own roughly chronological list of [COMPAQ Machines](/devices/pc/machine/compaq/) from the 1980s,
since they are all machines I would like to see PCjs eventually support:
- + COMPAQ Portable
- + COMPAQ [Portable] Plus
- + COMPAQ DeskPro
- + COMPAQ DeskPro 286
- + COMPAQ Portable 286
- + COMPAQ Portable II
- + [COMPAQ DeskPro 386](/devices/pc/machine/compaq/deskpro386/)
- + COMPAQ Portable III
- + COMPAQ DeskPro 386/20
- + COMPAQ Portable 386
- + COMPAQ DeskPro 386/25
- + COMPAQ DeskPro 386s
- + COMPAQ DeskPro 386/20e
- + COMPAQ SLT Series (SLT/286)
- + COMPAQ DeskPro 386/33
- + COMPAQ LTE Series (LTE and LTE/286)
+ - COMPAQ Portable
+ - COMPAQ [Portable] Plus
+ - COMPAQ DeskPro
+ - COMPAQ DeskPro 286
+ - COMPAQ Portable 286
+ - COMPAQ Portable II
+ - [COMPAQ DeskPro 386](/devices/pc/machine/compaq/deskpro386/)
+ - COMPAQ Portable III
+ - COMPAQ DeskPro 386/20
+ - COMPAQ Portable 386
+ - COMPAQ DeskPro 386/25
+ - COMPAQ DeskPro 386s
+ - COMPAQ DeskPro 386/20e
+ - COMPAQ SLT Series (SLT/286)
+ - COMPAQ DeskPro 386/33
+ - COMPAQ LTE Series (LTE and LTE/286)
It's hard to stop at this point, because COMPAQ produced other innovative 80386-based systems, like those in the LTE
and LTE Lite series. But I think I need to stick to my original plan and draw a line at the end of the 1980s.
diff --git a/_posts/2016-03-06-touching-windows.md b/_posts/2016-03-06-touching-windows.md
new file mode 100644
index 000000000..c7bbb2f52
--- /dev/null
+++ b/_posts/2016-03-06-touching-windows.md
@@ -0,0 +1,47 @@
+---
+layout: post
+title: Touching Windows
+date: 2016-03-06 09:00:00
+permalink: /blog/2016/03/06/
+---
+
+Yesterday, I fired up [Windows 3.1](/disks/pc/windows/3.10/) and played a complete game of
+[Windows Solitaire](https://en.wikipedia.org/wiki/Microsoft_Solitaire) on my iPad. And I won!
+
+{% comment %}[

](/blog/images/ipad-solitaire.jpg){% endcomment %}
+{% include screenshot.html src="/blog/images/ipad-solitaire-small.jpg" title="iPad running Solitaire on Windows 3.10" link="/blog/images/ipad-solitaire.jpg" %}
+
+Converting touch events to mouse events can be a bit, um, touchy. The basic touch events are:
+
+ - `touchstart`
+ - `touchmove`
+ - `touchend`
+
+which roughly correspond to `mousedown`, `mousemove`, and `mouseup` events, except that your finger isn't
+exactly like a mouse -- it doesn't have *buttons* for one thing -- so there are several usability problems
+that must be solved.
+
+One of the problems is how to deal with the *default behaviors* of touch events. For example, tapping on a
+PCjs screen is normally how you trigger the iPad's soft keyboard, and dragging your finger across the screen
+normally scrolls the page up and down. However, you don't want *either* of those behaviors when you're
+trying to move the machine's mouse pointer around or click on things.
+
+PCjs attempts to resolve the tapping problem by disabling default behaviors most of the time, except when
+two taps occur more than 1/2 second apart. This allows a quick *double-tap* to be treated as a double-click,
+while a pair of slower taps allows the soft keyboard to activate.
+
+Another problem is how to differentiate between *moving the mouse* (ie, without any buttons pressed) and
+*dragging the mouse* (ie, with the left button pressed). Newer devices offer the option of relying on "3D Touch"
+(aka Force Touch), and using pressure to determine the user's intent, but most devices don't have that feature,
+and I'm not sure I'd want to rely on that anyway.
+
+The PCjs soution: if you *tap and hold* for more than 200ms, and then start moving, your movements become the
+equivalent of a *mouse drag* operation.
+
+This is my first stab at touch-to-mouse conversion, and it's not perfect, but it's already fairly usable,
+as my Solitaire experiment demonstrates. And there are still some open questions, such as how to intuitively
+support operations like *right drag*, since the current *mouse drag* operation is inherently *left drag*;
+one solution would be to rely on multi-touch and use two fingers to trigger right-button operations.
+
+*[@jeffpar](http://twitter.com/jeffpar)*
+*March 6, 2016*
diff --git a/apps/pc/1981/visicalc/thumbnail.jpg b/apps/pc/1981/visicalc/thumbnail.jpg
new file mode 100644
index 000000000..33fdcda18
Binary files /dev/null and b/apps/pc/1981/visicalc/thumbnail.jpg differ
diff --git a/blog/images/avd-tablet.jpg b/blog/images/avd-tablet.jpg
new file mode 100644
index 000000000..502523995
Binary files /dev/null and b/blog/images/avd-tablet.jpg differ
diff --git a/blog/images/avd_tablet.png b/blog/images/avd_tablet.png
deleted file mode 100644
index ef8daa23d..000000000
Binary files a/blog/images/avd_tablet.png and /dev/null differ
diff --git a/blog/images/halt-and-catch-liar-thumbnail.jpg b/blog/images/halt-and-catch-liar-small.jpg
similarity index 100%
rename from blog/images/halt-and-catch-liar-thumbnail.jpg
rename to blog/images/halt-and-catch-liar-small.jpg
diff --git a/blog/images/iisnode-logs.jpg b/blog/images/iisnode-logs.jpg
new file mode 100644
index 000000000..bec4309d2
Binary files /dev/null and b/blog/images/iisnode-logs.jpg differ
diff --git a/blog/images/iisnode_logs.png b/blog/images/iisnode_logs.png
deleted file mode 100644
index fa10239c4..000000000
Binary files a/blog/images/iisnode_logs.png and /dev/null differ
diff --git a/blog/images/ipad-solitaire-small.jpg b/blog/images/ipad-solitaire-small.jpg
new file mode 100644
index 000000000..298f35cbf
Binary files /dev/null and b/blog/images/ipad-solitaire-small.jpg differ
diff --git a/blog/images/ipad-solitaire.jpg b/blog/images/ipad-solitaire.jpg
new file mode 100644
index 000000000..ce8d89851
Binary files /dev/null and b/blog/images/ipad-solitaire.jpg differ
diff --git a/devices/pc/keyboard/keyboard-minimal-arrows.xml b/devices/pc/keyboard/keyboard-minimal-arrows.xml
index 051ed5326..0bc3f1eea 100644
--- a/devices/pc/keyboard/keyboard-minimal-arrows.xml
+++ b/devices/pc/keyboard/keyboard-minimal-arrows.xml
@@ -1,5 +1,5 @@
-
+
ESC
F1
SysReq
diff --git a/devices/pc/keyboard/keyboard-minimal-functions.xml b/devices/pc/keyboard/keyboard-minimal-functions.xml
index 76abbe885..5424bdd60 100644
--- a/devices/pc/keyboard/keyboard-minimal-functions.xml
+++ b/devices/pc/keyboard/keyboard-minimal-functions.xml
@@ -1,5 +1,5 @@
-
+
ESC
CTRL-C
CTRL-ALT-DEL
diff --git a/devices/pc/keyboard/keyboard-minimal.xml b/devices/pc/keyboard/keyboard-minimal.xml
index f3ba3ddf6..a85d70bd1 100644
--- a/devices/pc/keyboard/keyboard-minimal.xml
+++ b/devices/pc/keyboard/keyboard-minimal.xml
@@ -1,5 +1,5 @@
-
+
ESC
F1
F10
diff --git a/devices/pc/keyboard/keyboard-test.xml b/devices/pc/keyboard/keyboard-test.xml
index 42b81ef7d..bda15b6cd 100644
--- a/devices/pc/keyboard/keyboard-test.xml
+++ b/devices/pc/keyboard/keyboard-test.xml
@@ -1,5 +1,5 @@
-
+
ESC
F1
SysReq
diff --git a/devices/pc/machine/5150/cga/384kb/softkbd/machine.md b/devices/pc/machine/5150/cga/384kb/softkbd/machine.md
index 46478e42d..b757f1d0a 100644
--- a/devices/pc/machine/5150/cga/384kb/softkbd/machine.md
+++ b/devices/pc/machine/5150/cga/384kb/softkbd/machine.md
@@ -3,8 +3,9 @@ layout: page
title: "IBM PC (Model 5150, 384Kb) with Color Display and Soft Keyboard"
permalink: /devices/pc/machine/5150/cga/384kb/softkbd/
machines:
- - type: pc-dbg
+ - type: pc
id: ibm5150
+ debugger: true
---
{% include machine.html id="ibm5150" %}
diff --git a/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml b/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml
index 6f2d1adae..363bca173 100644
--- a/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml
+++ b/devices/pc/machine/5150/cga/384kb/softkbd/machine.xml
@@ -9,9 +9,9 @@
+
-
diff --git a/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.md b/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.md
index 506c0ef5d..3cfaefb6e 100644
--- a/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.md
+++ b/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.md
@@ -3,8 +3,9 @@ layout: page
title: "IBM PC (Model 5150, 64Kb) with Color Display and Debugger"
permalink: /devices/pc/machine/5150/cga/64kb/donkey/debugger/
machines:
- - type: pc-dbg
+ - type: pc
id: ibm5150
+ debugger: true
---
{% include machine.html id="ibm5150" %}
diff --git a/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml b/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml
index bb72a4ce2..f6f64d05e 100644
--- a/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml
+++ b/devices/pc/machine/5150/cga/64kb/donkey/debugger/machine.xml
@@ -7,11 +7,11 @@
+
-
diff --git a/devices/pc/machine/5150/cga/64kb/donkey/machine.xml b/devices/pc/machine/5150/cga/64kb/donkey/machine.xml
index eb4913319..47e1ec2fa 100644
--- a/devices/pc/machine/5150/cga/64kb/donkey/machine.xml
+++ b/devices/pc/machine/5150/cga/64kb/donkey/machine.xml
@@ -7,11 +7,11 @@
-
+
+
Run
Reset
-
diff --git a/devices/pc/machine/5150/cga/64kb/donkey/thumbnail.jpg b/devices/pc/machine/5150/cga/64kb/donkey/thumbnail.jpg
index 37482ab4e..95c1e7363 100644
Binary files a/devices/pc/machine/5150/cga/64kb/donkey/thumbnail.jpg and b/devices/pc/machine/5150/cga/64kb/donkey/thumbnail.jpg differ
diff --git a/devices/pc/machine/5150/cga/64kb/softkbd/machine.md b/devices/pc/machine/5150/cga/64kb/softkbd/machine.md
index d48b70642..7de628311 100644
--- a/devices/pc/machine/5150/cga/64kb/softkbd/machine.md
+++ b/devices/pc/machine/5150/cga/64kb/softkbd/machine.md
@@ -3,8 +3,9 @@ layout: page
title: "IBM PC (Model 5150, 64Kb) with Color Display and Soft Keyboard"
permalink: /devices/pc/machine/5150/cga/64kb/softkbd/
machines:
- - type: pc-dbg
+ - type: pc
id: ibm5150
+ debugger: true
---
{% include machine.html id="ibm5150" %}
diff --git a/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml b/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml
index 6d1f4a908..5dd3bd678 100644
--- a/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml
+++ b/devices/pc/machine/5150/cga/64kb/softkbd/machine.xml
@@ -8,10 +8,10 @@
+
-
diff --git a/devices/pc/machine/5150/dual/64kb/machine.xml b/devices/pc/machine/5150/dual/64kb/machine.xml
index 15ea5aee7..019b7e7dc 100644
--- a/devices/pc/machine/5150/dual/64kb/machine.xml
+++ b/devices/pc/machine/5150/dual/64kb/machine.xml
@@ -8,11 +8,11 @@
-
+
+
Run
Reset
-
diff --git a/devices/pc/machine/5150/mda/64kb/debugger/machine.md b/devices/pc/machine/5150/mda/64kb/debugger/machine.md
index 455f2a3ad..ff449be7a 100644
--- a/devices/pc/machine/5150/mda/64kb/debugger/machine.md
+++ b/devices/pc/machine/5150/mda/64kb/debugger/machine.md
@@ -3,8 +3,9 @@ layout: page
title: "IBM PC (Model 5150, 64Kb) with Monochrome Display and Debugger"
permalink: /devices/pc/machine/5150/mda/64kb/debugger/
machines:
- - type: pc-dbg
+ - type: pc
id: ibm5150
+ debugger: true
---
{% include machine.html id="ibm5150" %}
diff --git a/devices/pc/machine/5150/mda/64kb/debugger/machine.xml b/devices/pc/machine/5150/mda/64kb/debugger/machine.xml
index d6988102e..f450dba39 100644
--- a/devices/pc/machine/5150/mda/64kb/debugger/machine.xml
+++ b/devices/pc/machine/5150/mda/64kb/debugger/machine.xml
@@ -7,11 +7,11 @@
+
-
diff --git a/devices/pc/machine/5150/mda/64kb/machine.xml b/devices/pc/machine/5150/mda/64kb/machine.xml
index 938edcb37..4a8357bbf 100644
--- a/devices/pc/machine/5150/mda/64kb/machine.xml
+++ b/devices/pc/machine/5150/mda/64kb/machine.xml
@@ -7,11 +7,11 @@
-
+
+
Run
Reset
-
diff --git a/devices/pc/machine/5150/mda/64kb/softkbd/machine.md b/devices/pc/machine/5150/mda/64kb/softkbd/machine.md
index 2ededfea9..20d2b1a60 100644
--- a/devices/pc/machine/5150/mda/64kb/softkbd/machine.md
+++ b/devices/pc/machine/5150/mda/64kb/softkbd/machine.md
@@ -3,8 +3,9 @@ layout: page
title: "IBM PC (Model 5150, 64Kb) with Monochrome Display and Soft Keyboard"
permalink: /devices/pc/machine/5150/mda/64kb/softkbd/
machines:
- - type: pc-dbg
+ - type: pc
id: ibm5150
+ debugger: true
---
{% include machine.html id="ibm5150" %}
diff --git a/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml b/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml
index 80e6589e2..271f63de8 100644
--- a/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml
+++ b/devices/pc/machine/5150/mda/64kb/softkbd/machine.xml
@@ -8,10 +8,10 @@
+
-
diff --git a/devices/pc/machine/5160/cga/256kb/array/machine.xml b/devices/pc/machine/5160/cga/256kb/array/machine.xml
index c467bcb71..a049dafe2 100644
--- a/devices/pc/machine/5160/cga/256kb/array/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/array/machine.xml
@@ -8,12 +8,12 @@
+
Run
Reset
-
diff --git a/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.md b/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.md
index 697e9500f..61ac5f06b 100644
--- a/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.md
+++ b/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.md
@@ -3,8 +3,9 @@ layout: page
title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display and Debugger"
permalink: /devices/pc/machine/5160/cga/256kb/demo/debugger/
machines:
- - type: pc-dbg
+ - type: pc
id: ibm5160
+ debugger: true
---
{% include machine.html id="ibm5160" %}
diff --git a/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml b/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml
index 8a713adee..8bb5076d3 100644
--- a/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/demo/debugger/machine.xml
@@ -8,11 +8,11 @@
+
-
diff --git a/devices/pc/machine/5160/cga/256kb/demo/machine.xml b/devices/pc/machine/5160/cga/256kb/demo/machine.xml
index dbb2d8387..888d2ed58 100644
--- a/devices/pc/machine/5160/cga/256kb/demo/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/demo/machine.xml
@@ -8,12 +8,12 @@
+
Run
Reset
-
diff --git a/devices/pc/machine/5160/cga/256kb/demo/thumbnail.jpg b/devices/pc/machine/5160/cga/256kb/demo/thumbnail.jpg
index 8a842b7e2..03dae06b8 100644
Binary files a/devices/pc/machine/5160/cga/256kb/demo/thumbnail.jpg and b/devices/pc/machine/5160/cga/256kb/demo/thumbnail.jpg differ
diff --git a/devices/pc/machine/5160/cga/256kb/softkbd/machine.md b/devices/pc/machine/5160/cga/256kb/softkbd/machine.md
index 9b4febff5..abc1a864d 100644
--- a/devices/pc/machine/5160/cga/256kb/softkbd/machine.md
+++ b/devices/pc/machine/5160/cga/256kb/softkbd/machine.md
@@ -3,8 +3,9 @@ layout: page
title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display and Soft Keyboard"
permalink: /devices/pc/machine/5160/cga/256kb/softkbd/
machines:
- - type: pc-dbg
+ - type: pc
id: ibm5160
+ debugger: true
---
{% include machine.html id="ibm5160" %}
diff --git a/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml b/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml
index 33ff12325..f04626833 100644
--- a/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/softkbd/machine.xml
@@ -9,10 +9,10 @@
+
-
diff --git a/devices/pc/machine/5160/cga/256kb/win101/debugger/README.md b/devices/pc/machine/5160/cga/256kb/win101/debugger/README.md
index a3b821760..ab13af023 100644
--- a/devices/pc/machine/5160/cga/256kb/win101/debugger/README.md
+++ b/devices/pc/machine/5160/cga/256kb/win101/debugger/README.md
@@ -5,8 +5,9 @@ permalink: /devices/pc/machine/5160/cga/256kb/win101/debugger/
redirect_from:
- /configs/pc/machines/5160/cga/256kb/win101/debugger/
machines:
- - type: pc-dbg
+ - type: pc
id: ibm5160
+ debugger: true
---
IBM PC XT with Debugger running Windows 1.01
diff --git a/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml b/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml
index ac7756b3e..5581bcc1c 100644
--- a/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/win101/debugger/machine.xml
@@ -1,18 +1,18 @@
- IBM PC XT (Model 5160) running Windows v1.01
+ IBM PC XT (Model 5160) running Windows 1.01
+
-
diff --git a/devices/pc/machine/5160/cga/256kb/win101/machine.xml b/devices/pc/machine/5160/cga/256kb/win101/machine.xml
index 6871274b3..698da2487 100644
--- a/devices/pc/machine/5160/cga/256kb/win101/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/win101/machine.xml
@@ -8,12 +8,12 @@
-
+
+
Run
Reset
-
diff --git a/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.md b/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.md
index 68d257ae1..02c4a807d 100644
--- a/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.md
+++ b/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.md
@@ -3,8 +3,9 @@ layout: page
title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Color Display and Soft Keyboard running Windows 1.01"
permalink: /devices/pc/machine/5160/cga/256kb/win101/softkbd/
machines:
- - type: pc-dbg
+ - type: pc
id: ibm5160
+ debugger: true
---
{% include machine.html id="ibm5160" %}
diff --git a/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml b/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml
index bd58f8a53..2ece700e0 100644
--- a/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml
+++ b/devices/pc/machine/5160/cga/256kb/win101/softkbd/machine.xml
@@ -9,10 +9,10 @@
+
-
diff --git a/devices/pc/machine/5160/cga/256kb/win101/thumbnail.jpg b/devices/pc/machine/5160/cga/256kb/win101/thumbnail.jpg
index 1135f54a6..4afb6a594 100644
Binary files a/devices/pc/machine/5160/cga/256kb/win101/thumbnail.jpg and b/devices/pc/machine/5160/cga/256kb/win101/thumbnail.jpg differ
diff --git a/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.md b/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.md
index 1ca355e45..41fe9dca7 100644
--- a/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.md
+++ b/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.md
@@ -3,8 +3,9 @@ layout: page
title: "IBM PC XT (Model 5160, 512Kb, 10Mb Drive) with Color Display and Soft Keyboard running Windows 1.01"
permalink: /devices/pc/machine/5160/cga/512kb/win101/softkbd/
machines:
- - type: pc-dbg
+ - type: pc
id: ibm5160
+ debugger: true
---
{% include machine.html id="ibm5160" %}
diff --git a/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml b/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml
index 8ff4a3fec..bfe97a751 100644
--- a/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml
+++ b/devices/pc/machine/5160/cga/512kb/win101/softkbd/machine.xml
@@ -9,10 +9,10 @@
+
-
diff --git a/devices/pc/machine/5160/cga/640kb/debugger/machine.md b/devices/pc/machine/5160/cga/640kb/debugger/machine.md
index efe541a7f..68378a222 100644
--- a/devices/pc/machine/5160/cga/640kb/debugger/machine.md
+++ b/devices/pc/machine/5160/cga/640kb/debugger/machine.md
@@ -3,8 +3,9 @@ layout: page
title: "IBM PC XT (Model 5160, 640Kb, 10Mb Drive) with Color Display and Debugger"
permalink: /devices/pc/machine/5160/cga/640kb/debugger/
machines:
- - type: pc-dbg
+ - type: pc
id: ibm5160
+ debugger: true
---
{% include machine.html id="ibm5160" %}
diff --git a/devices/pc/machine/5160/cga/640kb/debugger/machine.xml b/devices/pc/machine/5160/cga/640kb/debugger/machine.xml
index 4197d90f3..4d80320af 100644
--- a/devices/pc/machine/5160/cga/640kb/debugger/machine.xml
+++ b/devices/pc/machine/5160/cga/640kb/debugger/machine.xml
@@ -9,10 +9,10 @@
+
-
diff --git a/devices/pc/machine/5160/cga/640kb/dos400m/README.md b/devices/pc/machine/5160/cga/640kb/dos400m/README.md
index 49704bc02..d8b69200b 100644
--- a/devices/pc/machine/5160/cga/640kb/dos400m/README.md
+++ b/devices/pc/machine/5160/cga/640kb/dos400m/README.md
@@ -6,8 +6,9 @@ redirect_from:
- /configs/pc/machines/5160/cga/640kb/dos400m/
- /videos/pcjs/
machines:
- - type: pc-dbg
+ - type: pc
id: ibm5160
+ debugger: true
---
Multitasking MS-DOS 4.00
diff --git a/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml b/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml
index 349be607e..090d0167d 100644
--- a/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml
+++ b/devices/pc/machine/5160/cga/640kb/dos400m/machine.xml
@@ -9,10 +9,10 @@
+
-
diff --git a/devices/pc/machine/5160/cga/640kb/machine.xml b/devices/pc/machine/5160/cga/640kb/machine.xml
index 9fbe54108..ac088c59e 100644
--- a/devices/pc/machine/5160/cga/640kb/machine.xml
+++ b/devices/pc/machine/5160/cga/640kb/machine.xml
@@ -8,12 +8,12 @@
-
+
+
Run
Reset
-
diff --git a/devices/pc/machine/5160/ega/256kb/debugger/machine.md b/devices/pc/machine/5160/ega/256kb/debugger/machine.md
index f95d13421..fa1b0c8b2 100644
--- a/devices/pc/machine/5160/ega/256kb/debugger/machine.md
+++ b/devices/pc/machine/5160/ega/256kb/debugger/machine.md
@@ -3,8 +3,9 @@ layout: page
title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with EGA Display and Debugger"
permalink: /devices/pc/machine/5160/ega/256kb/debugger/
machines:
- - type: pc-dbg
+ - type: pc
id: ibm5160
+ debugger: true
---
{% include machine.html id="ibm5160" %}
diff --git a/devices/pc/machine/5160/ega/256kb/debugger/machine.xml b/devices/pc/machine/5160/ega/256kb/debugger/machine.xml
index a0a19b9bd..4883618ce 100644
--- a/devices/pc/machine/5160/ega/256kb/debugger/machine.xml
+++ b/devices/pc/machine/5160/ega/256kb/debugger/machine.xml
@@ -10,10 +10,10 @@
+
-
diff --git a/devices/pc/machine/5160/ega/640kb/array/machine.xml b/devices/pc/machine/5160/ega/640kb/array/machine.xml
index 746863f89..38c915a3b 100644
--- a/devices/pc/machine/5160/ega/640kb/array/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/array/machine.xml
@@ -9,11 +9,11 @@
+
Fast
-
diff --git a/devices/pc/machine/5160/ega/640kb/debugger/machine.md b/devices/pc/machine/5160/ega/640kb/debugger/machine.md
index 6963782e2..5431b2035 100644
--- a/devices/pc/machine/5160/ega/640kb/debugger/machine.md
+++ b/devices/pc/machine/5160/ega/640kb/debugger/machine.md
@@ -3,8 +3,9 @@ layout: page
title: "IBM PC XT (Model 5160, 640Kb, 10Mb Drive) with EGA Display and Debugger"
permalink: /devices/pc/machine/5160/ega/640kb/debugger/
machines:
- - type: pc-dbg
+ - type: pc
id: ibm5160
+ debugger: true
---
{% include machine.html id="ibm5160" %}
diff --git a/devices/pc/machine/5160/ega/640kb/debugger/machine.xml b/devices/pc/machine/5160/ega/640kb/debugger/machine.xml
index f47983f93..201bf6153 100644
--- a/devices/pc/machine/5160/ega/640kb/debugger/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/debugger/machine.xml
@@ -10,10 +10,10 @@
+
-
diff --git a/devices/pc/machine/5160/ega/640kb/machine.xml b/devices/pc/machine/5160/ega/640kb/machine.xml
index 026f1a440..dd45a2b6e 100644
--- a/devices/pc/machine/5160/ega/640kb/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/machine.xml
@@ -10,8 +10,8 @@
-
+
diff --git a/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.md b/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.md
index 7a647801a..5e15005aa 100644
--- a/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.md
+++ b/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.md
@@ -3,8 +3,9 @@ layout: page
title: "IBM PC XT (Model 5160, 640Kb, 10Mb Drive) with EGA Display and Debugger running Windows 1.01"
permalink: /devices/pc/machine/5160/ega/640kb/win101/debugger/
machines:
- - type: pc-dbg
+ - type: pc
id: ibm5160
+ debugger: true
---
{% include machine.html id="ibm5160" %}
diff --git a/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml b/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml
index 4da86f5d2..d39a6e5d2 100644
--- a/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/win101/debugger/machine.xml
@@ -10,10 +10,10 @@
+
-
diff --git a/devices/pc/machine/5160/ega/640kb/win101/machine.xml b/devices/pc/machine/5160/ega/640kb/win101/machine.xml
index db2913330..a27aceb3b 100644
--- a/devices/pc/machine/5160/ega/640kb/win101/machine.xml
+++ b/devices/pc/machine/5160/ega/640kb/win101/machine.xml
@@ -9,11 +9,11 @@
+
Fast
-
diff --git a/devices/pc/machine/5160/mda/256kb/debugger/machine.md b/devices/pc/machine/5160/mda/256kb/debugger/machine.md
index f0649d6a0..6af02b4f6 100644
--- a/devices/pc/machine/5160/mda/256kb/debugger/machine.md
+++ b/devices/pc/machine/5160/mda/256kb/debugger/machine.md
@@ -3,8 +3,9 @@ layout: page
title: "IBM PC XT (Model 5160, 256Kb, 10Mb Drive) with Monochrome Display and Debugger"
permalink: /devices/pc/machine/5160/mda/256kb/debugger/
machines:
- - type: pc-dbg
+ - type: pc
id: ibm5160
+ debugger: true
---
{% include machine.html id="ibm5160" %}
diff --git a/devices/pc/machine/5160/mda/256kb/debugger/machine.xml b/devices/pc/machine/5160/mda/256kb/debugger/machine.xml
index 041cfe4e2..3a8fab059 100644
--- a/devices/pc/machine/5160/mda/256kb/debugger/machine.xml
+++ b/devices/pc/machine/5160/mda/256kb/debugger/machine.xml
@@ -9,10 +9,10 @@
+
-
diff --git a/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.md b/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.md
index 821d3f7b2..04a45dc58 100644
--- a/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.md
+++ b/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.md
@@ -3,8 +3,9 @@ layout: page
title: "IBM PC XT (Model 5160, 80188, 256Kb) with Monochrome Display and Debugger"
permalink: /devices/pc/machine/5160/mda/256kb/fake188/debugger/
machines:
- - type: pc-dbg
+ - type: pc
id: ibm5160
+ debugger: true
---
{% include machine.html id="ibm5160" %}
diff --git a/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml b/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml
index f855dbc34..5eec233c6 100644
--- a/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml
+++ b/devices/pc/machine/5160/mda/256kb/fake188/debugger/machine.xml
@@ -9,10 +9,7 @@
-
-
-
-
+
None
@@ -24,9 +21,13 @@
Load
-
-
+ Save
+
+
+
+
+
diff --git a/devices/pc/machine/5160/mda/256kb/fake188/machine.xml b/devices/pc/machine/5160/mda/256kb/fake188/machine.xml
index 8011d7bf1..d0e5ac1d7 100644
--- a/devices/pc/machine/5160/mda/256kb/fake188/machine.xml
+++ b/devices/pc/machine/5160/mda/256kb/fake188/machine.xml
@@ -8,11 +8,7 @@
-
- Run
-
-
-
+
None
@@ -23,10 +19,15 @@
- Load
+ Load
+ Save
+
+ Run
+
+
diff --git a/devices/pc/machine/5160/mda/256kb/machine.xml b/devices/pc/machine/5160/mda/256kb/machine.xml
index 24f6ae5be..2ee0dcf3b 100644
--- a/devices/pc/machine/5160/mda/256kb/machine.xml
+++ b/devices/pc/machine/5160/mda/256kb/machine.xml
@@ -9,8 +9,8 @@
-
+
diff --git a/devices/pc/machine/5160/mda/64kb/softkbd/machine.md b/devices/pc/machine/5160/mda/64kb/softkbd/machine.md
index 8fa3a74cd..1865daec1 100644
--- a/devices/pc/machine/5160/mda/64kb/softkbd/machine.md
+++ b/devices/pc/machine/5160/mda/64kb/softkbd/machine.md
@@ -3,8 +3,9 @@ layout: page
title: "IBM PC XT (Model 5160, 64Kb, 10Mb Drive) with Monochrome Display and Soft Keyboard"
permalink: /devices/pc/machine/5160/mda/64kb/softkbd/
machines:
- - type: pc-dbg
+ - type: pc
id: ibm5160
+ debugger: true
---
{% include machine.html id="ibm5160" %}
diff --git a/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.md b/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.md
index 4a6493d18..f2dc78165 100644
--- a/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.md
+++ b/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.md
@@ -3,8 +3,9 @@ layout: page
title: "IBM PC AT (Model 5170, 1152Kb) with EGA Display and 20Mb Hard Disk"
permalink: /devices/pc/machine/5170/ega/1152kb/rev1/debugger/
machines:
- - type: pc-dbg
+ - type: pc
id: ibm5170
+ debugger: true
---
{% include machine.html id="ibm5170" %}
diff --git a/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.xml
index c7b878527..1f93627bd 100644
--- a/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.xml
+++ b/devices/pc/machine/5170/ega/1152kb/rev1/debugger/machine.xml
@@ -9,10 +9,10 @@
+
-
diff --git a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.md b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.md
index 7b3214bae..bc9b03a30 100644
--- a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.md
+++ b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.md
@@ -3,8 +3,9 @@ layout: page
title: "IBM PC AT (Model 5170, 1152Kb) with EGA Display and 20Mb Hard Disk"
permalink: /devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/
machines:
- - type: pc-dbg
+ - type: pc
id: ibm5170rev3
+ debugger: true
---
{% include machine.html id="ibm5170rev3" %}
diff --git a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml
index 10ef6da9d..dec6370f4 100644
--- a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml
+++ b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/backtrack/machine.xml
@@ -9,9 +9,9 @@
+
-
diff --git a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.md b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.md
index 1400f2dfd..b885a60a9 100644
--- a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.md
+++ b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.md
@@ -3,8 +3,9 @@ layout: page
title: "IBM PC AT (Model 5170, 1152Kb) with EGA Display and 20Mb Hard Disk"
permalink: /devices/pc/machine/5170/ega/1152kb/rev3/debugger/
machines:
- - type: pc-dbg
+ - type: pc
id: ibm5170
+ debugger: true
---
{% include machine.html id="ibm5170" %}
diff --git a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml
index 3197415df..5ce3826ca 100644
--- a/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml
+++ b/devices/pc/machine/5170/ega/1152kb/rev3/debugger/machine.xml
@@ -9,11 +9,11 @@
+
-
-
+
diff --git a/devices/pc/machine/5170/ega/1152kb/win300/README.md b/devices/pc/machine/5170/ega/1152kb/win300/README.md
new file mode 100644
index 000000000..997f8cd15
--- /dev/null
+++ b/devices/pc/machine/5170/ega/1152kb/win300/README.md
@@ -0,0 +1,13 @@
+---
+layout: page
+title: "IBM PC AT (Model 5170, 1152Kb, 20Mb Drive) with EGA Display running Windows 3.00"
+permalink: /devices/pc/machine/5170/ega/1152kb/win300/
+machines:
+ - type: pc
+ id: ibm5170
+---
+
+IBM PC AT running Windows 3.00
+---
+
+{% include machine.html id="ibm5170" %}
diff --git a/devices/pc/machine/5170/ega/1152kb/win300/debugger/README.md b/devices/pc/machine/5170/ega/1152kb/win300/debugger/README.md
new file mode 100644
index 000000000..02ec17718
--- /dev/null
+++ b/devices/pc/machine/5170/ega/1152kb/win300/debugger/README.md
@@ -0,0 +1,14 @@
+---
+layout: page
+title: "IBM PC AT (Model 5170, 1152Kb, 20Mb Drive) with EGA Display and Debugger running Windows 3.00"
+permalink: /devices/pc/machine/5170/ega/1152kb/win300/debugger/
+machines:
+ - type: pc
+ id: ibm5170
+ debugger: true
+---
+
+IBM PC AT running Windows 3.00
+---
+
+{% include machine.html id="ibm5170" %}
diff --git a/devices/pc/machine/5170/ega/1152kb/win300/debugger/machine.xml b/devices/pc/machine/5170/ega/1152kb/win300/debugger/machine.xml
new file mode 100644
index 000000000..d92a39d61
--- /dev/null
+++ b/devices/pc/machine/5170/ega/1152kb/win300/debugger/machine.xml
@@ -0,0 +1,21 @@
+
+
+
+ IBM PC AT (8Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/devices/pc/machine/5170/ega/1152kb/win300/machine.xml b/devices/pc/machine/5170/ega/1152kb/win300/machine.xml
new file mode 100644
index 000000000..9c234f25d
--- /dev/null
+++ b/devices/pc/machine/5170/ega/1152kb/win300/machine.xml
@@ -0,0 +1,23 @@
+
+
+
+ IBM PC AT (8Mhz), 128Kb EGA, 1152Kb RAM, 20Mb Hard Disk
+
+
+
+
+
+
+
+
+
+ Run
+ Reset
+ Speed
+
+
+
+
+
+
+
diff --git a/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.md b/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.md
index 3686baf40..b39328195 100644
--- a/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.md
+++ b/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.md
@@ -3,8 +3,9 @@ layout: page
title: "IBM PC AT (Model 5170, 640Kb) with EGA Display"
permalink: /devices/pc/machine/5170/ega/640kb/rev1/debugger/
machines:
- - type: pc-dbg
+ - type: pc
id: ibm5170
+ debugger: true
---
{% include machine.html id="ibm5170" %}
diff --git a/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml b/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml
index b5f5a9c3a..b8c4624cf 100644
--- a/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml
+++ b/devices/pc/machine/5170/ega/640kb/rev1/debugger/machine.xml
@@ -8,10 +8,10 @@
+
-
diff --git a/devices/pc/machine/5170/ega/640kb/rev1/machine.xml b/devices/pc/machine/5170/ega/640kb/rev1/machine.xml
index 219a5c0d1..ce6a18992 100644
--- a/devices/pc/machine/5170/ega/640kb/rev1/machine.xml
+++ b/devices/pc/machine/5170/ega/640kb/rev1/machine.xml
@@ -8,8 +8,8 @@
-
+
diff --git a/devices/pc/machine/5170/vga/2048kb/win310/README.md b/devices/pc/machine/5170/vga/2048kb/win310/README.md
new file mode 100644
index 000000000..c233cd251
--- /dev/null
+++ b/devices/pc/machine/5170/vga/2048kb/win310/README.md
@@ -0,0 +1,13 @@
+---
+layout: page
+title: "IBM PC AT (Model 5170, 2Mb, 20Mb Drive) with VGA Display running Windows 3.10"
+permalink: /devices/pc/machine/5170/vga/2048kb/win310/
+machines:
+ - type: pc
+ id: ibm5170
+---
+
+IBM PC AT running Windows 3.10
+---
+
+{% include machine.html id="ibm5170" %}
diff --git a/devices/pc/machine/5170/vga/2048kb/win310/debugger/README.md b/devices/pc/machine/5170/vga/2048kb/win310/debugger/README.md
new file mode 100644
index 000000000..dad0421c9
--- /dev/null
+++ b/devices/pc/machine/5170/vga/2048kb/win310/debugger/README.md
@@ -0,0 +1,14 @@
+---
+layout: page
+title: "IBM PC AT (Model 5170, 2Mb, 20Mb Drive) with VGA Display and Debugger running Windows 3.10"
+permalink: /devices/pc/machine/5170/vga/2048kb/win310/debugger/
+machines:
+ - type: pc
+ id: ibm5170
+ debugger: true
+---
+
+IBM PC AT running Windows 3.10
+---
+
+{% include machine.html id="ibm5170" %}
diff --git a/devices/pc/machine/5170/vga/2048kb/win310/debugger/machine.xml b/devices/pc/machine/5170/vga/2048kb/win310/debugger/machine.xml
new file mode 100644
index 000000000..7c4847e90
--- /dev/null
+++ b/devices/pc/machine/5170/vga/2048kb/win310/debugger/machine.xml
@@ -0,0 +1,21 @@
+
+
+
+ IBM PC AT (8Mhz), VGA, 2Mb RAM, 20Mb Hard Disk
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/devices/pc/machine/5170/vga/2048kb/win310/machine.xml b/devices/pc/machine/5170/vga/2048kb/win310/machine.xml
new file mode 100644
index 000000000..00c80bf0f
--- /dev/null
+++ b/devices/pc/machine/5170/vga/2048kb/win310/machine.xml
@@ -0,0 +1,23 @@
+
+
+
+ IBM PC AT (8Mhz), VGA, 2Mb RAM, 20Mb Hard Disk
+
+
+
+
+
+
+
+
+
+ Run
+ Reset
+ Speed
+
+
+
+
+
+
+
diff --git a/devices/pc/machine/README.md b/devices/pc/machine/README.md
index 55bddaa68..daf54849e 100644
--- a/devices/pc/machine/README.md
+++ b/devices/pc/machine/README.md
@@ -85,7 +85,7 @@ Our pre-built [Model 5160](/devices/pc/machine/5160/) machines include:
* [IBM PC XT (256Kb, 10Mb Drive) with Color Display running Windows 1.01](/devices/pc/machine/5160/cga/256kb/win101/)
* [IBM PC XT (256Kb, 10Mb Drive) with Color Display and Debugger running Windows 1.01](/devices/pc/machine/5160/cga/256kb/win101/debugger/)
* [IBM PC XT (256Kb, 10Mb Drive) with Color Display and Soft Keyboard running Windows 1.01](/devices/pc/machine/5160/cga/256kb/win101/softkbd/)
-* [IBM PC XT (256Kb, 10Mb Drive) Machine Array with CGA Displays](/devices/pc/machine/5160/cga/256kb/array/)
+* [IBM PC XT (256Kb, 10Mb Drive) Machine Array with Color Displays](/devices/pc/machine/5160/cga/256kb/array/)
* [IBM PC XT (256Kb, 10Mb Drive) with EGA Display and Debugger](/devices/pc/machine/5160/ega/256kb/debugger/)
* [IBM PC XT (256Kb, 10Mb Drive) with Monochrome Display and Debugger](/devices/pc/machine/5160/mda/256kb/debugger/)
* [IBM PC XT (512Kb, 10Mb Drive) with Color Display and Soft Keyboard running Windows 1.01](/devices/pc/machine/5160/cga/512kb/win101/softkbd/)
@@ -100,6 +100,10 @@ Our pre-built [Model 5160](/devices/pc/machine/5160/) machines include:
### Model 5170 Machine Configurations
-* [IBM PC AT (6Mhz), EGA, 640K, Debugger](/devices/pc/machine/5170/ega/640kb/rev1/debugger/)
-* [IBM PC AT (6Mhz), EGA, 1152Kb, 20Mb Drive, Debugger](/devices/pc/machine/5170/ega/1152kb/rev1/debugger/)
-* [IBM PC AT (8Mhz), EGA, 1152Kb, 20Mb Drive, Debugger](/devices/pc/machine/5170/ega/1152kb/rev3/debugger/)
+* [IBM PC AT (6Mhz, 640Kb) with EGA Display and Debugger](/devices/pc/machine/5170/ega/640kb/rev1/debugger/)
+* [IBM PC AT (6Mhz, 1152Kb, 20Mb Drive) with EGA Display and Debugger](/devices/pc/machine/5170/ega/1152kb/rev1/debugger/)
+* [IBM PC AT (8Mhz, 1152Kb, 20Mb Drive) with EGA Display and Debugger](/devices/pc/machine/5170/ega/1152kb/rev3/debugger/)
+* [IBM PC AT (8Mhz, 1152Kb, 20Mb Drive) with EGA Display running Windows 3.00](/devices/pc/machine/5170/ega/1152kb/win300/)
+* [IBM PC AT (8Mhz, 1152Kb, 20Mb Drive) with EGA Display and Debugger running Windows 3.00](/devices/pc/machine/5170/ega/1152kb/win300/)
+* [IBM PC AT (8Mhz, 2Mb, 20Mb Drive) with VGA Display running Windows 3.10](/devices/pc/machine/5170/vga/2048kb/win310/)
+* [IBM PC AT (8Mhz, 2Mb, 20Mb Drive) with VGA Display and Debugger running Windows 3.10](/devices/pc/machine/5170/vga/2048kb/win310/debugger/)
diff --git a/devices/pc/machine/compaq/README.md b/devices/pc/machine/compaq/README.md
index 7a14f0542..925f2d941 100644
--- a/devices/pc/machine/compaq/README.md
+++ b/devices/pc/machine/compaq/README.md
@@ -10,22 +10,22 @@ COMPAQ Machines
This is an evolving (and roughly chronological) list of COMPAQ machines from the 1980s, which PCjs may eventually
support:
- + [COMPAQ Portable](#compaq-portable)
- + [COMPAQ [Portable] Plus](#compaq-portable-plus-aka-compaq-plus)
- + [COMPAQ DeskPro](#compaq-deskpro)
- + [COMPAQ DeskPro 286](#compaq-deskpro-286)
- + [COMPAQ Portable 286](#compaq-portable-286)
- + [COMPAQ Portable II](#compaq-portable-ii)
- + [COMPAQ DeskPro 386](#compaq-deskpro-386)
- + [COMPAQ Portable III](#compaq-portable-iii)
- + COMPAQ DeskPro 386/20
- + [COMPAQ Portable 386](#compaq-portable-386)
- + COMPAQ DeskPro 386/25
- + COMPAQ DeskPro 386s
- + [COMPAQ DeskPro 386/20e](#compaq-38620e)
- + [COMPAQ SLT Series](#compaq-slt-series) (SLT/286)
- + COMPAQ DeskPro 386/33
- + [COMPAQ LTE Series](#compaq-lte-series) (LTE and LTE/286)
+ - [COMPAQ Portable](#compaq-portable)
+ - [COMPAQ [Portable] Plus](#compaq-portable-plus-aka-compaq-plus)
+ - [COMPAQ DeskPro](#compaq-deskpro)
+ - [COMPAQ DeskPro 286](#compaq-deskpro-286)
+ - [COMPAQ Portable 286](#compaq-portable-286)
+ - [COMPAQ Portable II](#compaq-portable-ii)
+ - [COMPAQ DeskPro 386](#compaq-deskpro-386)
+ - [COMPAQ Portable III](#compaq-portable-iii)
+ - COMPAQ DeskPro 386/20
+ - [COMPAQ Portable 386](#compaq-portable-386)
+ - COMPAQ DeskPro 386/25
+ - COMPAQ DeskPro 386s
+ - [COMPAQ DeskPro 386/20e](#compaq-38620e)
+ - [COMPAQ SLT Series](#compaq-slt-series) (SLT/286)
+ - COMPAQ DeskPro 386/33
+ - [COMPAQ LTE Series](#compaq-lte-series) (LTE and LTE/286)
At the moment, only the [COMPAQ DeskPro 386](deskpro386/) is supported, but now that we have ROMs for a few other
COMPAQ machines -- most importantly, their **first** machine, the [COMPAQ Portable](/devices/pc/rom/compaq/bios/portable/) --
@@ -136,7 +136,8 @@ COMPAQ DeskPro 386
Released in late 1986.
-PCjs has detailed information about the [DeskPro 386 ROMs](/devices/pc/rom/compaq/bios/deskpro386/) and system boards.
+PCjs has detailed information about the [DeskPro 386 ROMs](/devices/pc/rom/compaq/bios/deskpro386/) and system boards,
+along with a number of [DeskPro 386 Machines](/devices/pc/machine/compaq/deskpro386/).
I also have the hard-to-find **COMPAQ Technical Reference Guide** for the DeskPro 386/25 (Vol. 1), which I'll post
at a later date.
diff --git a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.md b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.md
index b4e1612e3..52190d807 100644
--- a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.md
+++ b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.md
@@ -3,8 +3,9 @@ layout: page
title: "COMPAQ DeskPro 386 (2Mb) with COMPAQ EGA"
permalink: /devices/pc/machine/compaq/deskpro386/ega/2048kb/
machines:
- - type: pc-dbg
+ - type: pc
id: deskpro386
+ debugger: true
---
{% include machine.html id="deskpro386" %}
diff --git a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml
index f75fb9301..167a80ff4 100644
--- a/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/ega/2048kb/machine.xml
@@ -10,10 +10,10 @@
+
-
diff --git a/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.md b/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.md
index 020c32689..5e6b37a76 100644
--- a/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.md
+++ b/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.md
@@ -3,8 +3,9 @@ layout: page
title: "COMPAQ DeskPro 386 (4Mb) with COMPAQ EGA"
permalink: /devices/pc/machine/compaq/deskpro386/ega/4096kb/
machines:
- - type: pc-dbg
+ - type: pc
id: deskpro386
+ debugger: true
---
{% include machine.html id="deskpro386" %}
diff --git a/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml b/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml
index d257757cc..deb319163 100644
--- a/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/ega/4096kb/machine.xml
@@ -10,10 +10,10 @@
+
-
diff --git a/devices/pc/machine/compaq/deskpro386/other/2048kb/machine.xml b/devices/pc/machine/compaq/deskpro386/other/2048kb/machine.xml
index ad5a758c6..4beac6025 100644
--- a/devices/pc/machine/compaq/deskpro386/other/2048kb/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/other/2048kb/machine.xml
@@ -10,10 +10,10 @@
+
-
diff --git a/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.md b/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.md
index d890f0112..663474264 100644
--- a/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.md
+++ b/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.md
@@ -3,8 +3,9 @@ layout: page
title: "COMPAQ DeskPro 386 (2Mb) with IBM VGA"
permalink: /devices/pc/machine/compaq/deskpro386/vga/2048kb/
machines:
- - type: pc-dbg
+ - type: pc
id: deskpro386
+ debugger: true
---
{% include machine.html id="deskpro386" %}
diff --git a/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml b/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml
index 743822c4e..3902af91b 100644
--- a/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/vga/2048kb/machine.xml
@@ -10,8 +10,8 @@
-
+
diff --git a/devices/pc/machine/compaq/deskpro386/vga/4096kb/README.md b/devices/pc/machine/compaq/deskpro386/vga/4096kb/README.md
index 9a3bfc988..0cf5eaf2f 100644
--- a/devices/pc/machine/compaq/deskpro386/vga/4096kb/README.md
+++ b/devices/pc/machine/compaq/deskpro386/vga/4096kb/README.md
@@ -3,8 +3,9 @@ layout: page
title: "COMPAQ DeskPro 386 (4Mb) with IBM VGA"
permalink: /devices/pc/machine/compaq/deskpro386/vga/4096kb/
machines:
- - type: pc-dbg
+ - type: pc
id: deskpro386
+ debugger: true
---
Windows 95 Test Machine
diff --git a/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml b/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml
index 8c92cf932..223ade0e5 100644
--- a/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml
+++ b/devices/pc/machine/compaq/deskpro386/vga/4096kb/machine.xml
@@ -10,8 +10,8 @@
-
+
diff --git a/devices/pc/machine/custom/README.md b/devices/pc/machine/custom/README.md
index 80d34984d..9eda8c8fe 100644
--- a/devices/pc/machine/custom/README.md
+++ b/devices/pc/machine/custom/README.md
@@ -7,7 +7,7 @@ machines:
name: Custom PC
id: custom-pc
uncompiled: true
- autopower: false
+ autoPower: false
build: build-pc
sitemap: false
---
diff --git a/devices/pc/machine/custom/machine.xml b/devices/pc/machine/custom/machine.xml
index aebb46ce1..4bc162bdc 100644
--- a/devices/pc/machine/custom/machine.xml
+++ b/devices/pc/machine/custom/machine.xml
@@ -7,12 +7,12 @@
-
+
+
Power
Run
Reset
-
diff --git a/devices/pc/panel/default.xml b/devices/pc/panel/default.xml
index e6b3df35b..c784fff5d 100644
--- a/devices/pc/panel/default.xml
+++ b/devices/pc/panel/default.xml
@@ -1,5 +1,5 @@
-
+
Control Panel
diff --git a/devices/pc/video/compaq/ega/compaq-ega-256kb-autolockfs.xml b/devices/pc/video/compaq/ega/compaq-ega-256kb-autolockfs.xml
index 1a0ea9e7f..516863c1d 100644
--- a/devices/pc/video/compaq/ega/compaq-ega-256kb-autolockfs.xml
+++ b/devices/pc/video/compaq/ega/compaq-ega-256kb-autolockfs.xml
@@ -1,5 +1,5 @@
-