From 8bae7f2c8ca9233c8646338d9de46bbab9e60394 Mon Sep 17 00:00:00 2001 From: IanSB Date: Wed, 23 Sep 2020 00:42:56 +0100 Subject: [PATCH] Tweak auto refresh setting --- src/osd.c | 8 ++++---- src/rgb_to_hdmi.c | 8 ++++---- src/rgb_to_hdmi.h | 2 +- src/scripts/Resolutions/Auto@50Hz-60Hz-Plus.txt | 2 -- src/scripts/Resolutions/Auto@50Hz-60Hz.txt | 2 +- src/scripts/Resolutions/Auto@Unlimited.txt | 2 ++ src/scripts/config.txt | 9 +++------ 7 files changed, 15 insertions(+), 18 deletions(-) delete mode 100644 src/scripts/Resolutions/Auto@50Hz-60Hz-Plus.txt create mode 100644 src/scripts/Resolutions/Auto@Unlimited.txt diff --git a/src/osd.c b/src/osd.c index bb7186e2..fa9a1761 100644 --- a/src/osd.c +++ b/src/osd.c @@ -241,7 +241,7 @@ static const char *vlockspeed_names[] = { static const char *vlockadj_names[] = { "-5% to +5%", - "Full Range" + "Unlimited" }; static const char *fontsize_names[] = { @@ -5032,14 +5032,14 @@ void osd_init() { } if (cbytes) { - prop = get_prop_no_space(config_buffer, "#force_full_range"); + prop = get_prop_no_space(config_buffer, "#force_genlock_range"); } if (!prop || !cbytes) { prop = "0"; } - log_info("Read force_full_range: %s", prop); + log_info("Read force_genlock_range: %s", prop); int val = atoi(prop); - set_force_full_range(val); + set_force_genlock_range(val); if (cbytes) { prop = get_prop_no_space(config_buffer, "#scaling"); diff --git a/src/rgb_to_hdmi.c b/src/rgb_to_hdmi.c index 9dfff36d..ffbdc980 100644 --- a/src/rgb_to_hdmi.c +++ b/src/rgb_to_hdmi.c @@ -242,7 +242,7 @@ static int helper_flag = 0; static int simple_detected = 0; static int supports8bit = 0; static int newanalog = 0; -static int force_full_range = 0; +static int force_genlock_range = 0; static unsigned int pll_freq = 0; static unsigned int new_clock = 0; static unsigned int old_pll_freq = 0; @@ -956,7 +956,7 @@ static void recalculate_hdmi_clock(int vlockmode, int genlock_adjust) { vlock_limited = 0; - switch (force_full_range) { + switch (force_genlock_range) { default: case 0: if ((vlockadj == VLOCKADJ_NARROW) && (error_ppm < -50000 || error_ppm > 50000)) { @@ -2103,8 +2103,8 @@ int get_paletteControl() { return paletteControl; } -void set_force_full_range(int value) { - force_full_range = value; +void set_force_genlock_range(int value) { + force_genlock_range = value; } void set_resolution(int mode, const char *name, int reboot) { diff --git a/src/rgb_to_hdmi.h b/src/rgb_to_hdmi.h index f87aa2cf..c34e0532 100644 --- a/src/rgb_to_hdmi.h +++ b/src/rgb_to_hdmi.h @@ -8,7 +8,7 @@ void set_subprofile(int value); int get_subprofile(); void set_paletteControl(int value); int get_paletteControl(); -void set_force_full_range(int value); +void set_force_genlock_range(int value); void set_resolution(int mode, const char *name, int reboot); int get_resolution(); void set_scaling(int mode, int reboot); diff --git a/src/scripts/Resolutions/Auto@50Hz-60Hz-Plus.txt b/src/scripts/Resolutions/Auto@50Hz-60Hz-Plus.txt deleted file mode 100644 index 7d3c3d01..00000000 --- a/src/scripts/Resolutions/Auto@50Hz-60Hz-Plus.txt +++ /dev/null @@ -1,2 +0,0 @@ -## Auto@50Hz-60Hz-Plus -#force_full_range=2 diff --git a/src/scripts/Resolutions/Auto@50Hz-60Hz.txt b/src/scripts/Resolutions/Auto@50Hz-60Hz.txt index 4e4c51ec..158cdae4 100644 --- a/src/scripts/Resolutions/Auto@50Hz-60Hz.txt +++ b/src/scripts/Resolutions/Auto@50Hz-60Hz.txt @@ -1,2 +1,2 @@ ## Auto@50Hz-60Hz -#force_full_range=1 +#force_genlock_range=1 diff --git a/src/scripts/Resolutions/Auto@Unlimited.txt b/src/scripts/Resolutions/Auto@Unlimited.txt new file mode 100644 index 00000000..0969ff84 --- /dev/null +++ b/src/scripts/Resolutions/Auto@Unlimited.txt @@ -0,0 +1,2 @@ +## Auto@Unlimited +#force_genlock_range=2 diff --git a/src/scripts/config.txt b/src/scripts/config.txt index 9950b13b..10556162 100644 --- a/src/scripts/config.txt +++ b/src/scripts/config.txt @@ -120,12 +120,9 @@ kernel=kernelrpi4.img [all] -# ===================================================================== -# Custom settings -# ===================================================================== - -#resolution=Default@60Hz -## Default @ 60Hz +#resolution=Auto@50Hz-60Hz +## Auto@50Hz-60Hz +#force_genlock_range=1 #scaling=0 scaling_kernel=8