badline 0.15.0 → 0.16.0

data/lib/badline/machine/keyboard_buffer.rb

@@ -20,6 +20,14 @@ module Badline
       # ($D86E).
       PLUS4_LAYOUT = Layout.new(address: 0x0527, count: 0xef, capacity: 10)
 
+      # The PET's, under BASIC 2 and BASIC 4. Every editor's GETIN takes
+      # ten keys from it, though the CRTC editors' keyboard scans stop at
+      # nine (XMAX).
+      PET_LAYOUT = Layout.new(address: 0x026f, count: 0x9e, capacity: 10)
+
+      # The PET's under BASIC 1, outside the zero page.
+      PET_BASIC1_LAYOUT = Layout.new(address: 0x020f, count: 0x020d, capacity: 10)
+
       def type_text(text)
         codes = text.bytes.map { |b| ascii_to_petscii(b) }
         on_init { @pending_keys = codes }

data/lib/badline/machine/settling.rb

@@ -4,7 +4,7 @@ module Badline
   module Machine
     # Brings the machine to the point a snapshot file is saved at: the main
     # CPU between instructions, or jammed, with no REU transfer holding the
-    # bus. C64, Vic20, C128 and Plus4 each include it, and answer
+    # bus. C64, Vic20, C128, Plus4 and PET each include it, and answer
     # #settled_for_snapshot? and #settle_chips_for_snapshot, which brings
     # what each chip defers up to the cycle without running one.
     module Settling

data/lib/badline/machine.rb

@@ -8,8 +8,9 @@ module Badline
   # = Machine
   #
   # The machines badline builds by family, as the command line's
-  # subcommand names them: the C64, Badline::C64, the VIC-20, Vic20, and the
-  # C128 in C64 mode, C128, and the 264 series, Plus4.
+  # subcommand names them: the C64, Badline::C64, the VIC-20, Vic20, the
+  # C128 in C64 mode, C128, the 264 series, Plus4, and the PET and CBM,
+  # PET.
   #
   # A machine answers what the front end, Media, the runners and the
   # snapshots call on it:
@@ -57,23 +58,31 @@ module Badline
   # and +capture_output+, and besides +model_label+, +cartridge_slots+ and
   # +detach_cartridges+ for its two cartridges.
   #
+  # The PET answers the identity, clocking, lifecycle, video, sound and
+  # keyboard parts, with no joysticks, RESTORE or control ports, and of
+  # the rest +ram+, +load_prg+, +type_text+, +mount+, +unmount+,
+  # +mounted?+, +datasette+, +true_drive+, nil, +install_debug_register+
+  # and +capture_output+, and besides +model_label+ and +ram_kb+.
+  #
   # Each machine includes Machine::Clocking for the clocking part.
   module Machine
     # Media the machine named doesn't take.
     class Unsupported < ArgumentError; end
 
-    # A new machine of `family`, :c64, :vic20, :c128 or :plus4, the model
-    # of it `model` names. A C64's model is one of Model::ALL, with its SID
+    # A new machine of `family`, :c64, :vic20, :c128, :plus4 or :pet, the
+    # model of it `model` names. A C64's model is one of Model::ALL, with its SID
     # `sid_model` when not nil and an REU of `reu` K when not nil. A
     # VIC-20's is "pal", with the RAM expansion `ram` names
     # (Vic20::Bus::RAM_CONFIGURATIONS), unexpanded when nil. A C128's is
     # one of C128::Model::ALL, with its SID `sid_model` when not nil, built
     # for C64 mode. A Plus/4's is one of Plus4::Model::ALL or c116, with
-    # the model's own RAM.
+    # the model's own RAM. A PET's is one of PET::Model::ALL, with its own
+    # RAM and ROMs, its CRTC's editor the 50 Hz one.
     def self.build(family, model:, sid_model: nil, reu: nil, ram: nil)
       return vic20(model, ram) if family == :vic20
       return c128(model, sid_model, :c64) if family == :c128
       return Plus4.new(model:) if family == :plus4
