From be11386973771b90a16e270d840ba867456f20f6 Mon Sep 17 00:00:00 2001 From: Locutus73 Date: Mon, 27 May 2019 13:27:45 +0200 Subject: [PATCH 1/2] Version 1.0.6 setupCURL (so Internet connectivity check) is called only when needed; improved textual descriptions of options. --- ini_settings.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ini_settings.sh b/ini_settings.sh index 0e34c71..4527b14 100644 --- a/ini_settings.sh +++ b/ini_settings.sh @@ -18,6 +18,7 @@ # You can download the latest version of this script from: # https://github.com/MiSTer-devel/Scripts_MiSTer +# Version 1.0.6 - 2019-05-27 - setupCURL (so Internet connectivity check) is called only when needed; improved textual descriptions of options. # Version 1.0.5 - 2019-05-27 - Improved textual descriptions of options. # Version 1.0.4 - 2019-05-27 - Improved ini value reading: only the first instance of a key is read, so specific core settings will be ignored. # Version 1.0.4 - 2019-05-27 - Improved textual descriptions of options; removed hostname check, so users can use different hostnames than MiSTer; pressing ESC in submenus returns to the main menu instead of quitting the script. @@ -346,6 +347,7 @@ function readDIALOGtempfile { function loadMiSTerINI { if [ ! -f "${MISTER_INI_FILE}" ] then + setupCURL echo "Downloading MiSTer.ini" ${CURL} "https://github.com/MiSTer-devel/Main_MiSTer/blob/master/MiSTer.ini?raw=true" -o "${MISTER_INI_FILE}" fi @@ -433,7 +435,7 @@ function showOptionMENU { "font") [ ! -d /media/fat/font ] && return ${DIALOG_CANCEL} ADDITIONAL_OPTIONS="--no-items" - INI_KEY_HELP="$(eval echo \${KEY_${INI_KEY}[0]})" + INI_KEY_HELP="${INI_KEY}:\n$(eval echo \${KEY_${INI_KEY}[0]})" for FONT in /media/fat/font/*.pf do INI_VALUE_RAW="${FONT}" @@ -474,7 +476,6 @@ function showOptionMENU { checkTERMINAL setupScriptINI -setupCURL setupDIALOG loadMiSTerINI From 6e83f527c1307a9cbcd49e4b716372f1bd3b7320 Mon Sep 17 00:00:00 2001 From: Locutus73 Date: Mon, 27 May 2019 14:02:27 +0200 Subject: [PATCH 2/2] Version 1.0.7 Improved textual descriptions of options. --- ini_settings.sh | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/ini_settings.sh b/ini_settings.sh index 4527b14..72f7d48 100644 --- a/ini_settings.sh +++ b/ini_settings.sh @@ -18,6 +18,7 @@ # You can download the latest version of this script from: # https://github.com/MiSTer-devel/Scripts_MiSTer +# Version 1.0.7 - 2019-05-27 - Improved textual descriptions of options. # Version 1.0.6 - 2019-05-27 - setupCURL (so Internet connectivity check) is called only when needed; improved textual descriptions of options. # Version 1.0.5 - 2019-05-27 - Improved textual descriptions of options. # Version 1.0.4 - 2019-05-27 - Improved ini value reading: only the first instance of a key is read, so specific core settings will be ignored. @@ -112,27 +113,27 @@ KEY_dvi_mode=( ) KEY_vga_scaler=( - "Connects VGA to the scaler output" - "0|Off" - "1|On" + "Connects analog video output to the scaler output, changing the resolution" + "0|Off|Analog video will output native core resolution" + "1|On|Analog video output will output same resolution as HDMI port" ) KEY_forced_scandoubler=( - "Forces scandoubler on VGA output, good for VGA monitors not supporting 15KHz" - "0|Off|15KHz VGA out for 15KHz cores, works on CRT TV sets, but may have problems with PC monitors" - "1|On|30KHz VGA out for 15KHz cores, good for VGA monitors not supporting 15KHz" + "Forces scandoubler (240p/15kHz to 480p/31kHz) on analog video output" + "0|Off|15KHz analog video out for 15KHz cores, works on CRT TV sets, but may have problems with PC monitors" + "1|On|30KHz analog video out for 15KHz cores (core dependent), good for VGA monitors not supporting 15KHz" ) KEY_ypbpr=( - "Sets YPbPr on VGA output" - "0|Off|RGB VGA output" - "1|On|YPbPr VGA output" + "Enables component video (YPbPr) on analog video output" + "0|Off|RGB analog video output; please disable Sync-on-Green (SOG) switch (position further from HDMI port)" + "1|On|YPbPr analog video output; please enable Sync-on-Green (SOG) switch (position closest to HDMI port)" ) KEY_composite_sync=( - "Sets composite sync on HSync signal of VGA output" - "0|Off|Normal HSync signal of VGA output" - "1|On|Composite sync on HSync signal of VGA output" + "Sets composite sync on HSync signal of analog video output; used for display compatibility" + "0|Off|Separate sync (RGBHV); used for VGA monitors" + "1|On|Composite sync (RGBS); used for most other displays including RGB CRTs, PVMs, BVMS, and upscaler devices" ) KEY_hdmi_audio_96k=( @@ -165,7 +166,7 @@ KEY_video_info=( ) KEY_font=( - "Custom font. Put custom fonts in /media/fat/font" + "Custom font; put custom fonts in /media/fat/font" ) KEY_volumectl=(