Skip to content

Commit

Permalink
Add ZX Spectrum +2, including joystick support.
Browse files Browse the repository at this point in the history
  • Loading branch information
@dillof
dillof committed Jul 8, 2020
1 parent d8591f1 commit 1477ca9
Show file tree
Hide file tree
Showing 44 changed files with 570 additions and 96 deletions.
Binary file added App Icons/Icon-ZX128-60.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added App Icons/Icon-ZX128-76.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added App Icons/Icon-ZX128-83.5.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .../App Icon Previews/App Icon ZX-128 Preview.imageset/App Icon ZX-128 Preview.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions C64/Assets/Assets.xcassets/App Icon Previews/App Icon ZX-128 Preview.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "App Icon ZX-128 Preview.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
20 changes: 10 additions & 10 deletions C64/Assets/Assets.xcassets/Device Colors/Educator 64 Case.colorset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
},
"colors" : [
{
"idiom" : "universal",
"color" : {
"color-space" : "srgb",
"components" : {
"red" : "0xC0",
"alpha" : "1.000",
"blue" : "0xB4",
"green" : "0xC3"
"green" : "0xC3",
"red" : "0xC0"
}
}
},
"idiom" : "universal"
}
]
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
20 changes: 20 additions & 0 deletions C64/Assets/Assets.xcassets/Device Colors/ZX +2 Case.colorset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x72",
"green" : "0x71",
"red" : "0x6D"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
21 changes: 21 additions & 0 deletions C64/Assets/Assets.xcassets/Hardware Parts/Sinclair ZX Spectrum +2.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Sinclair ZX Spectrum [email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added .../Hardware Parts/Sinclair ZX Spectrum +2.imageset/Sinclair ZX Spectrum [email protected]
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions C64/Assets/Assets.xcassets/Keyboards/ZX Spectrum +2 Keyboard.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "ZX Spectrum +2 Keyboard.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added ...xcassets/Keyboards/ZX Spectrum +2 Keyboard.imageset/ZX Spectrum +2 Keyboard.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions C64/Assets/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Version 1.5" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nWU-vj-bJA">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Version 1.6" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nWU-vj-bJA">
<rect key="frame" x="211" y="404" width="118" height="29"/>
<fontDescription key="fontDescription" type="system" weight="medium" pointSize="24"/>
<nil key="textColor"/>
Expand Down Expand Up @@ -307,7 +307,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="jMI-du-EXx" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="225" y="2128"/>
<point key="canvasLocation" x="224.99999999999997" y="2127.6720351390923"/>
</scene>
<!--License-->
<scene sceneID="YD5-pv-jD6">
Expand Down Expand Up @@ -1868,7 +1868,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0Oj-vZ-2lb" userLabel="Start Button" customClass="PillButton" customModule="C64UIComponents">
<rect key="frame" x="84" y="128" width="84" height="32"/>
<rect key="frame" x="84" y="128" width="52" height="32"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="16"/>
<state key="normal" title="START">
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
Expand All @@ -1878,7 +1878,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KQT-o5-uyI" customClass="PillButton" customModule="C64UIComponents">
<rect key="frame" x="200" y="128" width="87" height="32"/>
<rect key="frame" x="168" y="128" width="55" height="32"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="16"/>
<state key="normal" title="TOOLS">
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
Expand Down Expand Up @@ -2072,7 +2072,7 @@
<rect key="frame" x="0.0" y="0.0" width="482" height="59"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rSo-nS-zEu" customClass="MediaView" customModule="C64UIComponents">
<view opaque="NO" contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rSo-nS-zEu" customClass="MediaView" customModule="C64UIComponents">
<rect key="frame" x="8" y="10" width="474" height="39"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="subtitleIsPETASCII" value="YES"/>
Expand Down Expand Up @@ -2108,7 +2108,7 @@
<rect key="frame" x="0.0" y="0.0" width="482" height="33"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WU8-RS-VWj" userLabel="Start Button" customClass="PillButton" customModule="C64UIComponents">
<rect key="frame" x="0.0" y="0.0" width="0.0" height="33"/>
<rect key="frame" x="0.0" y="0.0" width="31" height="33"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="16"/>
<state key="normal" title="START">
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
Expand All @@ -2118,7 +2118,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NaR-ga-Aoz" customClass="PillButton" customModule="C64UIComponents">
<rect key="frame" x="32" y="0.0" width="86" height="33"/>
<rect key="frame" x="63" y="0.0" width="55" height="33"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="16"/>
<state key="normal" title="TOOLS">
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
Expand Down
16 changes: 16 additions & 0 deletions C64/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,13 @@
<string>Icon-VIC20-60</string>
</array>
</dict>
<key>App Icon ZX-128</key>
<dict>
<key>CFBundleIconFiles</key>
<array>
<string>Icon-ZX128-60</string>
</array>
</dict>
<key>App Icon ZX-48</key>
<dict>
<key>CFBundleIconFiles</key>
Expand Down Expand Up @@ -229,6 +236,15 @@
<string>Icon-VIC20-83.5</string>
</array>
</dict>
<key>App Icon ZX-128</key>
<dict>
<key>CFBundleIconFiles</key>
<array>
<string>Icon-ZX128-60</string>
<string>Icon-ZX128-76</string>
<string>Icon-ZX128-83.5</string>
</array>
</dict>
<key>App Icon ZX-48</key>
<dict>
<key>CFBundleIconFiles</key>
Expand Down
5 changes: 3 additions & 2 deletions C64/Settings/AppIconViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,10 @@ class AppIconViewController: UIViewController {
Section(title: nil, rows: [
Row(name: "Commodore 64", iconName: "App Icon C64", defaultIcon: true),
Row(name: "Commodore SX-64", iconName: "App Icon SX-64"),
Row(name: "Commodore C16, Plus/4", iconName: "App Icon C16"),
Row(name: "Commodore 16, Plus/4", iconName: "App Icon C16"),
Row(name: "Commodore VIC-20", iconName: "App Icon VIC-20"),
Row(name: "Sinclair ZX Spectrum 16k, 48k", iconName: "App Icon ZX-48")
Row(name: "Sinclair ZX Spectrum 16k, 48k", iconName: "App Icon ZX-48"),
Row(name: "Sinclair ZX Spectrum 128k, +2", iconName: "App Icon ZX-128")
])
]

Expand Down
5 changes: 3 additions & 2 deletions C64/Settings/LicensesViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ class LicensesViewController: UIViewController {
"PET",
"Ultimax",
"VIC-1001",
"ZX Spectrum+"
"ZX Spectrum+",
"ZX Spectrum +2"
]),
Section(title: "3rd Party Software", rows: [
"CwlMutex",
Expand All @@ -52,7 +53,7 @@ class LicensesViewController: UIViewController {
"SearchTextField",
]),
Section(title: nil, rows: [
"Sepcial Thanks"
"Special Thanks"
])
]

