Commit 4dde389a authored by Jeroen Vreeken's avatar Jeroen Vreeken
Browse files

Display focusbox position in cm. ( value * 10, and no decimals)

Increase maximum azimuth speed to 2500 rpm
Change show position to 30,30
parent 6606002f
......@@ -128,7 +128,7 @@ function dt_traceval(element)
"<div style='float: left'>" +
this.label + filler +
"</div>" +
"<div align='right'>" +
"<div align='right' style='padding-right: 5px' >" +
new_value + this.suffix +
"</div>";
changed = true;
......
......@@ -265,7 +265,7 @@
<td valign="top" width="30%" style="border:thin solid black">
<center>
<input type="button" value="Focusbox 134.7,-0.05" onclick="azel_set_coord('134.7','-0.05');"><br>
<input type="button" value="Show -6,30" onclick="azel_set_coord('-6','30');"><br>
<input type="button" value="Show 30,30" onclick="azel_set_coord('30','30');"><br>
</center>
</td>
</tr>
......@@ -1110,12 +1110,12 @@ Elevation_Setpoint_trace.open(trace_url, 'Elevation_Setpoint', 2);
*/
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");
function Focusbox_Position_trace_value(obj, time, value, unit)
{
focusbox_position.value(value);
focusbox_position.value(value * 10);
}
function Focusbox_Position_trace_timeout(obj)
......
......@@ -230,7 +230,7 @@ params {
# maximum speed and position clients input is checked against
{ "azimuth_spg", "max_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
{ "azimuth_spg", "max_a", (float) 0.0002 }
{ "azimuth_spg", "max_j", (float) 0.00001 }
......@@ -241,7 +241,7 @@ params {
# maximum values within we allow normal operation
{ "azimuth_servo_state", "max_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 }
# controller factors
{ "azimuth_pid", "kp", (float) 0.20 }
......
......@@ -8,5 +8,5 @@ params {
{ "elevation_pid", "kd", (float)0 }
# 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 {
#limit spg to 1000rpm
{ "azimuth_spg", "max1d", (float)0.006981317 }
{ "azimuth_spg", "min1d", (float)-0.006981317 }
{ "azimuth_spg", "max1d", (float) rpm2rads(2500.0)/$(azimuth_gear) }
# { "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
#float azimuth_spg max1d 0.017453293
......
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