+      return PET.new(model:) if family == :pet
       raise ArgumentError, "no machine family named #{family}" unless family == :c64
 
       profile = Model.named(model)
@@ -89,11 +98,12 @@ module Badline
     # only C64 mode runs: a .sid tune or a program that loads at the C64's
     # BASIC start. A VIC-20 without RAM named gets the expansion the media
     # needs (Media::Vic20Media.ram_for) and yields a line saying so. Raises
-    # Unsupported for media a VIC-20 or a Plus/4 doesn't take.
+    # Unsupported for media a VIC-20, a Plus/4 or a PET doesn't take.
     def self.for_options(options, media, &)
       family = options.family
       return vic20_for(media, options.model, options.ram, &) if family == :vic20
-      return plus4_for(media, options.model, options.ram_kb) if family == :plus4
+      return plus4_for(media, options) if family == :plus4
+      return pet_for(media, options) if family == :pet
 
       sid_model = options.sid_model || Media.sid_model(media, otherwise: nil)
       return build(:c64, model: options.model, sid_model:, reu: options.reu) unless family == :c128
@@ -127,16 +137,32 @@ module Badline
     end
     private_class_method :vic20_for
 
-    # A Plus/4 with `ram_kb` K of RAM (Plus4::Model::RAM_SIZES), or with
-    # the model's own when nil.
-    def self.plus4_for(media, model, ram_kb)
+    # A Plus/4 with the RAM --ram names (Plus4::Model::RAM_SIZES), or with
+    # the model's own without it, the true drive --drive-type names, the
+    # SID card --sid-card names, where --sid-card-address puts it, and the
+    # RAM expansion --ram-expansion names.
+    def self.plus4_for(media, options)
       unsupported = !media.nil? && Media::Vic20Media::UNSUPPORTED.include?(File.extname(media).downcase)
       raise Unsupported, "doesn't go in a Plus/4" if unsupported
 
-      Plus4.new(model:, ram: ram_kb)
+      Plus4.new(model: options.model, ram: options.ram_kb, true_drive_model: options.drive_type,
+                sid_card: options.sid_card, sid_card_address: options.sid_card_address || 0xfd40,
+                ram_expansion: options.ram_expansion)
     end
     private_class_method :plus4_for
 
+    # A PET with the RAM --ram names (PET::Model::RAM_SIZES), or with the
+    # model's own without it, the editor at the frame rate --60hz or
+    # --editor asks for, and the ROMs --basic and --editor fit it with.
+    def self.pet_for(media, options)
+      unsupported = !media.nil? && Media::PETMedia::UNSUPPORTED.include?(File.extname(media).downcase)
+      raise Unsupported, "doesn't go in a PET" if unsupported
+
+      PET.new(model: options.model, ram_kb: options.ram_kb, refresh_hz: options.refresh_hz, basic: options.basic,
+              editor: options.editor)
+    end
+    private_class_method :pet_for
+
     def self.c64_media?(media)
       return false if media.nil? || !File.file?(media)
 

data/lib/badline/media/extensions.rb

@@ -7,6 +7,8 @@ module Badline
     # It loads on its own, for Options.
     #
     # - :disk, a disk image that the traps mount and a true drive reads
+    # - :ieee_disk, an 8050's or 8250's disk image, for a PET's IEEE-488
+    #   drive
     # - :gcr, a disk's raw GCR, which only a true drive reads
     # - :archive, a .t64, which the traps mount read-only
     # - :tape, :cartridge and :tune
@@ -14,7 +16,8 @@ module Badline
     module Extensions
       KINDS = {
         ".d64" => :disk, ".d71" => :disk, ".d81" => :disk, ".g64" => :gcr, ".g71" => :gcr, ".t64" => :archive,
-        ".tap" => :tape, ".crt" => :cartridge, ".sid" => :tune, ".m3u" => :disk_list, ".vfl" => :disk_list
+        ".d80" => :ieee_disk, ".d82" => :ieee_disk, ".tap" => :tape, ".crt" => :cartridge, ".sid" => :tune,
+        ".m3u" => :disk_list, ".vfl" => :disk_list
       }.freeze
 
       # The kind of the medium at `path`, by its extension.
