early-access version 2853

src/common/CMakeLists.txt

@@ -189,8 +189,9 @@ create_target_directory_groups(common)
 
 target_link_libraries(common PUBLIC ${Boost_LIBRARIES} fmt::fmt microprofile Threads::Threads)
 target_link_libraries(common PRIVATE lz4::lz4 xbyak)
-if (MSVC)
+if (TARGET zstd::zstd)
   target_link_libraries(common PRIVATE zstd::zstd)
 else()
-  target_link_libraries(common PRIVATE zstd)
+  target_link_libraries(common PRIVATE
+    $<IF:$<TARGET_EXISTS:zstd::libzstd_shared>,zstd::libzstd_shared,zstd::libzstd_static>)
 endif()

src/common/input.h

@@ -28,7 +28,7 @@ enum class InputType {
     Color,
     Vibration,
     Nfc,
-    IrSensor,
+    Ir,
 };
 
 // Internal battery charge level
@@ -53,15 +53,6 @@ enum class PollingMode {
     IR,
 };
 
-enum class CameraFormat {
-    Size320x240,
-    Size160x120,
-    Size80x60,
-    Size40x30,
-    Size20x15,
-    None,
-};
-
 // Vibration reply from the controller
 enum class VibrationError {
     None,
@@ -77,13 +68,6 @@ enum class PollingError {
     Unknown,
 };
 
-// Ir camera reply from the controller
-enum class CameraError {
-    None,
-    NotSupported,
-    Unknown,
-};
-
 // Hint for amplification curve to be used
 enum class VibrationAmplificationType {
     Linear,
@@ -192,12 +176,6 @@ struct LedStatus {
     bool led_4{};
 };
 
-// Raw data fom camera
-struct CameraStatus {
-    CameraFormat format{CameraFormat::None};
-    std::vector<u8> data{};
-};
-
 // List of buttons to be passed to Qt that can be translated
 enum class ButtonNames {
     Undefined,
@@ -255,7 +233,6 @@ struct CallbackStatus {
     BodyColorStatus color_status{};
     BatteryStatus battery_status{};
     VibrationStatus vibration_status{};
-    CameraStatus camera_status{};
 };
 
 // Triggered once every input change
@@ -304,10 +281,6 @@ public:
     virtual PollingError SetPollingMode([[maybe_unused]] PollingMode polling_mode) {
         return PollingError::NotSupported;
     }
-
-    virtual CameraError SetCameraFormat([[maybe_unused]] CameraFormat camera_format) {
-        return CameraError::NotSupported;
-    }
 };
 
 /// An abstract class template for a factory that can create input devices.

src/common/settings.h

@@ -503,9 +503,6 @@ struct Values {
     Setting<bool> enable_ring_controller{true, "enable_ring_controller"};
     RingconRaw ringcon_analogs;
 
-    Setting<bool> enable_ir_sensor{false, "enable_ir_sensor"};
-    Setting<std::string> ir_sensor_device{"auto", "ir_sensor_device"};
-
     // Data Storage
     Setting<bool> use_virtual_sd{true, "use_virtual_sd"};
     Setting<bool> gamecard_inserted{false, "gamecard_inserted"};