Skip to content

Remove Willy codename references #817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raphaelscholle merged 1 commit into from
Dec 2, 2025
Merged

Remove Willy codename references #817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions app/telemetry/models/openhd_core/camera.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@ static constexpr int X_CAM_TYPE_OPENIPC_GENERIC = 110;
static constexpr int X_CAM_TYPE_QC_IMX577 = 120;
static constexpr int X_CAM_TYPE_QC_OV9282 = 121;
// Projects are here
static constexpr int X_CAM_TYPE_WILLY_HORNET = 122;
static constexpr int X_CAM_TYPE_WILLY_JAGUAR = 123;
static constexpr int X_CAM_TYPE_WILLY_REKINDLE = 124;
static constexpr int X_CAM_TYPE_ORQA_HORNET = 122;
static constexpr int X_CAM_TYPE_ORQA_JAGUAR = 123;
static constexpr int X_CAM_TYPE_ORQA_REKINDLE = 124;

//
// ... rest is reserved for future use
Expand Down Expand Up @@ -315,7 +315,7 @@ struct XCamera {
bool requires_rockchip3_mpp_pipeline() const {
return camera_type >= 90 && camera_type < 100;
}
bool requires_willy_pipeline() const {
bool requires_orqa_pipeline() const {
return camera_type >= 122 && camera_type < 124;
}
std::string cam_type_as_verbose_string() const {
Expand Down Expand Up @@ -350,7 +350,7 @@ struct XCamera {
} else if (requires_x20_cedar_pipeline()) {
// also easy, 720p60 only (for now)
return {ResolutionFramerate{1280, 720, 60}};
} else if (requires_willy_pipeline()) {
} else if (requires_orqa_pipeline()) {
// also easy, 720p60 only (for now)
return {ResolutionFramerate{960, 720, 120}};
} else if (camera_type == X_CAM_TYPE_USB_INFIRAY) {
Expand Down Expand Up @@ -569,17 +569,17 @@ struct XCamera {
// correct specs still missing
ret.push_back(ResolutionFramerate{1280, 720, 30});
return ret;
} else if (camera_type == X_CAM_TYPE_WILLY_HORNET) {
} else if (camera_type == X_CAM_TYPE_ORQA_HORNET) {
std::vector<ResolutionFramerate> ret;
// correct specs still missing
ret.push_back(ResolutionFramerate{960, 720, 120});
return ret;
} else if (camera_type == X_CAM_TYPE_WILLY_JAGUAR) {
} else if (camera_type == X_CAM_TYPE_ORQA_JAGUAR) {
std::vector<ResolutionFramerate> ret;
// correct specs still missing
ret.push_back(ResolutionFramerate{1280, 720, 120});
return ret;
} else if (camera_type == X_CAM_TYPE_WILLY_REKINDLE) {
} else if (camera_type == X_CAM_TYPE_ORQA_REKINDLE) {
std::vector<ResolutionFramerate> ret;
// correct specs still missing
ret.push_back(ResolutionFramerate{1280, 720, 60});
Expand All @@ -603,7 +603,7 @@ static bool is_rpi_csi_camera(int cam_type) {
static bool is_rock_csi_camera(int cam_type) {
return cam_type >= 80 && cam_type <= 99;
}
static bool is_willy_csi_camera(int cam_type) {
static bool is_orqa_csi_camera(int cam_type) {
return cam_type >= 122 && cam_type <= 124;
}
static bool is_usb_camera(int cam_type) {
Expand Down Expand Up @@ -846,15 +846,15 @@ static std::vector<ManufacturerForPlatform> get_camera_choices_for_platform(
return std::vector<ManufacturerForPlatform>{
ManufacturerForPlatform{"LEOPARD", nvidia_leopard_csi_cameras},
MANUFACTURER_USB, MANUFACTURER_DEBUG};
} else if (platform_type == X_PLATFORM_TYPE_WILLY) {
std::vector<CameraNameAndType> willy_cameras{
CameraNameAndType{"HORNET", X_CAM_TYPE_WILLY_HORNET},
CameraNameAndType{"JAGUAR", X_CAM_TYPE_WILLY_JAGUAR},
CameraNameAndType{"REKINDLE", X_CAM_TYPE_WILLY_REKINDLE},
} else if (platform_type == X_PLATFORM_TYPE_ORQA) {
std::vector<CameraNameAndType> orqa_cameras{
CameraNameAndType{"HORNET", X_CAM_TYPE_ORQA_HORNET},
CameraNameAndType{"JAGUAR", X_CAM_TYPE_ORQA_JAGUAR},
CameraNameAndType{"REKINDLE", X_CAM_TYPE_ORQA_REKINDLE},
};
return std::vector<ManufacturerForPlatform>{
ManufacturerForPlatform{"WILLY", willy_cameras}, MANUFACTURER_USB,
MANUFACTURER_DEBUG};
ManufacturerForPlatform{"ORQA DIGITAL", orqa_cameras},
MANUFACTURER_USB, MANUFACTURER_DEBUG};
}
return std::vector<ManufacturerForPlatform>{MANUFACTURER_DEBUG};
}
Expand Down
4 changes: 1 addition & 3 deletions app/telemetry/models/openhd_core/platform.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ static constexpr int X_PLATFORM_TYPE_NVIDIA_XAVIER = 40;
// Numbers 46..50 are reserved for QUALCOMM
static constexpr int X_PLATFORM_TYPE_QUALCOMM_QRB5165 = 46;
static constexpr int X_PLATFORM_TYPE_QUALCOMM_QCS405 = 47;
static constexpr int X_PLATFORM_TYPE_ORQA = 51;
static constexpr int X_PLATFORM_TYPE_ORQA = 51; // ORQA Digital
static constexpr int X_PLATFORM_TYPE_UXV_MOD = 52;
// Numbers
static std::string x_platform_type_to_string(int platform_type) {
Expand Down Expand Up @@ -76,8 +76,6 @@ static std::string x_platform_type_to_string(int platform_type) {
return "X20";
case X_PLATFORM_TYPE_ROCKCHIP_RV1126:
return "X21";
case X_PLATFORM_TYPE_ORQA:
return "ORQA";
case X_PLATFORM_TYPE_UXV_MOD:
return "UXV NAV";
case X_PLATFORM_TYPE_OPENIPC_SIGMASTAR_UNDEFINED:
Expand Down
Loading