@@ -27,7 +30,7 @@ module Badline
       DISKS = of(%i[disk gcr])
 
       # What goes in device 8 through the traps.
-      MOUNTABLE = of(%i[disk archive])
+      MOUNTABLE = of(%i[disk archive ieee_disk])
 
       # What goes in device 8, a true drive's or the traps', and the lists
       # of disks to put there.

data/lib/badline/media/pet_media.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Badline
+  module Media
+    # What a PET does with media of its own (Media.attach). Disks of every
+    # kind, .d80 and .d82 among them, directories and .t64 archives mount
+    # on device 8 through the traps on the KERNAL's IEEE-488 primitives
+    # (PET::IEEETraps), programs load at the start of BASIC, $0401
+    # (Program), and tapes play on the datasette at cassette port #1. There
+    # is no cartridge port and no SID, and the true drives are serial ones.
+    module PETMedia
+      # What a PET doesn't take.
+      UNSUPPORTED = Extensions.of(%i[tune cartridge gcr])
+
+      # What loads and runs the first program on the disk in device 8.
+      AUTOSTART = %(load"*",8\rrun\r)
+
+      # What loads and runs the first program on the tape in cassette #1.
+      TAPE_AUTOSTART = "load\rrun\r"
+
+      class << self
+        # A tape made for another machine plays all the same, and says so.
+        def tape_message(tape, message)
+          tape.platform == Storage::TAP::PET_PLATFORM ? message : "#{message}, a tape for another machine than the PET"
+        end
+
+        # BASIC 2 and 4 load the first program off the disk and run it.
+        # BASIC 1's LOAD finds no device on the IEEE-488 bus, so the first
+        # program goes in as a program file does, once the KERNAL has
+        # booted.
+        def disk_autostart(machine, storage)
+          return machine.type_text(AUTOSTART) unless machine.model.basic1?
+
+          data = storage.read_file("*")
+          machine.on_init { Program.load(machine, data, autostart: true) } if data
+        end
+      end
+    end
+  end
+end

data/lib/badline/media/program.rb

@@ -2,12 +2,16 @@
 
 module Badline
   module Media
-    # A program loading into a C64, a C128 or a 264 series machine once it
-    # has booted (Media.attach). The VIC-20 has its own (Vic20Basic).
+    # A program loading into a C64, a C128, a 264 series machine or a PET
+    # once it has booted (Media.attach). The VIC-20 has its own
+    # (Vic20Basic).
     module Program
       # Where BASIC 3.5 starts on the 264 series.
       PLUS4_BASIC_START = 0x1001
 
+      # Where BASIC starts on every PET.
+      PET_BASIC_START = 0x0401
+
       class << self
         # Loads the program where it says, and RUNs one that loads at the
         # start of BASIC.
@@ -30,12 +34,20 @@ module Badline
         # Where BASIC starts, the pointer to the end of its text and the
         # KERNAL's end address (EAL). BASIC 7.0 starts at $1C01 and keeps
         # the end of its text at $1210, and the 264 KERNAL keeps EAL at $9D.
+        # PET BASIC 2 and 4 keep the end of their text at $2A and EAL at
+        # $C9, and BASIC 1 at $7C and $E5.
         def basic(computer)
           return [PLUS4_BASIC_START, 0x2d, KernalTrap::PLUS4_ZERO_PAGE.end_address] if computer.family == :plus4
+          return pet_basic(computer) if computer.family == :pet
           return [0x1c01, 0x1210, 0xae] if computer.family == :c128 && computer.mode == :c128
 
           [BASIC_START, 0x2d, 0xae]
         end
+
+        def pet_basic(computer)
+          model = computer.model
+          [PET_BASIC_START, model.basic1? ? 0x7c : 0x2a, model.trap_layout.zero_page.end_address]
+        end
       end
     end
   end

data/lib/badline/media/true_drive.rb

