Skip to content

ACU passive goto #72

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
mhasself merged 2 commits into from
May 20, 2025
Merged

ACU passive goto #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55ca05c
ACU: support "passive" goto, by propagating az=null, el=null
mhasself May 20, 2025
f4adcb1
HWPSupervisor: fix rendering crash when session data is empty
mhasself May 20, 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
20 changes: 18 additions & 2 deletions src/panels/ACUAgent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,11 @@
caption="Elevation"
v-model.number="motion_control.goto_el"
/>
<div class="ocs_row">
<label>Passive if empty</label>
<input type="checkbox" id="checkbox" v-model="motion_control.goto_passive"
class="ocs_double" />
</div>
<div class="ocs_row">
<label />
<button
Expand Down Expand Up @@ -350,9 +355,11 @@
:op_data="ops.go_to">
<OpParam
caption="Az (deg)"
modelType="blank_to_null"
v-model.number="ops.go_to.params.az" />
<OpParam
caption="El (deg)"
modelType="blank_to_null"
v-model.number="ops.go_to.params.el" />
<div class="ocs_row">
<label>Set mode=Stop at end?</label>
Expand Down Expand Up @@ -581,6 +588,7 @@

goto_az: 180,
goto_el: 60,
goto_passive: false,

goto_target: null,
goto_target_stop: true,
Expand Down Expand Up @@ -621,12 +629,20 @@
let pos = this.currentPositions();

if (!p.goto_az && p.goto_az === '') {
gs['az'] = pos['az'];
if (p.goto_passive) {
gs['az'] = null;
} else {
gs['az'] = pos['az'];
}
} else {
gs['az'] = p.goto_az;
}
if (!p.goto_el && p.goto_el === '') {
gs['el'] = pos['el'];
if (p.goto_passive) {
gs['el'] = null;
} else {
gs['el'] = pos['el'];
}
} else {
gs['el'] = p.goto_el;
}
Expand Down
6 changes: 4 additions & 2 deletions src/panels/HWPSupervisor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,8 +303,10 @@
let t = proc[k1]['encoder_last_updated'];
let oldness = t ? window.ocs_bundle.util.human_timespan(
now - t) : '?';
return (proc[k1]['enc_freq'] === null ? '?' :
proc[k1]['enc_freq'].toFixed(4)) + ' Hz, ' + oldness + ' ago';
let f = proc[k1].enc_freq;
return (f || f === 0 || f === 0.) ?
(f.toFixed(4) + ' Hz, ' + oldness + ' ago') :
'?';
}
case '!quad_summary': {
let now = window.ocs_bundle.util.timestamp_now();
Expand Down