Skip to content

Commit

Permalink
core: frontend: refactor code for imu status
Browse files Browse the repository at this point in the history
  • Loading branch information
@Williangalvani @patrickelectric
Williangalvani authored and patrickelectric committed Mar 28, 2024
1 parent dc388ce commit c7cc0b9
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 64 deletions.
36 changes: 3 additions & 33 deletions ...d/src/components/vehiclesetup/configuration/accelerometer/ArdupilotAccelerometerSetup.vue
View file
Expand Up @@ -66,6 +66,7 @@ import autopilot_data from '@/store/autopilot'
import { Dictionary } from '@/types/common'
import decode, { deviceId } from '@/utils/deviceid_decoder'
import { imu_is_calibrated, imu_temperature_is_calibrated } from '../common'
import QuickAccelerometerCalibration from './QuickAccelerometerCalibration.vue'
export default Vue.extend({
Expand Down Expand Up @@ -93,42 +94,11 @@ export default Vue.extend({
.filter((param) => param.value !== 0)
.map((parameter) => decode(parameter.name, parameter.value))
},
// TODO: refactor, same code as OnboardSensors.vue
imu_is_calibrated(): Dictionary<boolean> {
const results = {} as Dictionary<boolean>
for (const imu of this.imus) {
const param_radix = imu.param.split('_ID')[0]
const offset_params_names = [`${param_radix}OFFS_X`, `${param_radix}OFFS_Y`, `${param_radix}OFFS_Z`]
const scale_params_names = [`${param_radix}SCAL_X`, `${param_radix}SCAL_Y`, `${param_radix}SCAL_Z`]
const offset_params = offset_params_names.map(
(name) => autopilot_data.parameter(name),
)
const scale_params = scale_params_names.map(
(name) => autopilot_data.parameter(name),
)
const is_at_default_offsets = offset_params.every((param) => param?.value === 0.0)
const is_at_default_scale = scale_params.every((param) => param?.value === 1.0)
results[imu.param] = offset_params.isEmpty() || scale_params.isEmpty()
|| !is_at_default_offsets || !is_at_default_scale
}
return results
return imu_is_calibrated(this.imus, autopilot_data)
},
imu_temperature_is_calibrated(): Dictionary<{ calibrated: boolean, calibrationTemperature: number }> {
const results = {} as Dictionary<{ calibrated: boolean, calibrationTemperature: number }>
for (const imu of this.imus) {
let param_radix = imu.param.split('_ID')[0]
// CALTEMP parameters contains ID for the first sensor, _ID does not, so we need to add it
if (!/\d$/.test(param_radix)) {
param_radix += '1'
}
const name = `${param_radix}_CALTEMP`
const parameter = autopilot_data.parameter(name)
results[imu.param] = {
calibrated: parameter !== undefined && parameter.value !== -300,
calibrationTemperature: parameter?.value ?? 0,
}
}
return results
return imu_temperature_is_calibrated(this.imus, autopilot_data)
},
},
methods: {
Expand Down
41 changes: 41 additions & 0 deletions core/frontend/src/components/vehiclesetup/configuration/common.ts
View file
@@ -0,0 +1,41 @@
import { AutopilotStore } from "@/store/autopilot"
import { Dictionary } from "@/types/common"
import { deviceId } from "@/utils/deviceid_decoder"

export function imu_is_calibrated(imus: deviceId[], autopilot_data: AutopilotStore) {
const results = {} as Dictionary<boolean>
for (const imu of imus) {
const param_radix = imu.param.split('_ID')[0]
const offset_params_names = [`${param_radix}OFFS_X`, `${param_radix}OFFS_Y`, `${param_radix}OFFS_Z`]
const scale_params_names = [`${param_radix}SCAL_X`, `${param_radix}SCAL_Y`, `${param_radix}SCAL_Z`]
const offset_params = offset_params_names.map(
(name) => autopilot_data.parameter(name),
)
const scale_params = scale_params_names.map(
(name) => autopilot_data.parameter(name),
)
const is_at_default_offsets = offset_params.every((param) => param?.value === 0.0)
const is_at_default_scale = scale_params.every((param) => param?.value === 1.0)
results[imu.param] = offset_params.isEmpty() || scale_params.isEmpty()
|| !is_at_default_offsets || !is_at_default_scale
}
return results
}

export function imu_temperature_is_calibrated(imus: deviceId[], autopilot_data: AutopilotStore): Dictionary<{ calibrated: boolean, calibrationTemperature: number }> {
const results = {} as Dictionary<{ calibrated: boolean, calibrationTemperature: number }>
for (const imu of imus) {
let param_radix = imu.param.split('_ID')[0]
// CALTEMP parameters contains ID for the first sensor, _ID does not, so we need to add it
if (!/\d$/.test(param_radix)) {
param_radix += '1'
}
const name = `${param_radix}_CALTEMP`
const parameter = autopilot_data.parameter(name)
results[imu.param] = {
calibrated: parameter !== undefined && parameter.value !== -300,
calibrationTemperature: parameter?.value ?? 0,
}
}
return results
}
37 changes: 6 additions & 31 deletions core/frontend/src/components/vehiclesetup/overview/OnboardSensors.vue
View file
Expand Up @@ -52,7 +52,7 @@
mdi-emoticon-sad-outline
</v-icon>
<v-icon
v-if="imu_temperature_is_calibrated[imu.param]"
v-if="imu_temperature_is_calibrated[imu.param].calibrated"
v-tooltip="'Sensor thermometer is calibrated and good to use'"
color="green"
>
Expand Down Expand Up @@ -124,6 +124,8 @@ import { Dictionary } from '@/types/common'
import decode, { deviceId } from '@/utils/deviceid_decoder'
import mavlink_store_get from '@/utils/mavlink'

import { imu_is_calibrated, imu_temperature_is_calibrated } from '../configuration/common'

export default Vue.extend({
name: 'OnboardSensors',
computed: {
Expand Down Expand Up @@ -211,37 +213,10 @@ export default Vue.extend({
return results
},
imu_is_calibrated(): Dictionary<boolean> {
const results = {} as Dictionary<boolean>
for (const imu of this.imus) {
const param_radix = imu.param.split('_ID')[0]
const offset_params_names = [`${param_radix}OFFS_X`, `${param_radix}OFFS_Y`, `${param_radix}OFFS_Z`]
const scale_params_names = [`${param_radix}SCAL_X`, `${param_radix}SCAL_Y`, `${param_radix}SCAL_Z`]
const offset_params = offset_params_names.map(
(name) => autopilot_data.parameter(name),
)
const scale_params = scale_params_names.map(
(name) => autopilot_data.parameter(name),
)
const is_at_default_offsets = offset_params.every((param) => param?.value === 0.0)
const is_at_default_scale = scale_params.every((param) => param?.value === 1.0)
results[imu.param] = offset_params.isEmpty() || scale_params.isEmpty()
|| !is_at_default_offsets || !is_at_default_scale
}
return results
return imu_is_calibrated(this.imus, autopilot_data)
},
imu_temperature_is_calibrated(): Dictionary<boolean> {
const results = {} as Dictionary<boolean>
for (const imu of this.imus) {
let param_radix = imu.param.split('_ID')[0]
// CALTEMP parameters contains ID for the first sensor, _ID does not, so we need to add it
if (!/\d$/.test(param_radix)) {
param_radix += '1'
}
const name = `${param_radix}_CALTEMP`
const parameter = autopilot_data.parameter(name)
results[imu.param] = parameter !== undefined && parameter.value !== -300
}
return results
imu_temperature_is_calibrated(): Dictionary<{ calibrated: boolean, calibrationTemperature: number }> {
return imu_temperature_is_calibrated(this.imus, autopilot_data)
},
is_water_baro(): Dictionary<boolean> {
const results = {} as Dictionary<boolean>
Expand Down

0 comments on commit c7cc0b9

Please sign in to comment.