@@ -3,9 +3,10 @@
 module Badline
   module Media
     # Device 8 as a true drive instead of the KERNAL traps: a 1541, or on
-    # the C128 its 1571, or a 1581. Once a true drive is plugged in as
-    # device 8, disk media go into it rather than into the traps, so a LOAD
-    # runs the DOS and every byte crosses the serial bus. A .g64 holds the
+    # the C128 its 1571, or on the Plus/4 a 1551 if it asks for one, or a
+    # 1581. Once a true drive is plugged in as device 8, disk media go into
+    # it rather than into the traps, so a LOAD runs the DOS and every byte
+    # crosses the serial bus or TCBM. A .g64 holds the
     # disk's raw GCR, which only a true drive reads, so it plugs one in
     # when there's none yet. The 1541 reads only .d64 and .g64 images, the
     # 1571 .d71 and .g71 as well, and the 1581 only .d81, so a .d81 swaps
@@ -52,9 +53,10 @@ module Badline
             raise Error, "#{path} is not a #{types.join(', ')} or .d81 image, which the #{name} and the 1581 read"
           end
 
-          (drive || computer.plug_true_drive).insert_image(path, read_only:)
+          drive ||= computer.plug_true_drive
+          drive.insert_image(path, read_only:)
           computer.unmount
-          "Inserted #{path} in the #{name} as device 8"
+          "Inserted #{path} in the #{drive.model_name} as device 8"
         end
 
         private

data/lib/badline/media/vic20_media.rb

@@ -61,11 +61,11 @@ module Badline
 
         # Loads the program, `bytes` from the file at `path`, as Vic20Basic
         # has it once the KERNAL has booted, or attaches the cartridge it's
-        # a part of (Vic20Cartridge), and says which.
+        # a part of (Vic20Cartridge), named after the file, and says which.
         def attach_program(machine, path, bytes, autostart:)
           chips = Vic20Cartridge.chips(path, bytes)
           if chips
-            machine.attach_cartridge(chips)
+            machine.attach_cartridge(chips, File.basename(path, File.extname(path)))
             return "Attached cartridge #{path}"
           end
 

data/lib/badline/media.rb

@@ -11,6 +11,7 @@ require "badline/media/vic20_basic"
 require "badline/media/vic20_cartridge"
 require "badline/media/vic20_media"
 require "badline/media/plus4_media"
+require "badline/media/pet_media"
 require "badline/media/tune"
 require "badline/media/program"
 
@@ -25,7 +26,9 @@ module Badline
       ".d64" => Storage::D64Image,
       ".d71" => Storage::D71Image,
       ".d81" => Storage::D81Image,
-      ".t64" => Storage::T64
+      ".t64" => Storage::T64,
+      ".d80" => Storage::D80Image,
+      ".d82" => Storage::D82Image
     }.freeze
 
     class << self
@@ -48,8 +51,10 @@ module Badline
       # disk autostart of its own, and takes no .sid tunes, and the 264
       # series loads programs at the start of its BASIC (Program), takes
       # .crt cartridges and raw .bin ROM images in its two cartridges'
-      # slots (Plus4Media), and no .sid tunes either. The
-      # C128 in C64 mode takes a C64's.
+      # slots (Plus4Media), and no .sid tunes either. The PET mounts .d80
+      # and .d82 disks too, which no other machine takes, and has no
+      # cartridges, tunes or true drives (PETMedia). The C128 in C64 mode
+      # takes a C64's.
       def attach(computer, path, autostart: true, subtune: nil, **)
         path = DiskList.disk(path)
         refuse_unsupported(computer, path)
@@ -99,7 +104,7 @@ module Badline
         return :cartridge if computer.family == :plus4 && Plus4Media.rom_image?(path)
 
         kind = Extensions.kind(path)
-        %i[disk archive].include?(kind) ? :storage : kind
+        %i[disk archive ieee_disk].include?(kind) ? :storage : kind
       end
 
       # What device 8 serves through the traps for a host directory, a disk
@@ -120,14 +125,21 @@ module Badline
 
       private
 
