Commit cfbcc0fb authored by Jeroen Vreeken's avatar Jeroen Vreeken
Browse files

Small ui fixes

prevent magic lib failure from crashing http server
parent bad70145
......@@ -829,6 +829,9 @@ static int callback_http(struct libwebsocket_context *context,
else
mime = magic_file(magic, resource_path);
if (!mime)
mime = "application/octet-stream";
r = libwebsockets_serve_http_file(context, wsi,
resource_path, mime, NULL, 0);
}
......
......@@ -106,7 +106,7 @@ var azimuth_software = new dt_ui_window_trace("azimuth_software", "Azimuth Softw
frequency: 4,
label: "Position",
func: rad2deg,
suffix: "deg",
suffix: "°",
is_bool: false,
is_number: true,
decimals: 4,
......@@ -117,7 +117,7 @@ var azimuth_software = new dt_ui_window_trace("azimuth_software", "Azimuth Softw
frequency: 4,
label: "Setpoint",
func: rad2deg,
suffix: "deg",
suffix: "°",
is_bool: false,
is_number: true,
decimals: 4,
......@@ -128,7 +128,7 @@ var azimuth_software = new dt_ui_window_trace("azimuth_software", "Azimuth Softw
frequency: 4,
label: "Setpoint Error",
func: rad2deg,
suffix: "deg",
suffix: "°",
is_bool: false,
is_number: true,
decimals: 4,
......@@ -139,7 +139,7 @@ var azimuth_software = new dt_ui_window_trace("azimuth_software", "Azimuth Softw
frequency: 4,
label: "Spg",
func: rad2deg,
suffix: "deg",
suffix: "°",
is_bool: false,
is_number: true,
decimals: 4,
......@@ -150,7 +150,7 @@ var azimuth_software = new dt_ui_window_trace("azimuth_software", "Azimuth Softw
frequency: 4,
label: "Error",
func: rad2deg,
suffix: "deg",
suffix: "°",
is_bool: false,
is_number: true,
decimals: 4,
......@@ -173,7 +173,7 @@ var elevation_software = new dt_ui_window_trace("elevation_software", "Elevation
frequency: 4,
label: "Position",
func: rad2deg,
suffix: "deg",
suffix: "°",
is_bool: false,
is_number: true,
decimals: 4,
......@@ -184,7 +184,7 @@ var elevation_software = new dt_ui_window_trace("elevation_software", "Elevation
frequency: 4,
label: "Setpoint",
func: rad2deg,
suffix: "deg",
suffix: "°",
is_bool: false,
is_number: true,
decimals: 4,
......@@ -195,7 +195,7 @@ var elevation_software = new dt_ui_window_trace("elevation_software", "Elevation
frequency: 4,
label: "Setpoint Error",
func: rad2deg,
suffix: "deg",
suffix: "°",
is_bool: false,
is_number: true,
decimals: 4,
......@@ -206,7 +206,7 @@ var elevation_software = new dt_ui_window_trace("elevation_software", "Elevation
frequency: 4,
label: "Spg",
func: rad2deg,
suffix: "deg",
suffix: "°",
is_bool: false,
is_number: true,
decimals: 4,
......@@ -217,7 +217,7 @@ var elevation_software = new dt_ui_window_trace("elevation_software", "Elevation
frequency: 4,
label: "Error",
func: rad2deg,
suffix: "deg",
suffix: "°",
is_bool: false,
is_number: true,
decimals: 4,
......@@ -228,7 +228,7 @@ var elevation_software = new dt_ui_window_trace("elevation_software", "Elevation
frequency: 4,
label: "Torsion",
func: rad2deg,
suffix: "deg",
suffix: "°",
is_bool: false,
is_number: true,
decimals: 4,
......
......@@ -71,7 +71,9 @@ function authorization(element_name) {
this.button_man.text_set("Manual");
this.window.align_horizontal(
[this.lbl_auth, this.val_auth, this.button_idle ], 20);
[this.lbl_auth, this.val_auth ], 5);
this.window.align_horizontal(
[this.val_auth, this.button_idle ], 10);
this.window.align_horizontal(
[this.button_idle, this.button_azel, this.button_j2000,
this.button_moon, this.button_sun, this.button_sat,
......
......@@ -81,12 +81,12 @@ function dt_status(element_name) {
this.val_az_pos.label_set("Position");
this.val_el_pos.label_set("Position");
this.val_fb_pos.label_set("Position");
this.val_az_pos.suffix_set("deg");
this.val_el_pos.suffix_set("deg");
this.val_fb_pos.suffix_set("cm ");
this.val_az_pos.suffix_set("°");
this.val_el_pos.suffix_set("°");
this.val_fb_pos.suffix_set("cm");
this.val_t.suffix_set("UTC");
this.val_az_north.label_set("True north");
this.val_az_north.suffix_set("deg");
this.val_az_north.label_set("North");
this.val_az_north.suffix_set("°");
this.button_fb_p.text_set("+");
this.button_fb_m.text_set("-");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment