From f1870ad6ee68c6656bbb5e78db06ce990dfd1320 Mon Sep 17 00:00:00 2001
From: IanSB <isb@clara.co.uk>
Date: Tue, 11 Feb 2020 15:49:12 +0000
Subject: [PATCH] Support renamed profile folders & fix termination on/off

---
 src/cpld_rgb.c | 16 ++++++++--------
 src/cpld_yuv.c |  4 ++--
 src/osd.c      | 18 +++++++++---------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/cpld_rgb.c b/src/cpld_rgb.c
index 55bafbd2..e75ac8dd 100644
--- a/src/cpld_rgb.c
+++ b/src/cpld_rgb.c
@@ -156,7 +156,7 @@ static param_t params[] = {
    {       DAC_D,  "DAC-D: RB Lo",    "dac_d", 0, 255, 1 },
    {       DAC_E,  "DAC-E: G Mid/VS", "dac_f", 0, 255, 1 },
    {       DAC_F,  "DAC-F: Sync",     "dac_g", 0, 255, 1 },
-   {       DAC_G,  "DAC-G: Terminate","dac_g", 0, 255, 1 },
+   {       DAC_G,  "DAC-G: Terminate","dac_g", 0, 1, 1 },
    {       DAC_H,  "DAC-H: G Clamp",  "dac_h", 0, 255, 1 },
    {          -1,          NULL,          NULL, 0,   0, 1 }
 };
@@ -977,7 +977,7 @@ static int cpld_frontend_info_bbc() {
 }
 
 cpld_t cpld_bbc = {
-   .name = "BBC",
+   .name = "3BIT_RGB",
    .default_profile = "BBC_Micro",
    .init = cpld_init_bbc,
    .get_version = cpld_get_version,
@@ -1000,7 +1000,7 @@ cpld_t cpld_bbc = {
 };
 
 cpld_t cpld_bbcv10v20 = {
-   .name = "OBBC",
+   .name = "Legacy_3BIT",
    .default_profile = "BBC_Micro_v10-v20",
    .init = cpld_init_bbc,
    .get_version = cpld_get_version,
@@ -1023,7 +1023,7 @@ cpld_t cpld_bbcv10v20 = {
 };
 
 cpld_t cpld_bbcv21v23 = {
-   .name = "OBBC",
+   .name = "Legacy_3BIT",
    .default_profile = "BBC_Micro_v21-v23",
    .init = cpld_init_bbc,
    .get_version = cpld_get_version,
@@ -1046,7 +1046,7 @@ cpld_t cpld_bbcv21v23 = {
 };
 
 cpld_t cpld_bbcv24 = {
-   .name = "OBBC",
+   .name = "Legacy_3BIT",
    .default_profile = "BBC_Micro_v24",
    .init = cpld_init_bbc,
    .get_version = cpld_get_version,
@@ -1069,7 +1069,7 @@ cpld_t cpld_bbcv24 = {
 };
 
 cpld_t cpld_bbcv30v62 = {
-   .name = "OBBC",
+   .name = "Legacy_3BIT",
    .default_profile = "BBC_Micro_v30-v62",
    .init = cpld_init_bbc,
    .get_version = cpld_get_version,
@@ -1106,7 +1106,7 @@ static int cpld_frontend_info_rgb_ttl() {
 }
 
 cpld_t cpld_rgb_ttl = {
-   .name = "RGB(TTL)",
+   .name = "6BIT_RGB",
    .default_profile = "BBC_Micro",
    .init = cpld_init_rgb_ttl,
    .get_version = cpld_get_version,
@@ -1147,7 +1147,7 @@ static void cpld_set_frontend_rgb_analog(int value) {
 }
 
 cpld_t cpld_rgb_analog = {
-   .name = "RGB(Analog)",
+   .name = "6BIT_RGB_Analog",
    .default_profile = "Amstrad_CPC",
    .init = cpld_init_rgb_analog,
    .get_version = cpld_get_version,
diff --git a/src/cpld_yuv.c b/src/cpld_yuv.c
index a640b708..ab268eba 100644
--- a/src/cpld_yuv.c
+++ b/src/cpld_yuv.c
@@ -152,7 +152,7 @@ static param_t params[] = {
    {       DAC_D,  "DAC-D: UV Lo",    "dac_d", 0, 255, 1 },
    {       DAC_E,  "DAC-E: Y Mid/VS", "dac_f", 0, 255, 1 },
    {       DAC_F,  "DAC-F: Sync",     "dac_g", 0, 255, 1 },
-   {       DAC_G,  "DAC-G: Terminate","dac_g", 0, 255, 1 },
+   {       DAC_G,  "DAC-G: Terminate","dac_g", 0, 1, 1 },
    {       DAC_H,  "DAC-H: Y Clamp",  "dac_h", 0, 255, 1 },
    {          -1,  NULL,                  NULL, 0,   0, 0 }
 };
@@ -660,7 +660,7 @@ static void cpld_set_frontend(int value) {
 
 
 cpld_t cpld_yuv = {
-   .name = "YUV",
+   .name = "6BIT_YUV_Analog",
    .default_profile = "Atom",
    .init = cpld_init,
    .get_version = cpld_get_version,
diff --git a/src/osd.c b/src/osd.c
index b7be1d68..1b5589fa 100644
--- a/src/osd.c
+++ b/src/osd.c
@@ -178,13 +178,13 @@ static const char *scaling_names[] = {
 };
 
 static const char *frontend_names[] = {
-   "TTL RGB (3 bit)",
-   "Atom 6847",
-   "TTL RGB (6 Bit)",
-   "Analog RGB/CVBS (5259)",
-   "Analog RGB/CVBS (UA1)",
-   "Analog RGB/CVBS (UB1)",
-   "YUV (5259)"
+   "3 BIT RGB",
+   "Atom",
+   "6 BIT RGB",
+   "6 BIT RGB Analog",
+   "6 BIT RGB Analog DAC:UA1",
+   "6 BIT RGB Analog DAC:UB1",
+   "6 BIT YUV Analog"
 };
 
 static const char *vlockspeed_names[] = {
@@ -3110,9 +3110,9 @@ int osd_key(int key) {
                 int major = (cpld->get_version() >> VERSION_MAJOR_BIT) & 0xF;
                 int minor = (cpld->get_version() >> VERSION_MINOR_BIT) & 0xF;
                 if (major == 0x0f && minor == 0x0f) {
-                    sprintf(msg, "Current: BLANK, press to update");
+                    sprintf(msg, "Current = BLANK: Confirm?");
                 } else {
-                    sprintf(msg, "Current: %s v%x.%x, press to update", cpld->name, major, minor);
+                    sprintf(msg, "Current = %s v%x.%x: Confirm?", cpld->name, major, minor);
                 }
                 set_status_message(msg);
                 first_time_update = 1;