Skip to content

ACU: more fixes #95

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 3 commits into from
Jul 14, 2026
Merged

ACU: more fixes #95

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9db82cd
ACU: use accessLevel-aware widgets throughout
mhasself Jul 14, 2026
03063b6
ACU: more disable options for Sun Avoidance
mhasself Jul 14, 2026
95e5bae
ACU: set_boresight defaults to stop_at_end=True
mhasself Jul 14, 2026
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
145 changes: 61 additions & 84 deletions src/panels/ACUAgent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,12 +174,8 @@
/>
<div class="ocs_row">
<label />
<button
:disabled="accessLevel < 1"
@click="startMotion">Start</button>
<button
:disabled="accessLevel < 1"
@click="stopMotion">Stop</button>
<UiButton @click="startMotion">Start</UiButton>
<UiButton @click="stopMotion">Stop</UiButton>
</div>
</form>

Expand All @@ -200,12 +196,8 @@

<div class="ocs_row">
<label />
<button
:disabled="accessLevel < 1"
@click="startMotion">Start</button>
<button
:disabled="accessLevel < 1"
@click="stopMotion">Abort</button>
<UiButton @click="startMotion">Start</UiButton>
<UiButton @click="stopMotion">Abort</UiButton>
</div>
</form>

Expand All @@ -223,12 +215,8 @@
v-model="motion_control.goto_target_stop" />
<div class="ocs_row">
<label />
<button
:disabled="accessLevel < 1"
@click="startMotion">Start</button>
<button
:disabled="accessLevel < 1"
@click="stopMotion">Abort</button>
<UiButton @click="startMotion">Start</UiButton>
<UiButton @click="stopMotion">Abort</UiButton>
</div>
</form>

Expand All @@ -246,24 +234,22 @@
</OpReading>
<div class="ocs_row">
<label>Reset params</label>
<button
:disabled="accessLevel < 1"
@click="sun('reset')">Go</button>
<UiButton @click="sun('reset')">Go</UiButton>
</div>
<div class="ocs_row">
<label>Escape now</label>
<button
:disabled="accessLevel < 1"
@click="sun('escape')">Go</button>
<UiButton @click="sun('escape')">Go</UiButton>
</div>
<div class="ocs_row">
<label>Enable / Disable mins</label>
<button
:disabled="accessLevel < 1"
@click="sun('enable')">Enable</button>
<button
:disabled="accessLevel < 1"
@click="sun('disable', 30)">Disable, 30 mins</button>
<label>Enable / Disable</label>
<UiButton @click="sun('enable')">Enable</UiButton>
<UiButton @click="sun('disable')">Disable</UiButton>
</div>
<div class="ocs_row">
<label>Disable for (mins)</label>
<input text="text" v-model="motion_control.sun_disable_time"
style="text-align:center;"/>
<UiButton @click="sun('temp_disable', motion_control.sun_disable_time)">Disable for</UiButton>
</div>
</form>

Expand All @@ -278,12 +264,8 @@
</div>
<div class="ocs_row">
<label>Enable / Disable mins</label>
<button
:disabled="accessLevel < 1"
@click="hwp('enable')">Enable</button>
<button
:disabled="accessLevel < 1"
@click="hwp('disable', 30)">Disable</button>
<UiButton @click="hwp('enable')">Enable</UiButton>
<UiButton @click="hwp('disable', 30)">Disable</UiButton>
</div>
</form>

Expand All @@ -301,34 +283,24 @@
</OpReading>
<div class="ocs_row">
<label>Move Shutter</label>
<button
:disabled="accessLevel < 1"
@click="shutter('open')">Open</button>
<button
:disabled="accessLevel < 1"
@click="shutter('close')">Close</button>
<UiButton @click="shutter('open')">Open</UiButton>
<UiButton @click="shutter('close')">Close</UiButton>
</div>
</form>

<form v-on:submit.prevent
v-if="motion_control.type == 'special'">
<div class="ocs_row">
<label class="acu_double">Clear Faults</label>
<button
:disabled="accessLevel < 1"
@click="special('clear_faults')">Clear</button>
<UiButton @click="special('clear_faults')">Clear</UiButton>
</div>
<div class="ocs_row">
<label class="acu_double">Stop and Clear Program Track</label>
<button
:disabled="accessLevel < 1"
@click="special('stop_and_clear')">Stop</button>
<UiButton @click="special('stop_and_clear')">Stop</UiButton>
</div>
<div class="ocs_row" v-if="platformFeature('unstow')">
<label class="acu_double">Request UnStow</label>
<button
:disabled="accessLevel < 1"
@click="special('unstow')">UnStow</button>
<UiButton @click="special('unstow')">UnStow</UiButton>
</div>
</form>

Expand All @@ -351,6 +323,7 @@
<label>Fan</label>
<label>Booster</label>
</div>

