feat: merge telemetry-configurable — data-map/data-display/auto pill system (d74bed7c) · Commits · Davide Ricci / noctua

noctua/web/pages/control.html

+5 −1

Original line number	Diff line number	Diff line
		@@ -67,6 +67,7 @@
		{{ w.widget_standard({
		"label": "Focus",
		"info": "telescope-focuser-position",
		"display": "plain",
		"transform": "round_0",
		"inputs": [{"value": 0}],
		"unit": "µm",
		@@ -93,6 +94,7 @@
		{{ w.widget_shutter({
		"label": "Dome",
		"info": "/dome/shutter",
		"map": "open_state",
		"move_url": "/dome/shutter/movement",
		}) }}

		@@ -114,6 +116,8 @@
		{{ w.widget_standard({
		"label": "Position",
		"info": "stage-position",
		"display": "plain",
		"transform": "round_1",
		"inputs": [{"value": 1}],
		"unit": "mm",
		"buttons": [{"label": "Go", "endpoint": "/stage/position", "method": "PUT"}],

noctua/web/pages/init.html

+24 −12

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@
		{{ w.widget_standard({
		"label": "Power",
		"info": "telescope-power",
		"map": "bool_yesno",
		"buttons": [
		{"label": "On", "endpoint": "/telescope/power", "val": true, "method": "PUT"},
		{"label": "Off", "endpoint": "/telescope/power", "val": false, "method": "PUT"}
		@@ -23,6 +24,7 @@
		{{ w.widget_standard({
		"label": "Parked",
		"info": "telescope-coordinates-movement-atpark",
		"map": "bool_yesno",
		"buttons": [
		{"label": "Unpark", "endpoint": "/telescope/coordinates/movement/unpark", "method": "POST"},
		{"label": "Park", "endpoint": "/telescope/coordinates/movement/park", "method": "POST"}
		@@ -32,6 +34,7 @@
		{{ w.widget_standard({
		"label": "Tracking",
		"info": "telescope-coordinates-tracking",
		"map": "bool_yesno",
		"buttons": [
		{"label": "Point webcam", "endpoint": "/telescope/coordinates/movement/altaz", "val": [25, 85], "method": "POST"},
		{"label": "Track Polaris", "endpoint": "/telescope/coordinates/movement/radec", "val": "Polaris", "method": "POST"}
		@@ -41,6 +44,7 @@
		{{ w.widget_standard({
		"label": "Petals",
		"info": "telescope-cover",
		"map": "bool_yesno",
		"buttons": [
		{"label": "Open", "endpoint": "/telescope/cover/movement", "val": true, "method": "POST"},
		{"label": "Close", "endpoint": "/telescope/cover/movement", "val": false, "method": "POST"}
		@@ -60,8 +64,9 @@

		{{ w.widget_standard({
		"label": "Focus",
		"transform": "round_0",
		"info": "telescope-focuser-position",
		"display": "plain",
		"transform": "round_0",
		"inputs": [{"value": 0}],
		"unit": "µm",
		"buttons": [{"label": "Set", "endpoint": "/telescope/focuser/movement", "method": "PUT"}],
		@@ -90,7 +95,7 @@
		"info_list": [
		{"label": null},
		{"label": "rot", "status": "telescope-rotator", "transform": "round_1"},
		{"label": "moving", "status": "telescope-rotator-movement"},
		{"label": "moving", "status": "telescope-rotator-movement", "display": "pill", "map": "bool_yesno"},
		]
		}) }}
		</section>
		@@ -107,15 +112,16 @@
		{"label": "Sync", "endpoint": "/dome/position/sync", "method": "PUT"}
		],
		"info_list": [
		{"label": "slaved", "status": "dome-position-slaved"},
		{"label": "az", "status": "dome-position-azimuth"},
		{"label": "moving", "status": "dome-position-movement"},
		{"label": "slaved", "status": "dome-position-slaved", "display": "pill", "map": "bool_yesno"},
		{"label": "az", "status": "dome-position-azimuth", "transform": "round_1"},
		{"label": "moving", "status": "dome-position-movement", "display": "pill", "map": "bool_yesno"},
		]
		}) }}

		{{ w.widget_standard({
		"label": "Parked",
		"info": "dome-position-parked",
		"map": "bool_yesno",
		"buttons": [
		{"label": "Park", "endpoint": "/dome/position/movement/park", "method": "POST"},
		{"label": "Stop", "endpoint": "/dome/position/movement", "method": "DELETE"}
		@@ -125,6 +131,7 @@
		{{ w.widget_shutter({
		"label": "Shutter",
		"info": "/dome/shutter",
		"map": "open_state",
		"move_url": "/dome/shutter/movement",
		}) }}
		</section>
		@@ -150,6 +157,7 @@
		{{ w.widget_standard({
		"label": "Power",
		"info": "stage-power",
		"map": "bool_yesno",
		"buttons": [
		{"label": "On", "endpoint": "/stage/power", "val": true, "method": "PUT"},
		{"label": "Off", "endpoint": "/stage/power", "val": false, "method": "PUT"}
		@@ -164,8 +172,8 @@
		],
		"info_list": [
		{"label": null},
		{"label": "moving", "status": "stage-movement"},
		{"label": "pos", "status": "stage-position", "transform":"round_1"}
		{"label": "moving", "status": "stage-movement", "display": "pill", "map": "bool_yesno"},
		{"label": "pos", "status": "stage-position", "transform": "round_1"},
		],
		}) }}
		</section>
		@@ -176,6 +184,7 @@
		{{ w.widget_standard({
		"label": "Power",
		"info": "camera-power",
		"map": "bool_yesno",
		"buttons": [
		{"label": "On", "endpoint": "/camera/power", "val": true, "method": "PUT"},
		{"label": "Off", "endpoint": "/camera/power", "val": false, "method": "PUT"}
		@@ -185,6 +194,7 @@
		{{ w.widget_standard({
		"label": "Cooling",
		"info": "camera-cooler",
		"map": "bool_yesno",
		"buttons": [
		{"label": "On", "endpoint": "/camera/cooler", "val": true, "method": "PUT"},
		{"label": "Off", "endpoint": "/camera/cooler", "val": false, "method": "PUT"}
		@@ -197,7 +207,7 @@
		"unit": "°C",
		"buttons": [{"label": "Set", "endpoint": "/camera/cooler/temperature/setpoint", "method": "PUT"}],
		"info_list": [
		{"label": "fan", "status": "camera-settings-fan"},
		{"label": "fan", "status": "camera-settings-fan", "display": "pill", "map": "bool_yesno"},
		{"label": "set", "status": "camera-settings-setpoint", "transform": "round_1"},
		{"label": "T", "status": "camera-settings-temperature", "transform": "round_1"}
		]
		@@ -210,6 +220,7 @@
		{{ w.widget_standard({
		"label": "Power",
		"info": "camera2-power",
		"map": "bool_yesno",
		"buttons": [
		{"label": "On", "endpoint": "/camera2/power", "val": true, "method": "PUT"},
		{"label": "Off", "endpoint": "/camera2/power", "val": false, "method": "PUT"}
		@@ -219,6 +230,7 @@
		{{ w.widget_standard({
		"label": "Cooling",
		"info": "camera2-cooler",
		"map": "bool_yesno",
		"buttons": [
		{"label": "On", "endpoint": "/camera2/cooler", "val": true, "method": "PUT"},
		{"label": "Off", "endpoint": "/camera2/cooler", "val": false, "method": "PUT"}

noctua/web/pages/macros/control_panel.html

+6 −6

Original line number	Diff line number	Diff line
		@@ -42,15 +42,15 @@
		</fieldset>

		<aside class="row">
		<small class="col-4 mt-1 text-success">ra: <var data-status="telescope-coordinates-radec-0">N/A</var></small>
		<small class="col-4 mt-1 text-success">dec: <var data-status="telescope-coordinates-radec-1">N/A</var></small>
		<small class="col-4 mt-1 text-success">ha: <var data-status="telescope-coordinates-ha">N/A</var></small>
		<small class="col-4 mt-1 text-success">ra: <var data-status="telescope-coordinates-radec-0" data-display="plain">N/A</var></small>
		<small class="col-4 mt-1 text-success">dec: <var data-status="telescope-coordinates-radec-1" data-display="plain">N/A</var></small>
		<small class="col-4 mt-1 text-success">ha: <var data-status="telescope-coordinates-ha" data-display="plain">N/A</var></small>
		</aside>

		<aside class="row">
		<small class="col-4 mt-1 text-success">alt: <var data-status="telescope-coordinates-altaz-0" data-transform="round_3">N/A</var></small>
		<small class="col-4 mt-1 text-success">az: <var data-status="telescope-coordinates-altaz-1" data-transform="round_3">N/A</var></small>
		<small class="col-4 mt-1 text-success">lst: <var data-status="telescope-coordinates-lst">N/A</var></small>
		<small class="col-4 mt-1 text-success">alt: <var data-status="telescope-coordinates-altaz-0" data-display="plain" data-transform="round_3">N/A</var></small>
		<small class="col-4 mt-1 text-success">az: <var data-status="telescope-coordinates-altaz-1" data-display="plain" data-transform="round_3">N/A</var></small>
		<small class="col-4 mt-1 text-success">lst: <var data-status="telescope-coordinates-lst" data-display="plain">N/A</var></small>
		</aside>

		</div>

noctua/web/pages/macros/mode_panels.html

+5 −5

Original line number	Diff line number	Diff line
		@@ -92,9 +92,9 @@
		</form>

		<aside class="row g-1 mt-2 small font-monospace">
		<small class="col-4 text-success">state: <var data-status="camera-snapshot-state">N/A</var></small>
		<small class="col-4 text-success">filter: <var data-status="camera-filter">N/A</var></small>
		<small class="col-4 text-success">T: <var data-status="camera-settings-temperature">N/A</var>°C</small>
		<small class="col-4 text-success">state: <var data-status="camera-snapshot-state" data-display="pill" data-map="camera_state">N/A</var></small>
		<small class="col-4 text-success">filter: <var data-status="camera-filter" data-display="plain">N/A</var></small>
		<small class="col-4 text-success">T: <var data-status="camera-settings-temperature" data-display="plain" data-transform="round_1">N/A</var>°C</small>
		</aside>

		{% endmacro %}
		@@ -157,8 +157,8 @@
		</form>

		<aside class="row g-1 mt-2 small font-monospace">
		<small class="col-6 text-success">state: <var data-status="camera2-snapshot-state">—</var></small>
		<small class="col-6 text-success">T: <var data-status="camera2-settings-temperature">—</var>°C</small>
		<small class="col-6 text-success">state: <var data-status="camera2-snapshot-state" data-display="pill" data-map="camera_state">—</var></small>
		<small class="col-6 text-success">T: <var data-status="camera2-settings-temperature" data-display="plain" data-transform="round_1">—</var>°C</small>
		</aside>
		{% endmacro %}

noctua/web/pages/macros/widgets.html

+18 −9

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@
		<fieldset class="widget-universal" id="onoff-{{ safe_id }}">
		<div class="input-group input-group-sm">
		<span class="col-md input-group-text status-container">
		<var class="badge bg-secondary w-100 font-monospace" data-status="{{ status }}" >Unk</var>
		<var class="badge bg-secondary w-100 font-monospace" data-status="{{ status }}" data-display="pill">Unk</var>
		</span>
		<button class="col-md btn btn-outline-primary btn-universal btn-onoff"
		data-method="PUT"
		@@ -31,7 +31,11 @@
		<div class="input-group input-group-sm">
		{% if config.info %}
		<span class="col-md-2 input-group-text status-container">
		<var class="badge bg-secondary w-100 font-monospace" data-status="{{ config.info.strip('/') \| replace('/', '-') }}"{% if config.transform %} data-transform="{{ config.transform }}"{% endif %}>Unk</var>
		<var class="badge bg-secondary w-100 font-monospace"
		data-status="{{ config.info.strip('/') \| replace('/', '-') }}"
		data-display="{{ config.display \| default('pill') }}"
		{% if config.map %} data-map="{{ config.map }}"{% endif %}
		{% if config.transform %} data-transform="{{ config.transform }}"{% endif %}>Unk</var>
		</span>
		{% endif %}

		@@ -86,7 +90,11 @@

		{% if config.info %}
		<span class="col-md-2 input-group-text status-container">
		<var class="badge bg-secondary w-100 font-monospace" data-status="{{ config.info.strip('/') \| replace('/', '-') }}"{% if config.transform %} data-transform="{{ config.transform }}"{% endif %}>Unk</var>
		<var class="badge bg-secondary w-100 font-monospace"
		data-status="{{ config.info.strip('/') \| replace('/', '-') }}"
		data-display="{{ config.display \| default('pill') }}"
		{% if config.map %} data-map="{{ config.map }}"{% endif %}
		{% if config.transform %} data-transform="{{ config.transform }}"{% endif %}>Unk</var>
		</span>
		{% endif %}

		@@ -146,12 +154,13 @@
		<!-- WIDGET: Info labels -->
		{% macro render_info(items) %}
		{% for item in items %}
		<small class="col d-flex gap-2 mt-1 text-success">
		<small class="col d-flex gap-2 align-items-center mt-1 text-success">
		{% if item.label %}{{ item.label }}:
		<var class="status-var text-end font-monospace"
		<var class="font-monospace text-light"
		data-status="{{ item.status }}"
		{% if item.transform %} data-transform="{{ item.transform }}"{% endif %}
		style="opacity: 1;">N/A</var>{% endif %}
		data-display="{{ item.display \| default('plain') }}"
		{% if item.map %} data-map="{{ item.map }}"{% endif %}
		{% if item.transform %} data-transform="{{ item.transform }}"{% endif %}>N/A</var>{% endif %}
		</small>
		{% endfor %}
		{% endmacro %}