Skip to content

Commit a2a5e12

Browse files
committed
Added config controls for camera rotation and arm servo angles
1 parent 4236ba6 commit a2a5e12

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

coderbot.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"move_tr_speed": "75", "move_fw_elapse": "1.5", "show_page_program": "true", "load_at_start": "", "move_tr_elapse": "90", "sound_start": "$startup.mp3", "sound_stop": "$shutdown.mp3", "camera_exposure_mode": "auto", "camera_rotation": "180", "prog_move_motion": "yes", "show_control_move_commands": "true", "prog_level": "adv", "prog_scrollbars": "true", "ctrl_counter": "yes", "ctrl_fw_speed": "100", "move_fw_speed": "100", "show_page_control": "true", "sound_shutter": "$shutter.mp3", "show_page_prefs": "true", "prog_maxblocks": "-1", "ctrl_hud_image": "", "button_func": "none", "move_motor_mode": "servo", "ctrl_fw_elapse": "-1", "ctrl_tr_elapse": "-1", "move_power_angle_2": "20", "move_power_angle_3": "20", "ctrl_tr_speed": "80", "move_power_angle_1": "15"}
1+
{"move_tr_speed": "75", "move_fw_elapse": "1.5", "arm_angle_raised": "120", "load_at_start": "", "move_tr_elapse": "90", "show_page_program": "true", "sound_stop": "$shutdown.mp3", "camera_exposure_mode": "auto", "prog_move_motion": "yes", "show_control_move_commands": "true", "prog_level": "adv", "prog_scrollbars": "true", "ctrl_counter": "yes", "sound_start": "$startup.mp3", "camera_rotation": "180", "ctrl_fw_speed": "100", "move_fw_speed": "100", "show_page_control": "true", "sound_shutter": "$shutter.mp3", "show_page_prefs": "true", "arm_angle_lowered": "60", "prog_maxblocks": "-1", "ctrl_hud_image": "", "button_func": "none", "move_motor_mode": "servo", "ctrl_fw_elapse": "-1", "ctrl_tr_elapse": "-1", "move_power_angle_2": "20", "move_power_angle_3": "20", "ctrl_tr_speed": "80", "move_power_angle_1": "15"}

static/js/control.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ $(document).on( "pagecreate", '#page-control', function( event ) {
7979
bot.takePhoto();
8080
});
8181
$('#b_camera_rot').on("click",function(){
82-
bot.rotateCamera();
82+
bot.rotateCamera();
8383
});
8484
$('#b_video_rec').on("click", function (){
8585
bot.videoRec();

templates/config.html

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,13 @@ <h1>CoderBot</h1>
9999
     <option value="antishake"{%if config.camera_exposure_mode=='antishake'%} selected{%endif%}>Anti shake</option>
100100
     <option value="verylong"{%if config.camera_exposure_mode=='verylong'%} selected{%endif%}>Very long</option>
101101
</select>
102+
<label for="i_camera_rotation">{% trans %} Camera image rotation {% endtrans %}</label>
103+
<select name="camera_rotation" id="i_camera_rotation" value="{{config.camera_rotation}}">
104+
     <option value="0"{%if config.camera_rotation=='0'%} selected{%endif%}>0</option>
105+
     <option value="90"{%if config.camera_rotation=='90'%} selected{%endif%}>90</option>
106+
     <option value="180"{%if config.camera_rotation=='180'%} selected{%endif%}>180</option>
107+
     <option value="270"{%if config.camera_rotation=='270'%} selected{%endif%}>270</option>
108+
</select>
102109
</div>
103110
<div id="t_movement" class="ui-body-d ui-content">
104111
<label for="i_move_motor_mode">{% trans %}Motor control mode{% endtrans %}</label>
@@ -109,6 +116,10 @@ <h1>CoderBot</h1>
109116
<input type="text" id="i_move_power_angle_2" name="move_power_angle_2" value="{{config.move_power_angle_2}}">
110117
<label for="i_move_power_angle_3">{% trans %}Power (target angle -1){% endtrans %}</label>
111118
<input type="text" id="i_move_power_angle_3" name="move_power_angle_3" value="{{config.move_power_angle_3}}">
119+
<label for="i_arm_angle_lowered">{% trans %}Arm lowered angle (0-180) {% endtrans %}</label>
120+
<input type ="text" id="i_arm_angle_lowered" name="arm_angle_lowered" value="{{config.arm_angle_lowered}}">
121+
<label for="i_arm_angle_raised">{% trans %} Arm raised angle (0-180) {% endtrans %}</label>
122+
<input type ="text" id="i_arm_angle_raised" name="arm_angle_raised" value="{{config.arm_angle_raised}}">
112123
</div>
113124
<div id="t_start" class="ui-body-d ui-content">
114125
<label for="i_load_at_start">{% trans %}Load at start{% endtrans %}</label>

0 commit comments

Comments
 (0)