Expand Down
18 changes: 3 additions & 15 deletions C64/Settings/ReleaseNotesViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,10 @@ class ReleaseNotesViewController: UIViewController {
}

var releases = [
Release(name: "Release 1.5 build 7", year: 2020, month: 7, day: 5, changes: [
"Add ZX Spectrum+, ZX Spectrum 128k.",
"Add sound and tape support to ZX Spectrum."
]),
Release(name: "Release 1.5 build 6", year: 2020, month: 7, day: 3, changes: [
"Fix communicating with vice emulator bug introduced in previous build.",
"Add Tape Recorder icon."
]),
Release(name: "Release 1.5 build 5", year: 2020, month: 7, day: 3, changes: [
"Add preliminary ZX Spectrum 16k, 48k support (no sound, no tape deck, hardware keyboard mapping incomplete)."
]),
Release(name: "Release 1.5 Build 4", year: 2020, month: 6, day: 29, changes: [
"Add C16, Plus/4 computers."
]),
Release(name: "Release 1.5 Build 2", year: 2020, month: 6, day: 28, changes: [
Release(name: "Release 1.6", year: 2020, month: 7, day: 8, changes: [
"Rename to Ready.",
"Added Commodore 16 and Plus/4 emulation.",
"Added ZX Spectrum emulation. Supported Models are 16k, 48k, Specturm+, 128k, +2.",
"Add new app icons, one for each supported computer."
]),
Release(name: "Release 1.5", year: 2020, month: 6, day: 28, changes: [
Expand Down
4 changes: 2 additions & 2 deletions Emulator/CasstteDrive.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,9 @@ public struct CasstteDrive: MachinePart {
]),

MachinePartSection(title: "Datasette", parts: [
CasstteDrive(identifier: "1530", name: "1530", fullName: "Commodore 1530 C2N", iconName: "Commodore 1530 C2N", connector: .commodoreTape, caseColorName: "1530 C2N Case"),
CasstteDrive(identifier: "1530", name: "1530", fullName: "Commodore 1530 C2N", iconName: "Commodore 1530 C2N", connector: .commodoreTapePort, caseColorName: "1530 C2N Case"),

CasstteDrive(identifier: "1530 Plus/4", name: "1530", fullName: "Commodore 1530 C2N", variantName: "for C16, Plus/4", iconName: "Commodore 1530 C2N Black", connector: .plus4Tape, caseColorName: "C16 Case"),
CasstteDrive(identifier: "1530 Plus/4", name: "1530", fullName: "Commodore 1530 C2N", variantName: "for C16, Plus/4", iconName: "Commodore 1530 C2N Black", connector: .plus4TapePort, caseColorName: "C16 Case"),

CasstteDrive(identifier: "Tape Recorder", name: "Recorder", fullName: "Tape Recorder", iconName: "Tape Recorder", connector: .audioJackTape, caseColorName: "Tape Recorder Case")

Expand Down
Loading

0 comments on commit 1477ca9

Please sign in to comment.