Retro/pcjs
Watch
1
0
Fork
You've already forked pcjs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into next-release

Browse source 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
Jeff Parsons 2017-01-28 23:03:22 -08:00 • committed by Jeff Parsons
commit 38dc1d1f42
4 changed files with 82 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/about/README.md
View file

@ -25,7 +25,6 @@ capabilities can be found in the [Documentation](/docs/).
The first PCjs simulation was [C1Pjs](/docs/c1pjs/), which emulates the
Challenger 1P, a 6502-based microcomputer introduced by Ohio Scientific in 1978.
C1Pjs v1.0 was released in July 2012. More information about the first release of C1Pjs was
[posted](http://osiweb.org/osiforum/viewtopic.php?f=3&t=103) on the
[OSI Discussion Forum](http://osiweb.org/osiforum/index.php) at [osiweb.org](http://osiweb.org/).

4
docs/c1pjs/README.md
View file

@ -15,8 +15,8 @@ C1Pjs Documentation
---
C1Pjs is a JavaScript simulation of the Challenger 1P, an 8-bit 6502-based microcomputer
manufactured by Ohio Scientific in 1978. The base configuration included 4Kb of RAM and an
8Kb BASIC-in-ROM from Microsoft. Below is a simulation of the 8Kb model.
manufactured by Ohio Scientific in 1978. The base configuration included an 8Kb BASIC-in-ROM from Microsoft
and 4Kb of RAM (user-expandable to 8Kb). Below is a simulation of the 8Kb RAM configuration.
After you've read the Documentation, check out our other [C1P Machine Configurations](/devices/c1p/machine/),
learn how [Customize and Embed](embed/) your own machines, read the [Source Code](/modules/c1pjs/), and