-      # The VIC-20 and the 264 series have no SID to play a .sid tune on.
+      # The VIC-20 and the 264 series have no SID to play a .sid tune on,
+      # and only the PET has the IEEE-488 drive a .d80 or .d82 goes in.
       def refuse_unsupported(computer, path)
-        return unless Vic20Media::UNSUPPORTED.include?(File.extname(path).downcase)
-
-        case computer.family
-        when :vic20 then raise ArgumentError, "#{path} doesn't go in a VIC-20"
-        when :plus4 then raise ArgumentError, "#{path} doesn't go in a Plus/4"
+        family = computer.family
+        if Extensions.kind(path) == :ieee_disk && family != :pet
+          raise ArgumentError, "#{path} needs a PET's IEEE-488 drive"
         end
+
+        refused, name = case family
+                        when :vic20 then [Vic20Media::UNSUPPORTED, "a VIC-20"]
+                        when :plus4 then [Vic20Media::UNSUPPORTED, "a Plus/4"]
+                        when :pet then [PETMedia::UNSUPPORTED, "a PET"]
+                        else [[], ""]
+                        end
+        raise ArgumentError, "#{path} doesn't go in #{name}" if refused.include?(File.extname(path).downcase)
       end
 
       def attach_kind(computer, path, autostart:, subtune:, **options)
@@ -143,7 +155,7 @@ module Badline
         end
       end
 
-      def disk?(path) = File.directory?(path) || Extensions.kind(path) == :disk
+      def disk?(path) = File.directory?(path) || %i[disk ieee_disk].include?(Extensions.kind(path))
 
       def attach_true_drive(computer, path, disk, autostart:)
         message = TrueDrive.insert(computer, path, read_only: disk.fetch(:read_only, false))
@@ -154,7 +166,11 @@ module Badline
       def mount(computer, path, disk, autostart:)
         storage = open_storage(path, disk)
         computer.mount(storage)
-        computer.type_text(disk_autostart(computer) { storage.read_file("*") }) if autostart
+        if autostart && computer.family == :pet
+          PETMedia.disk_autostart(computer, storage)
+        elsif autostart
+          computer.type_text(disk_autostart(computer) { storage.read_file("*") })
+        end
         "Mounted #{path} as device 8"
       end
 
@@ -170,7 +186,9 @@ module Badline
       # (Plus4Media.cartridge_chips).
       def attach_cartridge(computer, path, options)
         case computer.family
-        when :vic20 then computer.attach_cartridge(Storage::CRTFile.new(path, machine: :vic20).chips)
+        when :vic20
+          crt = Storage::CRTFile.new(path, machine: :vic20)
+          computer.attach_cartridge(crt.chips, crt.name.empty? ? File.basename(path, File.extname(path)) : crt.name)
         when :plus4 then computer.attach_cartridge(Plus4Media.cartridge_chips(path, slot: options.fetch(:slot, nil)))
         else
           computer.attach_cartridge(C64::Cartridge.from_file(path, **options))
@@ -178,17 +196,19 @@ module Badline
         "Attached cartridge #{path}"
       end
 
-      # A VIC-20 or a 264 says when the tape was made for another machine
-      # (Vic20Media.tape_message, Plus4Media.tape_message).
+      # A VIC-20, a 264 or a PET says when the tape was made for another
+      # machine (Vic20Media.tape_message, Plus4Media.tape_message,
+      # PETMedia.tape_message).
       def attach_tape(computer, path, autostart:)
         tape = Storage::TAP.new(path)
         computer.datasette.insert(tape)
         computer.datasette.play!
-        computer.type_text(TAPE_AUTOSTART) if autostart
+        computer.type_text(computer.family == :pet ? PETMedia::TAPE_AUTOSTART : TAPE_AUTOSTART) if autostart
         message = "Inserted #{path} in the datasette"
         case computer.family
         when :vic20 then Vic20Media.tape_message(tape, message)
         when :plus4 then Plus4Media.tape_message(tape, message)
+        when :pet then PETMedia.tape_message(tape, message)
         else message
         end
       end

