Merge remote-tracking branch 'ian/dev' into dev

Change-Id: I0b8fc6118b8c9032329abde3f9c6ea4a5a8fe564

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,

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++;
    }
@@ -1649,7 +1663,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 +1761,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,

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);
          }
       }
@@ -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,