Add sampling phase in degrees. Also make Apple II default for YUV CPLD

hoglet67 · Jun 8, 2021 · 7468549 · 7468549
1 parent 35588fb
commit 7468549
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 7 deletions.
diff --git a/src/cpld_rgb.c b/src/cpld_rgb.c
@@ -59,6 +59,9 @@ static int frontend = 0;
 // OSD message buffer
 static char message[256];
 
+// phase text buffer
+static char phase_text[256];
+
 // Per-Offset calibration metrics (i.e. errors) for mode 0..6
 static int raw_metrics_default[16][NUM_OFFSETS];
 
@@ -1508,7 +1511,12 @@ static const char *cpld_get_value_string(int num) {
    }
    if (num >= DAC_A && num <= DAC_H) {
       return volt_names[cpld_get_value(num)];
-   }        
+   }
+   if (num >= ALL_OFFSETS && num <= F_OFFSET) {
+      sprintf(phase_text, "%d (%d Degrees)", cpld_get_value(num), cpld_get_value(num) * 360 / divider_lookup[config->divider]);
+      return phase_text;
+   }
+
    return NULL;
 }
 

diff --git a/src/cpld_yuv.c b/src/cpld_yuv.c
@@ -324,7 +324,10 @@ static config_t default_config;
 static config_t *config = &default_config;
 
 // OSD message buffer
-static char message[80];
+static char message[256];
+
+// phase text buffer
+static char phase_text[256];
 
 // Aggregate calibration metrics (i.e. errors summed across all channels)
 static int sum_metrics[RANGE_MAX];
@@ -353,6 +356,19 @@ static int supports_mux            = 1; /* mux moved from pin to register bit */
 static int invert = 0;
 static int supports_analog = 0;
 
+int yuv_divider_lookup[] = { 6, 8, 10, 12, 14, 16, 3, 4 };
+
+static const char *yuv_divider_names[] = {
+   "x6",
+   "x8",
+   "x10",
+   "x12",
+   "x14",
+   "x16",
+   "x3",
+   "x4"
+};
+
 // =============================================================
 // Param definitions for OSD
 // =============================================================
@@ -1079,8 +1095,8 @@ static int cpld_get_value(int num) {
    case HALF:
       return config->half_px_delay;
    case DIVIDER:
+      config->divider = 1; //fixed at x8
       return config->divider;
-
    }
    return 0;
 }
@@ -1089,6 +1105,9 @@ static const char *cpld_get_value_string(int num) {
    if (num == EDGE) {
       return edge_names[config->edge];
    }
+   if (num == DIVIDER) {
+      return yuv_divider_names[config->divider];
+   }
    if (num == RATE) {
       if ((cpld_version & 0xff) >= 0x82) {
           return rate_names[config->rate];
@@ -1110,6 +1129,15 @@ static const char *cpld_get_value_string(int num) {
    if (num >= DAC_A && num <= DAC_H) {
       return volt_names[cpld_get_value(num)];
    }
+   if (num >= ALL_OFFSETS && num <= F_OFFSET) {
+      if (config->sub_c != 0) {
+          sprintf(phase_text, "%d (%d Degrees)", cpld_get_value(num), cpld_get_value(num) * 180 / yuv_divider_lookup[config->divider]);
+      } else {
+          sprintf(phase_text, "%d (%d Degrees)", cpld_get_value(num), cpld_get_value(num) * 360 / yuv_divider_lookup[config->divider]);
+      }
+      return phase_text;
+   }
+
    return NULL;
 }
 
@@ -1252,7 +1280,7 @@ static void cpld_set_value(int num, int value) {
       config->half_px_delay = value;
       break;
    case DIVIDER:
-      config->divider = value;
+      config->divider = 1;       // fixed at x8
       break;
 
    }
@@ -1291,7 +1319,7 @@ static int cpld_old_firmware_support() {
 }
 
 static int cpld_get_divider() {
-    return 8;                        // not sure of value for atom cpld
+    return yuv_divider_lookup[config->divider];
 }
 
 static int cpld_get_delay() {
@@ -1347,7 +1375,7 @@ static void cpld_init_ttl(int value) {
 
 cpld_t cpld_yuv_analog = {
    .name = "6-12_BIT_YUV_Analog",
-   .default_profile = "Acorn_Atom",
+   .default_profile = "Apple_II",
    .init = cpld_init_analog,
    .get_version = cpld_get_version,
    .calibrate = cpld_calibrate,
@@ -1369,7 +1397,6 @@ cpld_t cpld_yuv_analog = {
    .show_cal_details = cpld_show_cal_details
 };
 
-
 cpld_t cpld_yuv_ttl = {
    .name = "6-12_BIT_YUV",
    .default_profile = "Apple_IIc_TTL",