<div v-for="item in hvacStats[0]" :key="item.name"
class="hvac_row">
<label>{{ item.name }}</label>
Expand Down Expand Up @@ -390,17 +363,14 @@
<label>{{ item.name }}</label>
<OcsLight type="multi"
:value="item.heater?.status" :caption="item.heater?.short" />
<UiButton
@click="hvacAction('heater', 'on', item)">On</UiButton>
<UiButton
@click="hvacAction('heater', 'off', item)">Off</UiButton>
<UiButton @click="hvacAction('heater', 'on', item)">On</UiButton>
<UiButton @click="hvacAction('heater', 'off', item)">Off</UiButton>
</div>
<div class="hvac_row">
<label />
<input text :disabled="accessLevel < 1" :value="item.heater.setpoint" />
<input text disabled :value="item.heater.setpoint" />
<input text v-model.number="motion_control.hvac_setpoints[item.full_name]" />
<UiButton
@click="hvacAction('heater', 'setpoint', item)">Update</UiButton>
<UiButton @click="hvacAction('heater', 'setpoint', item)">Update</UiButton>
</div>
</template>
</template>
Expand All @@ -409,51 +379,43 @@
<div class="hvac_row">
<label>Set All</label>
<span />
<UiButton
@click="hvacAction('fans', 'on', hvacStats[0])">On</UiButton>
<UiButton
@click="hvacAction('fans', 'off', hvacStats[0])">Off</UiButton>
<UiButton @click="hvacAction('fans', 'on', hvacStats[0])">On</UiButton>
<UiButton @click="hvacAction('fans', 'off', hvacStats[0])">Off</UiButton>
</div>
<div class="hvac_row" height="10px" />
<div class="hvac_row" height="10px"><span /></div>
<template v-for="item in hvacStats[0]" :key="item.name">
<div v-if="item.fan" class="hvac_row">
<label>{{ item.name }}</label>
<OcsLight type="multi"
:value="item.fan?.status" :caption="item.fan?.short" />
<UiButton
@click="hvacAction('fan', 'on', item)">On</UiButton>
<UiButton
@click="hvacAction('fan', 'off', item)">Off</UiButton>
<UiButton @click="hvacAction('fan', 'on', item)">On</UiButton>
<UiButton @click="hvacAction('fan', 'off', item)">Off</UiButton>
</div>
<div v-if="item.fan" class="hvac_row">
<label />
<input text disabled :value="item.fan.setpoint" />
<input text v-model.number="motion_control.hvac_setpoints[item.full_name]" />
<UiButton
@click="hvacAction('fan', 'setpoint', item)">Update</UiButton>
<UiButton @click="hvacAction('fan', 'setpoint', item)">Update</UiButton>
</div>
<div class="hvac_row" height="10px"><span /></div>
</template>
</template>

<template v-if="motion_control.hvac_view == 'Set Boosters'">
<div class="hvac_row">
<label>Set All</label>
<span />
<UiButton
@click="hvacAction('boosters', 'on', hvacStats[0])">On</UiButton>
<UiButton
@click="hvacAction('boosters', 'off', hvacStats[0])">Off</UiButton>
<UiButton @click="hvacAction('boosters', 'on', hvacStats[0])">On</UiButton>
<UiButton @click="hvacAction('boosters', 'off', hvacStats[0])">Off</UiButton>
</div>
<div class="hvac_row" height="10px" />
<div class="hvac_row" height="10px"><span /></div>
<template v-for="item in hvacStats[0]" :key="item.name">
<div v-if="item.booster" class="hvac_row">
<label>{{ item.name }}</label>
<OcsLight type="multi"
:value="item.booster?.status" :caption="item.booster?.short" />
<UiButton
@click="hvacAction('booster', 'on', item)">On</UiButton>
<UiButton
@click="hvacAction('booster', 'off', item)">Off</UiButton>
<UiButton @click="hvacAction('booster', 'on', item)">On</UiButton>
<UiButton @click="hvacAction('booster', 'off', item)">Off</UiButton>
</div>
</template>
</template>
Expand Down Expand Up @@ -683,7 +645,7 @@
props: {
address: String,
},
inject: ['accessLevel'],
// inject: ['accessLevel'],
data: function () {
return {
dev_mode: false, // DO NOT COMMIT THIS AS TRUE!
Expand Down Expand Up @@ -718,7 +680,8 @@
},
},
set_boresight: {
params: {target: 0},
params: {target: 0,
end_stop: true},
},
stop_and_clear: {
params: {},
Expand Down Expand Up @@ -805,8 +768,9 @@
goto_target: null,
goto_target_stop: true,

hvac_view: "Summary",
hvac_view: "Set Fans",
hvac_setpoints: {},
sun_disable_time: 30,
},
start_types: ["end", "mid"],
speed_modes: ["high", "low"],
Expand Down Expand Up @@ -915,10 +879,14 @@
window.ocs_bundle.ui_run_task(this.address, 'update_sun',
{'escape': true});
break;
case 'disable':
case 'temp_disable':
window.ocs_bundle.ui_run_task(this.address, 'update_sun',
{'temporary_disable': arg1 * 60});
break;
case 'disable':
window.ocs_bundle.ui_run_task(this.address, 'update_sun',
{'enable': false});
break;
case 'enable':
window.ocs_bundle.ui_run_task(this.address, 'update_sun',
{'enable': true});
Expand Down Expand Up @@ -1716,7 +1684,7 @@
text-align: center;
}
.hvac_row > label {
padding: 0px 5px;
padding: 10px 5px;
}

.hvac_header {
Expand All @@ -1728,6 +1696,15 @@
text-align: center;
}

.hvac_row > input:read-only {
border: 1px solid gray;
border-radius: 4px;
}
.hvac_row > input:-moz-read-only {
border: 1px solid gray;
border-radius: 4px;
}

/* Classes for rows in the Dataset table:
* - isNormal: no error / idle.
* - isBad: error.
Expand Down
Loading