*
This commit is contained in:
+97
-32
@@ -4472,26 +4472,39 @@
|
||||
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
|
||||
* --------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
|
||||
const motors_buf = new Float32Array(2);
|
||||
const motors_ml = document.getElementById("motors_ml")
|
||||
const motors_mr = document.getElementById("motors_mr")
|
||||
const motors_stop = document.getElementById("motors_stop")
|
||||
const motors_joystick = document.getElementById('motors_joystick');
|
||||
const motors_canvas = document.getElementById('motors_canvas');
|
||||
|
||||
let motors_ws = null;
|
||||
|
||||
const send_motors = (vl, vr) => {
|
||||
/*if (motors_ws && motors_ws.readyState == WebSocket.OPEN) {
|
||||
const lim = v => Math.max(-1, Math.min(v, 1));
|
||||
motors_buf[0] = lim(vl);
|
||||
motors_buf[1] = lim(vr);
|
||||
motors_ml.value = vl * 100;
|
||||
motors_mr.value = vr * 100;
|
||||
motors_ws.send(motors_buf);
|
||||
} else if (!motors_ws || motors_ws.readyState != WebSocket.CONNECTING) {
|
||||
motors_ws = new WebSocket('ws://' + document.location.host + '/motors.ws');
|
||||
motors_ws.addEventListener("open", () => send_motors(vl, vr));
|
||||
}*/
|
||||
};
|
||||
|
||||
const update_motors = () => {
|
||||
const vl = motors_ml.value / 100;
|
||||
const vr = motors_mr.value / 100;
|
||||
send_motors(vl, vr);
|
||||
}
|
||||
|
||||
|
||||
const index_umd = {
|
||||
Alert,
|
||||
Button,
|
||||
Carousel,
|
||||
Collapse,
|
||||
Dropdown,
|
||||
Modal,
|
||||
Offcanvas,
|
||||
Popover,
|
||||
ScrollSpy,
|
||||
Tab,
|
||||
Toast,
|
||||
Tooltip
|
||||
};
|
||||
|
||||
document.getElementById("colorLed").onchange=function(){
|
||||
// do whatever you want with value
|
||||
console.log(this.value);
|
||||
};
|
||||
|
||||
const btnsz = 40;
|
||||
let positionX = 0, positionY = 0;
|
||||
@@ -4503,20 +4516,19 @@
|
||||
const h = motors_joystick.height;
|
||||
ctx.clearRect(0, 0, w, h);
|
||||
|
||||
ctx.fillStyle = "#00aa0040";
|
||||
ctx.fillStyle = "#00aaff40";
|
||||
ctx.beginPath();
|
||||
ctx.arc(w/2, h/2, w/2-btnsz, 0, 2 * Math.PI);
|
||||
ctx.fill();
|
||||
|
||||
ctx.lineWidth = 2;
|
||||
ctx.strokeStyle = "#009900";
|
||||
ctx.fillStyle = "#00aa00";
|
||||
ctx.strokeStyle = "#0099ee";
|
||||
ctx.fillStyle = "#00aaff";
|
||||
ctx.beginPath();
|
||||
ctx.arc(w/2 + positionX, h/2 + positionY, btnsz, 0, 2 * Math.PI);
|
||||
ctx.fill();
|
||||
ctx.stroke();
|
||||
}
|
||||
|
||||
const updatePosition = e => {
|
||||
const clientX = e.clientX || e.touches[0].clientX;
|
||||
const clientY = e.clientY || e.touches[0].clientY;
|
||||
@@ -4531,11 +4543,9 @@
|
||||
}
|
||||
positionX = vx * kw;
|
||||
positionY = vy * kw;
|
||||
console.log("PositionX : "+ Math.round(positionX))
|
||||
console.log("PositionY : "+ Math.round(positionY))
|
||||
vy *= -1;
|
||||
if (performance.now() - lastsend > 250) {
|
||||
//send_motors(vy+vx, vy-vx);
|
||||
send_motors(vy+vx, vy-vx);
|
||||
lastsend = performance.now();
|
||||
}
|
||||
joystick_draw();
|
||||
@@ -4552,7 +4562,7 @@
|
||||
};
|
||||
const onup = () => {
|
||||
if (clicked) {
|
||||
//send_motors(0, 0);
|
||||
send_motors(0, 0);
|
||||
motors_joystick.style.cursor = ''
|
||||
clicked = false;
|
||||
positionX = positionY = 0;
|
||||
@@ -4568,15 +4578,70 @@
|
||||
motors_joystick.addEventListener('touchmove', onmove);
|
||||
motors_joystick.addEventListener('touchend', onup);
|
||||
motors_joystick.addEventListener('touchcancel', onup);
|
||||
|
||||
//const text_color = getComputedStyle(motors_canvas).color;
|
||||
document.body.addEventListener('h:infos:motors', e => {
|
||||
const ctx = motors_canvas.getContext("2d");
|
||||
const w = motors_canvas.width;
|
||||
const h = motors_canvas.height;
|
||||
const m = 5;
|
||||
const ml = e.detail[0];
|
||||
const mr = e.detail[1];
|
||||
ctx.clearRect(0, 0, w, h);
|
||||
ctx.lineWidth = 3;
|
||||
ctx.strokeStyle = "#808080"
|
||||
ctx.fillStyle = "#008000"
|
||||
|
||||
ctx.beginPath();
|
||||
ctx.rect(m, m, w-2*m, (h/2-m));
|
||||
ctx.stroke();
|
||||
|
||||
ctx.beginPath();
|
||||
ctx.rect(m, (h/2-m)+m, w-2*m, (h/2-m));
|
||||
ctx.stroke();
|
||||
|
||||
ctx.beginPath();
|
||||
if (ml > 0)
|
||||
ctx.rect(w/2, m+1, ml*(w/2-m), (h/2-m)-2);
|
||||
else
|
||||
ctx.rect(w/2+ml*(w/2-m), m+1, -ml*(w/2-m), (h/2-m)-2);
|
||||
ctx.fill();
|
||||
|
||||
ctx.beginPath();
|
||||
if (ml > 0)
|
||||
ctx.rect(w/2, (h/2-m)+m+1, mr*(w/2-m), (h/2-m)-2);
|
||||
else
|
||||
ctx.rect(w/2+mr*(w/2-m), (h/2-m)+m+1, -mr*(w/2-m), (h/2-m)-2);
|
||||
ctx.fill();
|
||||
});
|
||||
|
||||
/*document.body.addEventListener('h:section:statechanged', e => {
|
||||
infos_mask(INFOS_MOTORS, e.detail['on']);
|
||||
});
|
||||
infos_mask(INFOS_MOTORS, true);*/
|
||||
|
||||
function onclick(){
|
||||
send_motors(vy+vx, vy-vx);
|
||||
|
||||
}
|
||||
document.getElementById("colorLed").value = "#ffffff"
|
||||
document.getElementById("colorLed").onchange=function(){
|
||||
// do whatever you want with value
|
||||
console.log(this.value);
|
||||
};
|
||||
|
||||
const index_umd = {
|
||||
Alert,
|
||||
Button,
|
||||
Carousel,
|
||||
Collapse,
|
||||
Dropdown,
|
||||
Modal,
|
||||
Offcanvas,
|
||||
Popover,
|
||||
ScrollSpy,
|
||||
Tab,
|
||||
Toast,
|
||||
Tooltip
|
||||
};
|
||||
|
||||
return index_umd;
|
||||
|
||||
|
||||
|
||||
}));
|
||||
//# sourceMappingURL=bootstrap.js.map
|
||||
|
||||
Reference in New Issue
Block a user