From 1117886880bba60e7792c3343dc62320df48a1dc Mon Sep 17 00:00:00 2001 From: IanSB Date: Fri, 9 Oct 2020 19:34:19 +0100 Subject: [PATCH 1/3] Rename some profiles --- .../Profiles/3-12_BIT_BBC/{Atom_TTL.txt => Acorn_Atom_TTL.txt} | 0 .../Profiles/3-12_BIT_BBC/{Electron.txt => Acorn_Electron.txt} | 0 .../Profiles/3-12_BIT_BBC/{Master_128.txt => BBC_Master.txt} | 0 src/scripts/Profiles/3-12_BIT_BBC/{QL.txt => Sinclair_QL.txt} | 0 .../3-12_BIT_BBC_Analog/{Electron.txt => Acorn_Electron.txt} | 0 .../3-12_BIT_BBC_Analog/{Master_128.txt => BBC_Master.txt} | 0 .../Profiles/3-12_BIT_BBC_Analog/{QL.txt => Sinclair_QL.txt} | 0 .../Profiles/6-12_BIT_RGB/{Atom_TTL.txt => Acorn_Atom_TTL.txt} | 0 .../Profiles/6-12_BIT_RGB/{Electron.txt => Acorn_Electron.txt} | 0 src/scripts/Profiles/6-12_BIT_RGB/{QL.txt => Sinclair_QL.txt} | 0 .../6-12_BIT_RGB_Analog/{Electron.txt => Acorn_Electron.txt} | 0 .../Profiles/6-12_BIT_RGB_Analog/{QL.txt => Sinclair_QL.txt} | 0 .../Profiles/6-12_BIT_YUV_Analog/{Atom.txt => Acorn_Atom.txt} | 0 src/scripts/Profiles/Atom/{Atom.txt => Acorn_Atom.txt} | 0 .../Legacy_3_BIT/{Atom_v10-v20.txt => Acorn_Atom_v10-v20.txt} | 0 .../Legacy_3_BIT/{Atom_v21-v23.txt => Acorn_Atom_v21-v23.txt} | 0 .../Legacy_3_BIT/{Atom_v24-v62.txt => Acorn_Atom_v24-v62.txt} | 0 17 files changed, 0 insertions(+), 0 deletions(-) rename src/scripts/Profiles/3-12_BIT_BBC/{Atom_TTL.txt => Acorn_Atom_TTL.txt} (100%) rename src/scripts/Profiles/3-12_BIT_BBC/{Electron.txt => Acorn_Electron.txt} (100%) rename src/scripts/Profiles/3-12_BIT_BBC/{Master_128.txt => BBC_Master.txt} (100%) rename src/scripts/Profiles/3-12_BIT_BBC/{QL.txt => Sinclair_QL.txt} (100%) rename src/scripts/Profiles/3-12_BIT_BBC_Analog/{Electron.txt => Acorn_Electron.txt} (100%) rename src/scripts/Profiles/3-12_BIT_BBC_Analog/{Master_128.txt => BBC_Master.txt} (100%) rename src/scripts/Profiles/3-12_BIT_BBC_Analog/{QL.txt => Sinclair_QL.txt} (100%) rename src/scripts/Profiles/6-12_BIT_RGB/{Atom_TTL.txt => Acorn_Atom_TTL.txt} (100%) rename src/scripts/Profiles/6-12_BIT_RGB/{Electron.txt => Acorn_Electron.txt} (100%) rename src/scripts/Profiles/6-12_BIT_RGB/{QL.txt => Sinclair_QL.txt} (100%) rename src/scripts/Profiles/6-12_BIT_RGB_Analog/{Electron.txt => Acorn_Electron.txt} (100%) rename src/scripts/Profiles/6-12_BIT_RGB_Analog/{QL.txt => Sinclair_QL.txt} (100%) rename src/scripts/Profiles/6-12_BIT_YUV_Analog/{Atom.txt => Acorn_Atom.txt} (100%) rename src/scripts/Profiles/Atom/{Atom.txt => Acorn_Atom.txt} (100%) rename src/scripts/Profiles/Legacy_3_BIT/{Atom_v10-v20.txt => Acorn_Atom_v10-v20.txt} (100%) rename src/scripts/Profiles/Legacy_3_BIT/{Atom_v21-v23.txt => Acorn_Atom_v21-v23.txt} (100%) rename src/scripts/Profiles/Legacy_3_BIT/{Atom_v24-v62.txt => Acorn_Atom_v24-v62.txt} (100%) diff --git a/src/scripts/Profiles/3-12_BIT_BBC/Atom_TTL.txt b/src/scripts/Profiles/3-12_BIT_BBC/Acorn_Atom_TTL.txt similarity index 100% rename from src/scripts/Profiles/3-12_BIT_BBC/Atom_TTL.txt rename to src/scripts/Profiles/3-12_BIT_BBC/Acorn_Atom_TTL.txt diff --git a/src/scripts/Profiles/3-12_BIT_BBC/Electron.txt b/src/scripts/Profiles/3-12_BIT_BBC/Acorn_Electron.txt similarity index 100% rename from src/scripts/Profiles/3-12_BIT_BBC/Electron.txt rename to src/scripts/Profiles/3-12_BIT_BBC/Acorn_Electron.txt diff --git a/src/scripts/Profiles/3-12_BIT_BBC/Master_128.txt b/src/scripts/Profiles/3-12_BIT_BBC/BBC_Master.txt similarity index 100% rename from src/scripts/Profiles/3-12_BIT_BBC/Master_128.txt rename to src/scripts/Profiles/3-12_BIT_BBC/BBC_Master.txt diff --git a/src/scripts/Profiles/3-12_BIT_BBC/QL.txt b/src/scripts/Profiles/3-12_BIT_BBC/Sinclair_QL.txt similarity index 100% rename from src/scripts/Profiles/3-12_BIT_BBC/QL.txt rename to src/scripts/Profiles/3-12_BIT_BBC/Sinclair_QL.txt diff --git a/src/scripts/Profiles/3-12_BIT_BBC_Analog/Electron.txt b/src/scripts/Profiles/3-12_BIT_BBC_Analog/Acorn_Electron.txt similarity index 100% rename from src/scripts/Profiles/3-12_BIT_BBC_Analog/Electron.txt rename to src/scripts/Profiles/3-12_BIT_BBC_Analog/Acorn_Electron.txt diff --git a/src/scripts/Profiles/3-12_BIT_BBC_Analog/Master_128.txt b/src/scripts/Profiles/3-12_BIT_BBC_Analog/BBC_Master.txt similarity index 100% rename from src/scripts/Profiles/3-12_BIT_BBC_Analog/Master_128.txt rename to src/scripts/Profiles/3-12_BIT_BBC_Analog/BBC_Master.txt diff --git a/src/scripts/Profiles/3-12_BIT_BBC_Analog/QL.txt b/src/scripts/Profiles/3-12_BIT_BBC_Analog/Sinclair_QL.txt similarity index 100% rename from src/scripts/Profiles/3-12_BIT_BBC_Analog/QL.txt rename to src/scripts/Profiles/3-12_BIT_BBC_Analog/Sinclair_QL.txt diff --git a/src/scripts/Profiles/6-12_BIT_RGB/Atom_TTL.txt b/src/scripts/Profiles/6-12_BIT_RGB/Acorn_Atom_TTL.txt similarity index 100% rename from src/scripts/Profiles/6-12_BIT_RGB/Atom_TTL.txt rename to src/scripts/Profiles/6-12_BIT_RGB/Acorn_Atom_TTL.txt diff --git a/src/scripts/Profiles/6-12_BIT_RGB/Electron.txt b/src/scripts/Profiles/6-12_BIT_RGB/Acorn_Electron.txt similarity index 100% rename from src/scripts/Profiles/6-12_BIT_RGB/Electron.txt rename to src/scripts/Profiles/6-12_BIT_RGB/Acorn_Electron.txt diff --git a/src/scripts/Profiles/6-12_BIT_RGB/QL.txt b/src/scripts/Profiles/6-12_BIT_RGB/Sinclair_QL.txt similarity index 100% rename from src/scripts/Profiles/6-12_BIT_RGB/QL.txt rename to src/scripts/Profiles/6-12_BIT_RGB/Sinclair_QL.txt diff --git a/src/scripts/Profiles/6-12_BIT_RGB_Analog/Electron.txt b/src/scripts/Profiles/6-12_BIT_RGB_Analog/Acorn_Electron.txt similarity index 100% rename from src/scripts/Profiles/6-12_BIT_RGB_Analog/Electron.txt rename to src/scripts/Profiles/6-12_BIT_RGB_Analog/Acorn_Electron.txt diff --git a/src/scripts/Profiles/6-12_BIT_RGB_Analog/QL.txt b/src/scripts/Profiles/6-12_BIT_RGB_Analog/Sinclair_QL.txt similarity index 100% rename from src/scripts/Profiles/6-12_BIT_RGB_Analog/QL.txt rename to src/scripts/Profiles/6-12_BIT_RGB_Analog/Sinclair_QL.txt diff --git a/src/scripts/Profiles/6-12_BIT_YUV_Analog/Atom.txt b/src/scripts/Profiles/6-12_BIT_YUV_Analog/Acorn_Atom.txt similarity index 100% rename from src/scripts/Profiles/6-12_BIT_YUV_Analog/Atom.txt rename to src/scripts/Profiles/6-12_BIT_YUV_Analog/Acorn_Atom.txt diff --git a/src/scripts/Profiles/Atom/Atom.txt b/src/scripts/Profiles/Atom/Acorn_Atom.txt similarity index 100% rename from src/scripts/Profiles/Atom/Atom.txt rename to src/scripts/Profiles/Atom/Acorn_Atom.txt diff --git a/src/scripts/Profiles/Legacy_3_BIT/Atom_v10-v20.txt b/src/scripts/Profiles/Legacy_3_BIT/Acorn_Atom_v10-v20.txt similarity index 100% rename from src/scripts/Profiles/Legacy_3_BIT/Atom_v10-v20.txt rename to src/scripts/Profiles/Legacy_3_BIT/Acorn_Atom_v10-v20.txt diff --git a/src/scripts/Profiles/Legacy_3_BIT/Atom_v21-v23.txt b/src/scripts/Profiles/Legacy_3_BIT/Acorn_Atom_v21-v23.txt similarity index 100% rename from src/scripts/Profiles/Legacy_3_BIT/Atom_v21-v23.txt rename to src/scripts/Profiles/Legacy_3_BIT/Acorn_Atom_v21-v23.txt diff --git a/src/scripts/Profiles/Legacy_3_BIT/Atom_v24-v62.txt b/src/scripts/Profiles/Legacy_3_BIT/Acorn_Atom_v24-v62.txt similarity index 100% rename from src/scripts/Profiles/Legacy_3_BIT/Atom_v24-v62.txt rename to src/scripts/Profiles/Legacy_3_BIT/Acorn_Atom_v24-v62.txt From 35ae5bf8d524f62f83eebd112d4e947cdbfadd50 Mon Sep 17 00:00:00 2001 From: IanSB Date: Fri, 9 Oct 2020 19:35:11 +0100 Subject: [PATCH 2/3] Update default profile names --- src/cpld_atom.c | 2 +- src/cpld_rgb.c | 4 ++-- src/cpld_yuv.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cpld_atom.c b/src/cpld_atom.c index 3ca0544c..c1ffc63c 100644 --- a/src/cpld_atom.c +++ b/src/cpld_atom.c @@ -279,7 +279,7 @@ static void cpld_set_frontend(int value) { cpld_t cpld_atom = { .name = "Atom", - .default_profile = "Atom", + .default_profile = "Acorn_Atom", .init = cpld_init, .get_version = cpld_get_version, .calibrate = cpld_calibrate, diff --git a/src/cpld_rgb.c b/src/cpld_rgb.c index bb90749c..f324e854 100644 --- a/src/cpld_rgb.c +++ b/src/cpld_rgb.c @@ -1649,7 +1649,7 @@ static int cpld_frontend_info_rgb_ttl() { cpld_t cpld_rgb_ttl = { .name = "6-12_BIT_RGB", - .default_profile = "Electron", + .default_profile = "Acorn_Electron", .init = cpld_init_rgb_ttl, .get_version = cpld_get_version, .calibrate = cpld_calibrate, @@ -1747,7 +1747,7 @@ cpld_t cpld_rgb_analog = { cpld_t cpld_rgb_analog_24mhz = { .name = "3-12_BIT_BBC_Analog", - .default_profile = "Amstrad_CPC", + .default_profile = "BBC_Micro", .init = cpld_init_rgb_analog, .get_version = cpld_get_version, .calibrate = cpld_calibrate, diff --git a/src/cpld_yuv.c b/src/cpld_yuv.c index e2600560..408ec0cc 100644 --- a/src/cpld_yuv.c +++ b/src/cpld_yuv.c @@ -1026,7 +1026,7 @@ static void cpld_set_frontend(int value) { cpld_t cpld_yuv = { .name = "6-12_BIT_YUV_Analog", - .default_profile = "Atom", + .default_profile = "Acorn_Atom", .init = cpld_init, .get_version = cpld_get_version, .calibrate = cpld_calibrate, From 87c303981e117b2a836926650418e399d32db8e0 Mon Sep 17 00:00:00 2001 From: IanSB Date: Sat, 10 Oct 2020 01:14:59 +0100 Subject: [PATCH 3/3] Fix hang when displaying Calibration Summary in 12BPP mode --- src/cpld_rgb.c | 16 +++++++++++++++- src/cpld_yuv.c | 4 ++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/cpld_rgb.c b/src/cpld_rgb.c index f324e854..a53a6731 100644 --- a/src/cpld_rgb.c +++ b/src/cpld_rgb.c @@ -633,7 +633,21 @@ static int osd_sp(config_t *config, int line, int metric) { } // Line ------ if (supports_rate) { - sprintf(message, " Sample Mode: %s", rate_names[config->rate]); + char *rate_string; + if (supports_analog) { + if (supports_6x2_or_4_level_or_12) { + rate_string = (char *) twelve_bit_rate_names_analog[config->rate]; + } else { + rate_string = (char *) rate_names[config->rate]; + } + } else { + if (supports_6x2_or_4_level_or_12) { + rate_string = (char *) twelve_bit_rate_names_digital[config->rate]; + } else { + rate_string = (char *) rate_names[config->rate]; + } + } + sprintf(message, " Sample Mode: %s", rate_string); osd_set(line, 0, message); line++; } diff --git a/src/cpld_yuv.c b/src/cpld_yuv.c index 408ec0cc..153e8acf 100644 --- a/src/cpld_yuv.c +++ b/src/cpld_yuv.c @@ -971,13 +971,13 @@ static void cpld_show_cal_details(int line) { // Two column display int num = range >> 1; for (int value = 0; value < num; value++) { - sprintf(message, "Offset %d: %6d; Offset %2d: %6d", value, sum_metrics[value], value + num, sum_metrics[value + num]); + sprintf(message, "Phase %d: %6d; Offset %2d: %6d", value, sum_metrics[value], value + num, sum_metrics[value + num]); osd_set(line + value, 0, message); } } else { // One column display for (int value = 0; value < range; value++) { - sprintf(message, "Offset %d: %6d", value, sum_metrics[value]); + sprintf(message, "Phase %d: %6d", value, sum_metrics[value]); osd_set(line + value, 0, message); } }