data/lib/badline/options/family.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "badline/storage/p00"
+require "badline/storage/tap"
 
 module Badline
   class Options
@@ -12,7 +13,7 @@ module Badline
 
       private
 
-      # Takes `sid`, `c64`, `vic20`, `c128` or `plus4` when given first.
+      # Takes `sid`, `c64`, `vic20`, `c128`, `plus4` or `pet` when given first.
       def subcommand(args)
         case args.first
         when "sid" then @sid_command = true
@@ -20,6 +21,7 @@ module Badline
         when "vic20" then @family = :vic20
         when "c128" then @family = :c128
         when "plus4" then @family = :plus4
+        when "pet" then @family = :pet
         else return
         end
         @family_named = !@sid_command
@@ -31,19 +33,28 @@ module Badline
         when :vic20 then VIC20_MODELS
         when :c128 then C128_MODELS
         when :plus4 then PLUS4_MODELS
+        when :pet then PET_MODELS
         else MODELS
         end
       end
 
       # Without a family named, a program that loads at C128_BASIC_START is
-      # the C128's.
+      # the C128's, and an 8050's or 8250's disk or a PET tape the PET's. A
+      # program that loads where PET BASIC starts could be a VIC-20's too.
       def pick_family
-        return if @family_named || @sid_command || @media_path.nil?
+        return if @family_named || @sid_command || @media_path.nil? || !File.file?(@media_path)
 
-        program = Media::Extensions::PROGRAMS.include?(File.extname(@media_path).downcase)
-        return unless program && File.file?(@media_path)
+        if pet_media?
+          @family = :pet
+        elsif Media::Extensions::PROGRAMS.include?(File.extname(@media_path).downcase)
+          @family = :c128 if Storage::P00.load_address(@media_path) == C128_BASIC_START
+        end
+      end
 
-        @family = :c128 if Storage::P00.load_address(@media_path) == C128_BASIC_START
+      # Whether the media is an 8050's or 8250's disk or a PET tape.
+      def pet_media?
+        kind = Media::Extensions.kind(@media_path)
+        kind == :ieee_disk || (kind == :tape && Storage::TAP.platform_of(@media_path) == Storage::TAP::PET_PLATFORM)
       end
     end
   end

data/lib/badline/options/help.rb

@@ -49,7 +49,8 @@ module Badline
     # wrapped as the banner is.
     def media_kinds
       text = "Media can be #{listed(Media::Extensions::PROGRAMS)} program, #{listed(%i[disk])} disk image, " \
-             "#{listed(%i[gcr])} disk image for a true drive, #{listed(%i[disk_list])} list of disk images, " \
+             "#{listed(%i[ieee_disk])} disk image for a PET, #{listed(%i[gcr])} disk image for a true drive, " \
+             "#{listed(%i[disk_list])} list of disk images, " \
              "#{listed(%i[archive])} tape archive, #{listed(%i[tape])} tape, #{listed(%i[cartridge])} " \
              "cartridge, #{listed(%i[tune])} tune, #{listed(%w[.vsf])} snapshot, or a directory to mount as device 8."
       wrap(text)
@@ -84,6 +85,7 @@ module Badline
                #{@program} vic20 [options] [media]
                #{@program} c128 [options] [media]
                #{@program} plus4 [options] [media]
+               #{@program} pet [options] [media]
                #{@program} --headless [options] tune.sid
                #{@program} [options] tune.sid --audio-out FILE
                #{@program} sid [options] FILE|DIR...
@@ -93,6 +95,7 @@ module Badline
             vic20                            Run a PAL VIC-20, with the RAM --ram names
             c128                             Run a C128 in C128 mode, the one --model names
             plus4                            Run a Plus/4 or a C16, the one --model names
+            pet                              Run a PET or a CBM, the one --model names
             sid                              Play .sid tunes and directories of them
 
         #{media_kinds}
