Merge branch 'feature/upstream' into develop

1 files changed, 27 insertions, 25 deletions

diff --git a/backend/genesys/sensor.cpp b/backend/genesys/sensor.cpp
index e54af65..ce51403 100644
--- a/backend/genesys/sensor.cpp
+++ b/backend/genesys/sensor.cpp
@@ -51,10 +51,16 @@ namespace genesys {
 
 std::ostream& operator<<(std::ostream& out, const StaggerConfig& config)
 {
-    out << "StaggerConfig{\n"
-        << "    min_resolution: " << config.min_resolution() << '\n'
-        << "    lines_at_min: " << config.lines_at_min() << '\n'
-        << "}";
+    if (config.shifts().empty()) {
+        out << "StaggerConfig{}";
+        return out;
+    }
+
+    out << "StaggerConfig{ " << config.shifts().front();
+    for (auto it = std::next(config.shifts().begin()); it != config.shifts().end(); ++it) {
+        out << ", " << *it;
+    }
+    out << " }";
     return out;
 }
 
@@ -64,6 +70,11 @@ std::ostream& operator<<(std::ostream& out, const FrontendType& type)
         case FrontendType::UNKNOWN: out << "UNKNOWN"; break;
         case FrontendType::WOLFSON: out << "WOLFSON"; break;
         case FrontendType::ANALOG_DEVICES: out << "ANALOG_DEVICES"; break;
+        case FrontendType::CANON_LIDE_80: out << "CANON_LIDE_80"; break;
+        case FrontendType::WOLFSON_GL841: out << "WOLFSON_GL841"; break;
+        case FrontendType::WOLFSON_GL846: out << "WOLFSON_GL846"; break;
+        case FrontendType::ANALOG_DEVICES_GL847: out << "ANALOG_DEVICES_GL847"; break;
+        case FrontendType::WOLFSON_GL124: out << "WOLFSON_GL124"; break;
         default: out << "(unknown value)";
     }
     return out;
@@ -91,7 +102,7 @@ std::ostream& operator<<(std::ostream& out, const Genesys_Frontend& frontend)
     StreamStateSaver state_saver{out};
 
     out << "Genesys_Frontend{\n"
-        << "    id: " << static_cast<unsigned>(frontend.id) << '\n'
+        << "    id: " << frontend.id << '\n'
         << "    regs: " << format_indent_braced_list(4, frontend.regs) << '\n'
         << std::hex
         << "    reg2[0]: " << frontend.reg2[0] << '\n'
@@ -112,33 +123,23 @@ std::ostream& operator<<(std::ostream& out, const SensorExposure& exposure)
     return out;
 }
 
-std::ostream& operator<<(std::ostream& out, const ResolutionFilter& resolutions)
-{
-    if (resolutions.matches_any()) {
-        out << "ANY";
-        return out;
-    }
-    out << format_vector_unsigned(4, resolutions.resolutions());
-    return out;
-}
-
 std::ostream& operator<<(std::ostream& out, const Genesys_Sensor& sensor)
 {
     out << "Genesys_Sensor{\n"
         << "    sensor_id: " << static_cast<unsigned>(sensor.sensor_id) << '\n'
-        << "    optical_res: " << sensor.optical_res << '\n'
+        << "    full_resolution: " << sensor.full_resolution << '\n'
+        << "    optical_resolution: " << sensor.get_optical_resolution() << '\n'
         << "    resolutions: " << format_indent_braced_list(4, sensor.resolutions) << '\n'
         << "    channels: " << format_vector_unsigned(4, sensor.channels) << '\n'
         << "    method: " << sensor.method << '\n'
-        << "    register_dpihw_override: " << sensor.register_dpihw_override << '\n'
-        << "    logical_dpihw_override: " << sensor.logical_dpihw_override << '\n'
-        << "    dpiset_override: " << sensor.dpiset_override << '\n'
-        << "    ccd_size_divisor: " << sensor.ccd_size_divisor << '\n'
-        << "    pixel_count_multiplier: " << sensor.pixel_count_multiplier << '\n'
+        << "    register_dpihw: " << sensor.register_dpihw << '\n'
+        << "    register_dpiset: " << sensor.register_dpiset << '\n'
+        << "    shading_factor: " << sensor.shading_factor << '\n'
+        << "    shading_pixel_offset: " << sensor.shading_pixel_offset << '\n'
+        << "    pixel_count_ratio: " << sensor.pixel_count_ratio << '\n'
+        << "    output_pixel_offset: " << sensor.output_pixel_offset << '\n'
         << "    black_pixels: " << sensor.black_pixels << '\n'
         << "    dummy_pixel: " << sensor.dummy_pixel << '\n'
-        << "    ccd_start_xoffset: " << sensor.ccd_start_xoffset << '\n'
-        << "    sensor_pixels: " << sensor.sensor_pixels << '\n'
         << "    fau_gain_white_ref: " << sensor.fau_gain_white_ref << '\n'
         << "    gain_white_ref: " << sensor.gain_white_ref << '\n'
         << "    exposure: " << format_indent_braced_list(4, sensor.exposure) << '\n'
@@ -146,8 +147,9 @@ std::ostream& operator<<(std::ostream& out, const Genesys_Sensor& sensor)
         << "    segment_size: " << sensor.segment_size << '\n'
         << "    segment_order: "
         << format_indent_braced_list(4, format_vector_unsigned(4, sensor.segment_order)) << '\n'
-        << "    stagger_config: " << format_indent_braced_list(4, sensor.stagger_config) << '\n'
-        << "    custom_base_regs: " << format_indent_braced_list(4, sensor.custom_base_regs) << '\n'
+        << "    stagger_x: " << sensor.stagger_x << '\n'
+        << "    stagger_y: " << sensor.stagger_y << '\n'
+        << "    use_host_side_calib: " << sensor.use_host_side_calib << '\n'
         << "    custom_regs: " << format_indent_braced_list(4, sensor.custom_regs) << '\n'
         << "    custom_fe_regs: " << format_indent_braced_list(4, sensor.custom_fe_regs) << '\n'
         << "    gamma.red: " << sensor.gamma[0] << '\n'