v1.1.0

spacemen3 · Aug 23, 2022 · bea15ff · bea15ff
1 parent 7b63c25
commit bea15ff
Show file tree

Hide file tree

Showing 33 changed files with 1,543 additions and 178 deletions.
diff --git a/README.md b/README.md
@@ -4,11 +4,13 @@
 The [PDP-1 Core running Spacewar!](https://www.analogue.co/developer/spacewar) on the [Analogue Pocket](https://www.analogue.co/pocket) via [openFPGA](https://www.analogue.co/developer).
 * Uses the original tape program file of Spacewar! v3.1 1962
 * Supports Sleep/Wake and Memories (beta)
-* All colors are assigned via an updatable LUT
-* Main sense switches are set via an updatable config file
+* All colors are assigned via an updatable LUT in the core settings menu
+* Main sense switches are adjustable in the core settings menu
 
 ## Installation
-To play Spacewar on your Pocket, please use [this guide](https://www.analogue.co/support/resource/how-to-play-spacewar-on-analogue-pocket).
+Requires Analogue OS v1.1 beta 2 (B_4) or newer.
+
+To update and play Spacewar on your Pocket, please use [this guide](https://www.analogue.co/support/resource/how-to-play-spacewar-on-analogue-pocket).
 
 ## Credits
 This core is released under the [MIT License](https://github.com/spacemen3/PDP-1/blob/main/LICENSE).

diff --git a/...ssets/pdp1/Spacemen3.PDP1/Colour_LUT.clut → ...sets/pdp1/Spacemen3.PDP1/Default_LUT.clut b/...ssets/pdp1/Spacemen3.PDP1/Colour_LUT.clut → ...sets/pdp1/Spacemen3.PDP1/Default_LUT.clut
diff --git a/dist/Assets/pdp1/Spacemen3.PDP1/Ghost_LUT.clut b/dist/Assets/pdp1/Spacemen3.PDP1/Ghost_LUT.clut
diff --git a/dist/Assets/pdp1/Spacemen3.PDP1/Kpro_LUT.clut b/dist/Assets/pdp1/Spacemen3.PDP1/Kpro_LUT.clut
diff --git a/dist/Assets/pdp1/Spacemen3.PDP1/Pink_LUT.clut b/dist/Assets/pdp1/Spacemen3.PDP1/Pink_LUT.clut
diff --git a/dist/Assets/pdp1/Spacemen3.PDP1/config.cfg b/dist/Assets/pdp1/Spacemen3.PDP1/config.cfg
diff --git a/dist/Cores/Spacemen3.PDP1/bitstream.rbf_r b/dist/Cores/Spacemen3.PDP1/bitstream.rbf_r
diff --git a/dist/Cores/Spacemen3.PDP1/core.json b/dist/Cores/Spacemen3.PDP1/core.json
@@ -8,7 +8,7 @@
             "author": "Spacemen3",
             "url": "https://github.com/spacemen3/PDP-1",
             "version": "v3.1 - Sep. 24, 1962",
-            "date_release": "2022-07-23"
+            "date_release": "2022-08-19"
         },
         "framework": {
             "target_product": "Analogue Pocket",
@@ -31,4 +31,4 @@
             }
         ]
     }
-}
+}
diff --git a/dist/Cores/Spacemen3.PDP1/data.json b/dist/Cores/Spacemen3.PDP1/data.json
@@ -6,7 +6,7 @@
 					"name": "RIM",
 					"id": 101,
 					"required": true,
-					"parameters": 3,
+					"parameters": 2,
 					"filename": "spacewar3.1.bin",
 					"size_exact": 0,
 					"size_maximum": 131072,
@@ -17,21 +17,14 @@
 					"id": 102,
 					"required": true,
 					"parameters": 3,
-					"filename": "Colour_LUT.clut",
-					"size_exact": 0,
-					"size_maximum": 131072,
-					"address": "0x10000000"
-				},
-				{
-					"name": "Config",
-					"id": 103,
-					"required": true,
-					"parameters": 3,
-					"filename": "config.cfg",
+					"filename": "Default_LUT.clut",
 					"size_exact": 0,
 					"size_maximum": 131072,
-					"address": "0x40000000"
+					"address": "0x10000000",
+					"extensions": [
+						"clut"
+					]
 				}
 		]
     }
