Commit 623e3103 authored by Jeroen Vreeken's avatar Jeroen Vreeken
Browse files

Merge branch 'jeroen' into ui

Conflicts:
	console/htdocs/index.html
parents e247dcae 4dde389a
...@@ -162,7 +162,7 @@ function azel(element_name) { ...@@ -162,7 +162,7 @@ function azel(element_name) {
this.lbl_preset_azel.wrap_set(false); this.lbl_preset_azel.wrap_set(false);
this.lbl_preset_azel.text_set("Azimuth & Elevation:"); this.lbl_preset_azel.text_set("Azimuth & Elevation:");
this.button_azel_focus.text_set("Focusbox 134.7, -0.05"); this.button_azel_focus.text_set("Focusbox 134.7, -0.05");
this.button_azel_show.text_set("Show -6, 30"); this.button_azel_show.text_set("Show 30, 30");
this.position_elem.resize_equal( this.position_elem.resize_equal(
[this.lbl_filler, [this.lbl_filler,
...@@ -291,7 +291,7 @@ function azel(element_name) { ...@@ -291,7 +291,7 @@ function azel(element_name) {
} }
this.button_azel_show.onclick = function() { this.button_azel_show.onclick = function() {
azel_this.set_el(30); azel_this.set_el(30);
azel_this.set_az(-6) azel_this.set_az(30)
} }
/* /*
......
...@@ -763,7 +763,7 @@ function dt_traceval(element) ...@@ -763,7 +763,7 @@ function dt_traceval(element)
"<div style='float: left'>" + "<div style='float: left'>" +
this.label + filler + this.label + filler +
"</div>" + "</div>" +
"<div align='right'>" + "<div align='right' style='padding-right: 5px' >" +
new_value + this.suffix + new_value + this.suffix +
"</div>"; "</div>";
changed = true; changed = true;
......
...@@ -744,12 +744,12 @@ Elevation_Setpoint_trace.open(trace_url, 'Elevation_Setpoint', 2); ...@@ -744,12 +744,12 @@ Elevation_Setpoint_trace.open(trace_url, 'Elevation_Setpoint', 2);
*/ */
var focusbox_position = new dt_traceval("Focusbox_Position"); var focusbox_position = new dt_traceval("Focusbox_Position");
focusbox_position.number_set(true, 2); focusbox_position.number_set(true, 0);
focusbox_position.highlight_set(true, "yellow", "white"); focusbox_position.highlight_set(true, "yellow", "white");
function Focusbox_Position_trace_value(obj, time, value, unit) function Focusbox_Position_trace_value(obj, time, value, unit)
{ {
focusbox_position.value(value); focusbox_position.value(value * 10);
} }
function Focusbox_Position_trace_timeout(obj) function Focusbox_Position_trace_timeout(obj)
......
...@@ -230,7 +230,7 @@ params { ...@@ -230,7 +230,7 @@ params {
# maximum speed and position clients input is checked against # maximum speed and position clients input is checked against
{ "azimuth_spg", "max_x", (float) deg2rad(270.0) } { "azimuth_spg", "max_x", (float) deg2rad(270.0) }
{ "azimuth_spg", "min_x", (float) deg2rad(-270.0) } { "azimuth_spg", "min_x", (float) deg2rad(-270.0) }
{ "azimuth_spg", "max_v", (float) rpm2rads(2100.0)/$(azimuth_gear) } { "azimuth_spg", "max_v", (float) rpm2rads(3000.0)/$(azimuth_gear) }
# acceleration and jerk we use to generate a profile # acceleration and jerk we use to generate a profile
{ "azimuth_spg", "max_a", (float) 0.0002 } { "azimuth_spg", "max_a", (float) 0.0002 }
{ "azimuth_spg", "max_j", (float) 0.00001 } { "azimuth_spg", "max_j", (float) 0.00001 }
...@@ -241,7 +241,7 @@ params { ...@@ -241,7 +241,7 @@ params {
# maximum values within we allow normal operation # maximum values within we allow normal operation
{ "azimuth_servo_state", "max_x", (float) deg2rad(270.0) } { "azimuth_servo_state", "max_x", (float) deg2rad(270.0) }
{ "azimuth_servo_state", "min_x", (float) deg2rad(-270.0) } { "azimuth_servo_state", "min_x", (float) deg2rad(-270.0) }
{ "azimuth_servo_state", "max_v", (float) rpm2rads(2100.0)/$(azimuth_gear) } { "azimuth_servo_state", "max_v", (float) rpm2rads(3000.0)/$(azimuth_gear) }
{ "azimuth_servo_state", "max_a", (float) 0.0002 } { "azimuth_servo_state", "max_a", (float) 0.0002 }
# controller factors # controller factors
{ "azimuth_pid", "kp", (float) 0.20 } { "azimuth_pid", "kp", (float) 0.20 }
......
...@@ -8,5 +8,5 @@ params { ...@@ -8,5 +8,5 @@ params {
{ "elevation_pid", "kd", (float)0 } { "elevation_pid", "kd", (float)0 }
# limit spg to 1000rpm # limit spg to 1000rpm
{ "azimuth_spg", "max_v", (float) rpm2rads(1000.0)/$(azimuth_gear) } { "azimuth_spg", "max_v", (float) rpm2rads(2500.0)/$(azimuth_gear) }
} }
...@@ -6,8 +6,10 @@ params { ...@@ -6,8 +6,10 @@ params {
#limit spg to 1000rpm #limit spg to 1000rpm
{ "azimuth_spg", "max1d", (float)0.006981317 } { "azimuth_spg", "max1d", (float) rpm2rads(2500.0)/$(azimuth_gear) }
{ "azimuth_spg", "min1d", (float)-0.006981317 } # { "azimuth_spg", "max1d", (float)0.006981317 }
{ "azimuth_spg", "min1d", (float)-rpm2rads(2500.0)/$(azimuth_gear) }
# { "azimuth_spg", "min1d", (float)-0.006981317 }
#limit spg to 2500rpm #limit spg to 2500rpm
#float azimuth_spg max1d 0.017453293 #float azimuth_spg max1d 0.017453293
......
Supports Markdown
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