@@ -111,8 +114,22 @@ module Badline
         The Plus/4 and the C16 take programs, disks, tapes, and cartridges as
         .crt files or raw .bin ROM images. A .bin goes in cartridge 1, its
         low slot for up to 16K and both slots for 32K, and --c1lo, --c1hi,
-        --c2lo and --c2hi put one in the slot they name. There Escape is ESC,
-        Page Down RUN/STOP and F4 HELP.
+        --c2lo and --c2hi put one in the slot they name. Their --true-drive
+        makes device 8 an emulated 1551, on the parallel TCBM cable, and
+        --drive-type 1541 a 1541 on the serial bus instead. There Escape is
+        ESC, Page Down RUN/STOP and F4 HELP.
+
+        The PET and the CBM take programs, disks, .d80 and .d82 among them,
+        and tapes, and a .d80, a .d82 or a PET tape starts one without
+        `pet`. Their keys type what the host's keys type, Alt with a key
+        presses the PET's SHIFT and the key its unshifted character is on,
+        and the pause menu's KEYBOARD page says where the rest are. --basic
+        and --editor fit the upgrades Commodore sold, as in --model 2001
+        --basic 2. BASIC 1 can't LOAD from a disk drive, though a disk still
+        starts its first program, and BASIC 2 can. The 8032 and the 8096
+        have two 50 Hz editors: 4-80-b-50hz, the default, and
+        4-80-b-50hz-0283, another chip's, with 64-cycle lines and 313 lines
+        a frame.
 
         --headless plays a .sid tune on the host's audio device without the
         window, and --audio-out renders it to 16-bit PCM instead. The
@@ -134,8 +151,9 @@ module Badline
         --at and --script run events once a number of frames has run, as
         in --at 3500:key=space or --at 250,500:screenshot=shot%05d.bmp.
         key=NAME presses a key (space, return, a, f1, run_stop, restore, and
-        on the C128 esc, help, keypad1 and the rest, and on the Plus/4
-        esc, help and f1 to f3) or a joystick's
+        on the C128 esc, help, keypad1 and the rest, on the Plus/4
+        esc, help and f1 to f3, and on the PET rvs, escape and kp1) or a
+        joystick's
         direction or fire (joy1-up, joy2-fire) for #{Event::HOLD} frames, and
         pushes the C128's caps_lock or forty_eighty, which lock. type=TEXT
         types it, with \\n for RETURN. insert=FILE swaps in a disk, a list's

data/lib/badline/options/option.rb

@@ -4,7 +4,8 @@ module Badline
   class Options
     # One option of the table: its flags and value as the help shows them
     # (`-s, --subtune N`), what it does, the help section it's listed in, the
-    # mode it needs (:window, :headless or :either), and the build that
+    # mode it needs (:window, :headless, :either, or :any_window for the
+    # emulator's window or the SID player's), and the build that
     # takes it (:native, :ruby or :both).
     class Option
       attr_reader :usage, :name, :short, :value, :text, :section, :needs, :build

data/lib/badline/options/table.rb

@@ -18,6 +18,13 @@ module Badline
     # another name for the C16.
     PLUS4_MODELS = %w[plus4 plus4ntsc c16 c16ntsc c116].freeze
 
+    # The PETs and CBMs, as PET::Model names them, the 8032 first, the
+    # default.
+    PET_MODELS = %w[8032 8096 4032 3032 3032b 2001].freeze
+
+    # The true drives --drive-type names for the Plus/4.
+    PLUS4_DRIVE_TYPES = %w[1541 1551].freeze
+
     # The VIC-20 RAM expansions --ram takes, in the order the help lists
     # them.
     RAM_NAMES = %w[unexpanded 3k 8k 16k 24k 32k all].freeze
@@ -39,18 +46,29 @@ module Badline
       Option.new("--sound", "Play the SID through the host's audio device (F10 mutes)",
                  section: "Window options", needs: :window),
       Option.new("--no-sound", "Don't play the SID", section: "Window options", needs: :window, build: :native),
