Skip to content

Frontend: stop renaming RCIN9/RCIN10 if Sub version is higher than 4.5.4 #3860

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

Open
Williangalvani wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −4
Open

Frontend: stop renaming RCIN9/RCIN10 if Sub version is higher than 4.5.4 #3860

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
22 changes: 18 additions & 4 deletions core/frontend/src/components/vehiclesetup/PwmSetup.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@
</template>

<script lang="ts">
import { lte as sem_ver_lte } from 'semver'
import Vue from 'vue'

import { fetchCurrentBoard } from '@/components/autopilot/AutopilotManagerUpdater'
Expand Down Expand Up @@ -197,12 +198,17 @@ const rover_function_map = {

const param_value_map = {
Submarine: {
RCIN9: 'Lights 1',
RCIN10: 'Lights 2',
RCIN11: 'Video Switch',
},
} as Dictionary<Dictionary<string>>

// ArduSub <= 4.5.4 used RCIN9/RCIN10 for lights control; newer versions handle lights natively
const LEGACY_SUB_LIGHTS_MAX_VERSION = '4.5.5'
const legacy_sub_param_value_map: Dictionary<string> = {
RCIN9: 'Lights 1',
RCIN10: 'Lights 2',
}

export default Vue.extend({
name: 'PwmSetup',
components: {
Expand All @@ -229,6 +235,14 @@ export default Vue.extend({
}
},
computed: {
effective_param_value_map(): Dictionary<Dictionary<string>> {
const map = { ...param_value_map }
const version = autopilot.firmware_info?.version
if (this.is_sub && version && sem_ver_lte(version, LEGACY_SUB_LIGHTS_MAX_VERSION)) {
map.Submarine = { ...legacy_sub_param_value_map, ...map.Submarine }
}
return map
},
servo_function_parameters(): Parameter[] {
const params = autopilot_data.parameterRegex('^SERVO(\\d+)_FUNCTION$')
// Sort parameters using the servo number instead of alphabetically
Expand All @@ -252,7 +266,7 @@ export default Vue.extend({
).map((parameter) => {
const servo_number = parseInt(/\d+/g.exec(parameter.name)?.[0] ?? '0', 10)
const motor_number = parseInt(/\d+/g.exec(printParam(parameter))?.[0] ?? '0', 10)
const name = param_value_map.Submarine[parameter.name] ?? `Motor ${motor_number}`
const name = this.effective_param_value_map.Submarine?.[parameter.name] ?? `Motor ${motor_number}`
const direction_parameter = autopilot_data.parameterRegex(`MOT_${motor_number}_DIRECTION`)?.[0]
const target = motor_number - 1
return {
Expand Down Expand Up @@ -493,7 +507,7 @@ export default Vue.extend({
return this.stringToUserFriendlyText(printParam(param))
},
stringToUserFriendlyText(text: string) {
return param_value_map?.[this.vehicle_type ?? '']?.[text] ?? text
return this.effective_param_value_map?.[this.vehicle_type ?? '']?.[text] ?? text
},
getParam(param: string): Parameter | undefined {
return autopilot_data.parameter(param)
Expand Down
Loading