-}
+}
diff --git a/dist/Cores/Spacemen3.PDP1/info.txt b/dist/Cores/Spacemen3.PDP1/info.txt
@@ -0,0 +1,13 @@
+In 1962, the first digital video game, Spacewar! debuted on an early computer released in 1959 called the PDP-1 at MIT.
+
+The beginning of video games.
+
+Spacewar! set forth and established the fundamental characteristics and philosophical approaches that would define and serve as the earliest guidelines of what a video game is.
+
+Inspired by science fiction literature and cinema. Driven by creatively pushing technology to its limits.
+
+A new medium and art form was born.
+
+SpaceWar! was released on a computer produced in 1959 called the PDP-1. Spacewar! is arguably the first digital video game ever created.
+
+PDP-1 has been painstakingly recreated with the public domain open source code for openFPGA by Spacemen3. So it can be preserved, studied and played forever without compromises.
diff --git a/dist/Cores/Spacemen3.PDP1/input.json b/dist/Cores/Spacemen3.PDP1/input.json
@@ -4,64 +4,24 @@
         "controllers": [
             {
                 "type": "default",
-                "map_analog_to_dpad": true,
                 "mappings": [
                     {
-                        "D-Pad Up": "pad1_d_up"
+                        "id": 0,
+                        "name": "Shoot Missile",
+                        "key": "pad_btn_a"
                     },
                     {
-                        "D-Pad Down": "pad1_d_down"
+                        "id": 1,
+                        "name": "Thrust",
+                        "key": "pad_btn_b"
                     },
                     {
-                        "D-Pad Left": "pad1_d_left"
-                    },
-                    {
-                        "D-Pad Right": "pad1_d_right"
-                    },
-                    {
-                        "A": "pad1_btn_b"
-                    },
-                    {
-                        "B": "pad1_btn_a"
-                    },
-                    {
-                        "Start": "pad1_btn_start"
-                    },
-                    {
-                        "Select": "pad1_btn_back"
-                    }
-                ]
-            },
-            {
-                "type": "default",
-                "map_analog_to_dpad": true,
-                "mappings": [
-                    {
-                        "D-Pad Up": "key1_scan_E048"
-                    },
-                    {
-                        "D-Pad Down": "key1_scan_E050"
-                    },
-                    {
-                        "D-Pad Left": "key1_scan_E04B"
-                    },
-                    {
-                        "D-Pad Right": "key1_scan_E04D"
-                    },
-                    {
-                        "A": "key1_scan_002D"
-                    },
-                    {
-                        "B": "key1_scan_002C"
-                    },
-                    {
-                        "Start": "key1_scan_001F"
-                    },
-                    {
-                        "Select": "key1_scan_001E"
+                        "id": 2,
+                        "name": "Warp",
+                        "key": "pad_btn_y"
                     }
                 ]
             }
         ]
     }