-      Option.new("--true-drive", "Put a true 1541 on device 8 instead of the KERNAL traps, a 1571 on the C128",
+      Option.new("--true-drive", "Put a true 1541 on device 8 instead of the KERNAL traps, a 1571 on the C128, " \
+                                 "a 1551 on the Plus/4",
+                 section: "Window options", needs: :window),
+      Option.new("--drive-type MODEL", "The Plus/4's true drive: 1541 or 1551 (default: 1551); implies --true-drive",
                  section: "Window options", needs: :window),
       Option.new("--reu SIZE", "Plug in an REU of SIZE K: 128, 256, 512 (a 1750) or up to 16384",
                  section: "Window options", needs: :window),
       Option.new("--model NAME", "C64 to run: #{MODELS.join(', ')} (default: #{MODELS.first}); VIC-20: pal; " \
-                                 "C128: #{C128_MODELS.join(', ')}; Plus/4: #{PLUS4_MODELS.join(', ')}",
+                                 "C128: #{C128_MODELS.join(', ')}; Plus/4: #{PLUS4_MODELS.join(', ')}; " \
+                                 "PET: #{PET_MODELS.join(', ')}",
                  section: "Window options", needs: :window),
       Option.new("--ntsc", "Run an NTSC C64, as --model ntsc does", section: "Window options", needs: :window),
       Option.new("--c64", "Start the C128 in C64 mode, holding C= at power-on",
                  section: "Window options", needs: :window),
       Option.new("--ram SIZE", "VIC-20 RAM expansion: #{RAM_NAMES.join(', ')} (default: unexpanded); " \
-                               "Plus/4 RAM: 16k, 32k or 64k (default: the model's own)",
+                               "Plus/4 RAM: 16k, 32k or 64k; PET RAM: 4k, 8k, 16k or 32k (default: the model's own)",
+                 section: "Window options", needs: :window),
+      Option.new("--60hz", "Run a CRTC PET's 60 Hz editor instead of its 50 Hz one",
+                 section: "Window options", needs: :window),
+      Option.new("--basic VERSION", "Fit a PET with BASIC 1, 2 or 4, as its board takes (default: its own)",
+                 section: "Window options", needs: :window),
+      Option.new("--editor NAME", "Fit a PET with an editor ROM its board and BASIC take: " \
+                                  "#{PET::ROMSets::EDITORS.keys.join(', ')}",
                  section: "Window options", needs: :window),
       Option.new("--c1lo FILE", "Put a .bin ROM image in the Plus/4's cartridge 1, low slot ($8000)",
                  section: "Window options", needs: :window),
@@ -60,6 +78,12 @@ module Badline
                  section: "Window options", needs: :window),
       Option.new("--c2hi FILE", "Put a .bin ROM image in cartridge 2's high slot ($C000)",
                  section: "Window options", needs: :window),
+      Option.new("--sid-card MODEL", "Fit the Plus/4 or C16 with a SID card at $FD40: 6581 or 8580",
+                 section: "Window options", needs: :window),
+      Option.new("--sid-card-address ADDRESS", "Put the SID card at fd40 (the default) or fe80",
+                 section: "Window options", needs: :window),
+      Option.new("--ram-expansion NAME", "Fit the Plus/4 or C16 with a RAM expansion: hannes256, hannes1m or csory256",
+                 section: "Window options", needs: :window),
       Option.new("--no-vsync", "Pace frames by the timer or the sound instead of the display",
                  section: "Window options", needs: :window),
       Option.new("--verbose", "Print the display, sound and gamepad setup and the frame timing",
@@ -81,7 +105,7 @@ module Badline
                  section: "Options without the window", needs: :headless),
       Option.new("--no-tui", "Play without the interactive display, even on a terminal",
                  section: "Options without the window", needs: :headless),
-      Option.new("--frames N", "Quit after N frames", section: "Testing options", needs: :window),
+      Option.new("--frames N", "Quit after N frames", section: "Testing options", needs: :any_window),
       Option.new("--unpaced", "Run as fast as it can, without vsync or pacing",
                  section: "Testing options", needs: :window),
       Option.new("--screenshot FILE", "Save the last frame as a .bmp",