diff --git a/README.md b/README.md index b7db6a2..2861a9d 100644 --- a/README.md +++ b/README.md @@ -10,10 +10,13 @@ Portable emulator of an Apple II+ or //e. Written in Go. - Apple ][+ with 48Kb of base RAM - Apple //e with 128Kb of RAM - Apple //e enhanced with 128Kb of RAM - - Base64A clone with 48Kb of base RAM and paginated ROM + - Base64A clone with 48Kb of base RAM and paged ROM - Storage - - 16 Sector 5 1/4 diskettes in NIB, DSK or PO format - - 16 Sector 5 1/4 diskettes in WOZ 1.0 or 2.0 format (read only) + - 16 Sector 5 1/4 diskettes. Uncompressed or compressed witth gzip or zip. Supported formats: + - NIB (read only) + - DSK + - PO + - WOZ 1.0 or 2.0 (read only) - 3.5 disks in PO or 2MG format - Hard disk in HDV or 2MG format with ProDOS and SmartPort support - Emulated extension cards: @@ -61,7 +64,7 @@ Portable emulator of an Apple II+ or //e. Written in Go. By default the following configuration is launched: - Enhanced Apple //e with 65c02 processor -- RAMworks card with 80 column, RGB (with Video7 modes) and 8Gb RAM is aux slot +- RAMWorks card with 80 column, RGB (with Video7 modes) and 8Gb RAM in aux slot - Memory Expansion card with 1Gb in slot 1 - VidHD card (SHR support) in slot 2 - FASTChip Accelerator card in slot 3 @@ -177,6 +180,8 @@ Only valid on SDL mode shows the character map -fastChipSlot int slot for the FASTChip accelerator card, -1 for none (default 3) + -forceCaps + force all letters to be uppercased (no need for caps lock!) -fastDisk set fast mode when the disks are spinning (default true) -hd string diff --git a/go.mod b/go.mod index 4d2117a..c1a489e 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/ivanizag/izapple2 go 1.12 require ( - fyne.io/fyne v1.4.0-rc1 + fyne.io/fyne v1.4.0 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200625191551-73d3c3675aa3 github.com/kr/text v0.2.0 // indirect github.com/pkg/profile v1.5.0 diff --git a/go.sum b/go.sum index 47ae5e7..39e6e9d 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,8 @@ fyne.io/fyne v1.3.3 h1:jpdp9kTJ1ZOKQjyHZfzQGz/E3V35KVoMTawtii/1/j4= fyne.io/fyne v1.3.3/go.mod h1:osD/JXxGf8AC7aB+Ek0YuFF2QXzdTFFzMRM8cdqrwvQ= fyne.io/fyne v1.4.0-rc1 h1:s/WaHDiNJDBWVopfP69bEShUj1SJscg4GOaK1s3tKiU= fyne.io/fyne v1.4.0-rc1/go.mod h1:j6pz0cVZSgVo3VnVS4MSTOW7yjK1KW8erwBnUoWKgqI= +fyne.io/fyne v1.4.0 h1:4fdy+SIVen+iKtBvpIegi4ox1f5IygtXhNJFS2aEucQ= +fyne.io/fyne v1.4.0/go.mod h1:j6pz0cVZSgVo3VnVS4MSTOW7yjK1KW8erwBnUoWKgqI= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9/go.mod h1:7uhhqiBaR4CpN0k9rMjOtjpcfGd6DG2m04zQxKnWQ0I= diff --git a/screen/hiRes.go b/screen/hiRes.go index 988026c..8f34c56 100644 --- a/screen/hiRes.go +++ b/screen/hiRes.go @@ -46,6 +46,8 @@ func renderHiRes(data []uint8, light color.Color) *image.RGBA { } if shifted { + // "The general rule of all these HIRES interference patterns is that delayed extends + // undelayed, and undelayed cuts off delayed" img.Set(x, y, previousColour) } else { img.Set(x, y, colour) diff --git a/storage/diskette.go b/storage/diskette.go index 30a9169..47a78e8 100644 --- a/storage/diskette.go +++ b/storage/diskette.go @@ -32,7 +32,6 @@ func LoadDiskette(filename string) (Diskette, error) { if isFileNib(data) { var d diskette16sector d.nib = newFileNib(data) - d.nib.supportsWrite = d.nib.supportsWrite && writeable return &d, nil }