-}
+}
diff --git a/dist/Cores/Spacemen3.PDP1/interact.json b/dist/Cores/Spacemen3.PDP1/interact.json
@@ -2,86 +2,110 @@
     "interact": {
         "magic": "APF_VER_1",
         "variables": [
-            {
-                "name": "Demo 32bit",
-                "id": 0,
-                "type": "number_u32",
-                "editable": true,
+			{
+                "name": "Trails",
+                "id": 1,
+                "type": "slider_u32",
+                "enabled": true,
+                "persist": true,
                 "address": "0x40000004",
+                "defaultval": 7,
+                "mask": "0xffffff00",
                 "graphical": {
-                    "default": 0,
+                    "signed": false,
                     "min": 0,
                     "max": 7,
                     "adjust_small": 1,
-                    "adjust_large": 1,
-                    "style": "bar"
+                    "adjust_large": 1
                 }
             },
-            {
-                "name": "Magnify Ships",
-                "id": 0,
-                "type": "radio",
-                "group": 100,
-                "editable": true,
+			{
+                "name": "Ship Mag",
+                "id": 2,
+                "type": "check",
+                "enabled": true,
+                "persist": true,
                 "address": "0x40000000",
-                "value": 1
-                }
+                "defaultval": 1,
+                "value": "0x1",
+                "mask": "0xFFFFFFFE"
+
             },
-            {
-                "name": "Blur On",
-                "id": 0,
-                "type": "radio",
-                "group": 100,
-                "editable": true,
-                "address": "0x40000008",
-                "value": 1
-                }
-            },
-            {
-                "name": "Radio test2",
+			{
+                "name": "Trail Blur",
                 "id": 3,
-                "type": "radio",
-                "group": 100,
-                "editable": true,
-                "address": "0x00F0000A",
-                "value": 92
+                "type": "check",
+                "enabled": true,
+                "group": 101,
+                "persist": true,
+                "address": "0x40000008",
+                "defaultval": 0,
+                "value": "0x1",
+                "mask": "0xFFFFFFFE"
             },
-            {
-                "name": "Checkbox test",
+			{
+                "name": "Black Hole Off",
                 "id": 4,
                 "type": "check",
-                "editable": true,
-                "address": "0x00F00010",
-				"value": 64,
-				"value_unchecked": 128
-
+                "enabled": true,
+                "group": 102,
+                "persist": true,
+                "address": "0x4000000C",
+                "defaultval": 0,
+                "value": "0x20",
+                "mask": "0xFFFFFFDF"
             },
-            {
-                "name": "Button test",
+			{
+                "name": "Black Hole Kills",
                 "id": 5,
-                "type": "button",
-                "editable": true,
-                "address": "0x00F00014",
-                "value": 64
-            }
-        ],
-        "messages": [
-            {
-                "id": 0,
-                "text": "Unknown error. Please reset core"
+                "type": "check",
+                "enabled": true,
+                "group": 103,
+                "persist": true,
+                "address": "0x4000000C",
+                "defaultval": 0,
+                "value": "0x10",
+                "mask": "0xFFFFFFEF"
             },
-            {
-                "id": 1,
-                "text": "Corrupt header. Will not pass BIOS check to boot."
+			{
+                "name": "Background Off",
+                "id": 6,
+                "type": "check",
+                "enabled": true,
+                "group": 104,
+                "persist": true,
+                "address": "0x4000000C",
+                "defaultval": 0,
+                "value": "0x8",
+                "mask": "0xFFFFFFF7"
             },
-            {
-                "id": 2,
-                "text": "Unsupported mapper or MBC type."
+			{
+                "name": "Low Gravity",
+                "id": 8,
+                "type": "check",
+                "enabled": true,
+                "group": 106,
+                "persist": true,
+                "address": "0x4000000C",
+                "defaultval": 0,
+                "value": "0x2",
+                "mask": "0xFFFFFFFD"
             },
-            {
-                "id": 3,
-                "text": "Generic unhelpful error message."
+			{
+                "name": "Ang. Momentum",
+                "id": 9,
+                "type": "check",
+                "enabled": true,
+                "group": 107,
+                "persist": true,
+                "address": "0x4000000C",
+                "defaultval": 0,
+                "value": "0x1",
+                "mask": "0xFFFFFFFE"
             }
+        ],
+        "messages": [
+
         ]
     }
-}
+}
diff --git a/dist/Cores/Spacemen3.PDP1/program.bin b/dist/Cores/Spacemen3.PDP1/program.bin
diff --git a/dist/Platforms/pdp1.json b/dist/Platforms/pdp1.json
@@ -1,7 +1,8 @@
 {
-    "platform": {
-        "name": "PDP-1: Spacewar!",
-        "manufacturer": "Digital Equipment Corporation",
-        "year": 1959
-    }
-}
+  "platform": {
+    "category": "Computer",
+    "name": "PDP-1: Spacewar!",
+    "year": 1959,
+    "manufacturer": "Digital Equipment Corporation"
+  }
+}