Skip to content

core: frontend: modelHelper code cleanup #3498

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
merged 2 commits into from
Aug 18, 2025
Merged

core: frontend: modelHelper code cleanup #3498

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e490c8
core: frontend: modelHelper.ts: fix weird indentation
ES-Alexander Aug 18, 2025
38daabe
core: frontend: modelHelper.ts: check global override first
ES-Alexander Aug 18, 2025
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
18 changes: 10 additions & 8 deletions core/frontend/src/components/vehiclesetup/viewers/modelHelper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ export function vehicle_folder(): string {
const mav_type = 'MAV_TYPE_' + autopilot.vehicle_type?.toUpperCase().replace(' ', '_')
switch (mav_type) {
case MavType.MAV_TYPE_SUBMARINE:
return 'sub'
return 'sub'
case MavType.MAV_TYPE_SURFACE_BOAT:
case MavType.MAV_TYPE_GROUND_ROVER:
return 'rover'
case MavType.MAV_TYPE_GROUND_ROVER:
return 'rover'
default:
return autopilot.vehicle_type?.toLowerCase() || 'unknown'
return autopilot.vehicle_type?.toLowerCase() || 'unknown'
}
}

Expand Down Expand Up @@ -63,17 +63,19 @@ export function frame_name(vehicle_type: string, frame_type?: number, frame_subt
}

export async function checkModelOverrides() {
while (!autopilot.vehicle_type || !frame_type()) {
await sleep(100)
}
// Early return on global override
const master_override = '/userdata/modeloverrides/ALL.glb'
const vehicle_override = `/userdata/modeloverrides/${vehicle_folder()}/${frame_name(autopilot.vehicle_type, frame_type())}.glb`
try {
await axios.head(master_override)
return master_override
} catch {
console.log(`master override model not found at ${master_override}`)
}
// See if there is a specific override for the connected vehicle type and frame
while (!autopilot.vehicle_type || !frame_type()) {
await sleep(100)
}
const vehicle_override = `/userdata/modeloverrides/${vehicle_folder()}/${frame_name(autopilot.vehicle_type, frame_type())}.glb`
try {
await axios.head(vehicle_override)
return vehicle_override
Expand Down