Skip to content

Commit 87fcd85

Browse files
committed
fix teleop
1 parent 0c7501a commit 87fcd85

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

teleop/www/index.html

+14-3
Original file line numberDiff line numberDiff line change
@@ -114,22 +114,31 @@ <h1>Sensors</h1>
114114

115115
<script type="text/javascript">
116116

117+
var is_manual_request_sended = 0;
118+
var is_get_request_answer = 1;
119+
117120
function sendAjaxRequest_Make(command) {
118121
if( console && console.log ) console.log(command);
119122

123+
if(is_get_request_answer == 0)
124+
return;
125+
120126
$("#error_message").html("&nbsp;");
121127
$("#error_message").removeClass("alert-danger");
122128
$("#error_message").data("role", "");
123129
$("#ajax_data_get").toggleClass('green');
124130
$("#ajax_data_resp").removeClass("orange");
125131

132+
is_get_request_answer = 0;
133+
126134
$.ajax({
127135
url: "cgi-bin/ajax_make",
128136
//url: "cgi-bin/telem",
129137
method: 'GET',
130138
dataType: 'json',
131139
data: {cmd : command}
132140
}).done(function ( json ) {
141+
is_get_request_answer = 1;
133142
if( console && console.log ) console.log(json);
134143

135144
$("#ajax_data_resp").toggleClass('orange');
@@ -190,7 +199,9 @@ <h1>Sensors</h1>
190199
var updateInterval = 200;
191200

192201
function update() {
193-
sendAjaxRequest_Make("telem");
202+
if(is_manual_request_sended == 0) {
203+
sendAjaxRequest_Make("telem");
204+
}
194205
setTimeout(update, updateInterval);
195206
}
196207

@@ -201,11 +212,11 @@ <h1>Sensors</h1>
201212
if( console && console.log ) console.log('Handler for .keypress() called. - ' + event.charCode);
202213
var keychar = String.fromCharCode(event.charCode);
203214

215+
is_manual_request_sended = 1;
204216
if(keychar == "w" || keychar == "Ж" || keychar == "W" || keychar == "ж") sendAjaxRequest_Make("forward");
205217
if(keychar == "a" || keychar == "Т" || keychar == "A" || keychar == "т") sendAjaxRequest_Make("left");
206218
if(keychar == "s" || keychar == "Ш" || keychar == "S" || keychar == "ш") sendAjaxRequest_Make("back");
207219
if(keychar == "d" || keychar == "Б" || keychar == "D" || keychar == "б") sendAjaxRequest_Make("right");
208-
209220
});
210221

211222
$(document).keyup(function(event) {
@@ -216,7 +227,7 @@ <h1>Sensors</h1>
216227
if(keychar == "a" || keychar == "Т" || keychar == "A" || keychar == "т") sendAjaxRequest_Make("stop");
217228
if(keychar == "s" || keychar == "Ш" || keychar == "S" || keychar == "ш") sendAjaxRequest_Make("stop");
218229
if(keychar == "d" || keychar == "Б" || keychar == "D" || keychar == "б") sendAjaxRequest_Make("stop");
219-
230+
is_manual_request_sended = 0;
220231
});
221232

222233
</script>

0 commit comments

Comments
 (0)