From 829f9f6b12a84b9c22ec311e3a83db2c7c7084c1 Mon Sep 17 00:00:00 2001 From: likeablob <46628917+likeablob@users.noreply.github.com> Date: Fri, 11 Oct 2019 23:19:57 +0900 Subject: [PATCH 1/2] Fix typo --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0095b6e..9f51779 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ $ git clone https://github.com/likeablob/macmini ~/macmini $ cd ~/macmini $ sudo ./install.sh -# copy ypur assests +# copy your assests $ cp /path/to/vmac.rom ~/macmini/minivmac/vMac.ROM # Mini vMac ROM file $ cp /path/to/vmac.dsk ~/macmini/minivmac/system.dsk # Mini vMac disk file $ cp /path/to/.basilisk_ii_prefs ~/.basilisk_ii_prefs # Basilisk II config file @@ -78,7 +78,7 @@ $ sudo reboot now ### How does the low-res LCD(320x240) handle 512x384 resolution? Internally `tightvncserver` and `ssvncviewer` are used to scale the display. -- e.g. [`1_large_minimac.sh`]((./switcher/sh.d/1_large_minimac.sh)) launches: +- e.g. [`1_large_minimac.sh`](./switcher/sh.d/1_large_minimac.sh) launches: - `tightvncserver` to create a virtual display (512x384) at `DISPLAY=:1` (`:5901`) - `minivmac` in `DISPLAY:1` - `ssvncviewer -scale 0.625` in `DISPLAY:0` (By the `-scale` option, low-res LED get upscaled) From 98a216b2308c34af23988554f6899e5f7d83d3fb Mon Sep 17 00:00:00 2001 From: likeablob <46628917+likeablob@users.noreply.github.com> Date: Sat, 12 Oct 2019 01:28:34 +0900 Subject: [PATCH 2/2] Specify the depth explicitly - The depth mismatch may cause blank screen --- switcher/sh.d/1_large_minimac.sh | 2 +- switcher/sh.d/2_minimac.sh | 2 +- switcher/sh.d/3_basilisk.sh | 2 +- switcher/sh.d/5_large_terminal.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/switcher/sh.d/1_large_minimac.sh b/switcher/sh.d/1_large_minimac.sh index 9079c40..7d60a2c 100755 --- a/switcher/sh.d/1_large_minimac.sh +++ b/switcher/sh.d/1_large_minimac.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash vncserver -kill :1 -vncserver -geometry 512x384 +vncserver -geometry 512x384 -depth 24 ssvncviewer -scale 0.625 :1 -fullscreen -passwd ~/.vnc/passwd & DISPLAY=:1 cd ~/macmini/minivmac diff --git a/switcher/sh.d/2_minimac.sh b/switcher/sh.d/2_minimac.sh index 7fd474f..a312670 100755 --- a/switcher/sh.d/2_minimac.sh +++ b/switcher/sh.d/2_minimac.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash vncserver -kill :1 -vncserver -geometry 320x240 +vncserver -geometry 320x240 -depth 24 ssvncviewer -scale 1 :1 -fullscreen -passwd ~/.vnc/passwd & DISPLAY=:1 cd ~/macmini/minivmac diff --git a/switcher/sh.d/3_basilisk.sh b/switcher/sh.d/3_basilisk.sh index a613d64..b6f1d86 100755 --- a/switcher/sh.d/3_basilisk.sh +++ b/switcher/sh.d/3_basilisk.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash vncserver -kill :1 -vncserver -geometry 512x384 +vncserver -geometry 512x384 -depth 16 ssvncviewer -scale 0.625 :1 -fullscreen -passwd ~/.vnc/passwd & DISPLAY=:1 BasiliskII --nogui true diff --git a/switcher/sh.d/5_large_terminal.sh b/switcher/sh.d/5_large_terminal.sh index aae06a3..24e4f19 100755 --- a/switcher/sh.d/5_large_terminal.sh +++ b/switcher/sh.d/5_large_terminal.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash vncserver -kill :1 -vncserver -geometry 512x384 +vncserver -geometry 512x384 -depth 16 ssvncviewer -scale 0.625 :1 -fullscreen -passwd ~/.vnc/passwd & DISPLAY=:1 xterm