Add separate 24Mhz profile folder support

pull/158/head
IanSB 2020-09-20 02:30:51 +01:00
rodzic 413c451c25
commit b3bc2ffbf0
3 zmienionych plików z 62 dodań i 3 usunięć

Wyświetl plik

@ -1554,6 +1554,30 @@ cpld_t cpld_rgb_ttl = {
.show_cal_raw = cpld_show_cal_raw
};
cpld_t cpld_rgb_ttl_24mhz = {
.name = "6-12_BIT_RGB_24Mhz",
.default_profile = "Master_128_24MHz_Even",
.init = cpld_init_rgb_ttl,
.get_version = cpld_get_version,
.calibrate = cpld_calibrate,
.set_mode = cpld_set_mode,
.set_vsync_psync = cpld_set_vsync_psync,
.analyse = cpld_analyse,
.old_firmware_support = cpld_old_firmware_support,
.frontend_info = cpld_frontend_info_rgb_ttl,
.set_frontend = cpld_set_frontend,
.get_divider = cpld_get_divider,
.get_delay = cpld_get_delay,
.get_sync_edge = cpld_get_sync_edge,
.update_capture_info = cpld_update_capture_info,
.get_params = cpld_get_params,
.get_value = cpld_get_value,
.get_value_string = cpld_get_value_string,
.set_value = cpld_set_value,
.show_cal_summary = cpld_show_cal_summary,
.show_cal_details = cpld_show_cal_details,
.show_cal_raw = cpld_show_cal_raw
};
// =============================================================
// RGB_Analog Driver Specific
@ -1601,3 +1625,29 @@ cpld_t cpld_rgb_analog = {
.show_cal_details = cpld_show_cal_details,
.show_cal_raw = cpld_show_cal_raw
};
cpld_t cpld_rgb_analog_24mhz = {
.name = "6-12_BIT_RGB_24Mhz",
.default_profile = "Master_128_24MHz_Even",
.init = cpld_init_rgb_analog,
.get_version = cpld_get_version,
.calibrate = cpld_calibrate,
.set_mode = cpld_set_mode,
.set_vsync_psync = cpld_set_vsync_psync,
.analyse = cpld_analyse,
.old_firmware_support = cpld_old_firmware_support,
.frontend_info = cpld_frontend_info_rgb_analog,
.set_frontend = cpld_set_frontend_rgb_analog,
.get_divider = cpld_get_divider,
.get_delay = cpld_get_delay,
.get_sync_edge = cpld_get_sync_edge,
.update_capture_info = cpld_update_capture_info,
.get_params = cpld_get_params,
.get_value = cpld_get_value,
.get_value_string = cpld_get_value_string,
.set_value = cpld_set_value,
.show_cal_summary = cpld_show_cal_summary,
.show_cal_details = cpld_show_cal_details,
.show_cal_raw = cpld_show_cal_raw
};

Wyświetl plik

@ -10,5 +10,6 @@ extern cpld_t cpld_bbcv24;
extern cpld_t cpld_bbcv30v62;
extern cpld_t cpld_rgb_ttl;
extern cpld_t cpld_rgb_analog;
extern cpld_t cpld_rgb_ttl_24mhz;
extern cpld_t cpld_rgb_analog_24mhz;
#endif

Wyświetl plik

@ -1499,11 +1499,19 @@ static void cpld_init() {
cpld = &cpld_null_6bit;
cpld_fail_state = CPLD_WRONG;
} else {
cpld = &cpld_rgb_ttl;
if ((cpld_version_id & 0xff) >= 0x75 && (cpld_version_id & 0xff) < 0x80) {
cpld = &cpld_rgb_ttl_24mhz;
} else {
cpld = &cpld_rgb_ttl;
}
}
RPI_SetGpioPinFunction(STROBE_PIN, FS_INPUT); // set STROBE PIN back to an input as P19 will be an ouput when VERSION_PIN set back to 1
} else if ((cpld_version_id >> VERSION_DESIGN_BIT) == DESIGN_RGB_ANALOG) {
cpld = &cpld_rgb_analog;
if ((cpld_version_id & 0xff) >= 0x75 && (cpld_version_id & 0xff) < 0x80) {
cpld = &cpld_rgb_analog_24mhz;
} else {
cpld = &cpld_rgb_analog;
}
} else if ((cpld_version_id >> VERSION_DESIGN_BIT) == DESIGN_SIMPLE) {
cpld = &cpld_simple;
} else {