Merge branch 'Enfileiramento' of bitbucket.org:zendioninc/agrobot_base into Enfileiramento

This commit is contained in:
Diego Freitas 2024-05-14 07:10:59 -03:00
commit 85bc549439
19 changed files with 25 additions and 13 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@
[{"Momento":"2024-05-13T19:07:14.01317-03:00","VelocidadeMedia":0.0,"PorcentagemBateria":0.0,"BateriaConsumida":0.0,"DistanciaPercorrida":[],"DistanciaEsquerda":0.0,"DistanciaDireita":0.0,"AnguloCarroGPS":0.0,"AnguloCarroBussola":0.0,"AnguloCarro":0.0,"SonarFrontal":null},{"Momento":"2024-05-13T19:07:19.0221682-03:00","VelocidadeMedia":0.0,"PorcentagemBateria":0.0,"BateriaConsumida":0.0,"DistanciaPercorrida":[],"DistanciaEsquerda":0.0,"DistanciaDireita":0.0,"AnguloCarroGPS":0.0,"AnguloCarroBussola":0.0,"AnguloCarro":0.0,"SonarFrontal":null},{"Momento":"2024-05-13T19:07:24.0521841-03:00","VelocidadeMedia":0.0,"PorcentagemBateria":0.0,"BateriaConsumida":0.0,"DistanciaPercorrida":[],"DistanciaEsquerda":0.0,"DistanciaDireita":0.0,"AnguloCarroGPS":0.0,"AnguloCarroBussola":0.0,"AnguloCarro":0.0,"SonarFrontal":null},{"Momento":"2024-05-13T19:07:29.0271685-03:00","VelocidadeMedia":0.0,"PorcentagemBateria":0.0,"BateriaConsumida":0.0,"DistanciaPercorrida":[],"DistanciaEsquerda":0.0,"DistanciaDireita":0.0,"AnguloCarroGPS":0.0,"AnguloCarroBussola":0.0,"AnguloCarro":0.0,"SonarFrontal":null},{"Momento":"2024-05-13T19:07:34.0431702-03:00","VelocidadeMedia":0.0,"PorcentagemBateria":0.0,"BateriaConsumida":0.0,"DistanciaPercorrida":[],"DistanciaEsquerda":0.0,"DistanciaDireita":0.0,"AnguloCarroGPS":0.0,"AnguloCarroBussola":0.0,"AnguloCarro":0.0,"SonarFrontal":null},{"Momento":"2024-05-13T19:07:39.02117-03:00","VelocidadeMedia":0.0,"PorcentagemBateria":0.0,"BateriaConsumida":0.0,"DistanciaPercorrida":[],"DistanciaEsquerda":0.0,"DistanciaDireita":0.0,"AnguloCarroGPS":0.0,"AnguloCarroBussola":0.0,"AnguloCarro":0.0,"SonarFrontal":null}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -25,7 +25,7 @@
<meta name="viewport" content="width=device-width,
initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<style>
#map_899d5215ba479a9bfa5d8b81cf21d734 {
#map_f8872872d362397e346888da36799a6a {
position: relative;
width: 100.0%;
height: 100.0%;
@ -39,14 +39,14 @@
<body>
<div class="folium-map" id="map_899d5215ba479a9bfa5d8b81cf21d734" ></div>
<div class="folium-map" id="map_f8872872d362397e346888da36799a6a" ></div>
</body>
<script>
var map_899d5215ba479a9bfa5d8b81cf21d734 = L.map(
"map_899d5215ba479a9bfa5d8b81cf21d734",
var map_f8872872d362397e346888da36799a6a = L.map(
"map_f8872872d362397e346888da36799a6a",
{
center: [0.0, 0.0],
crs: L.CRS.EPSG3857,
@ -60,13 +60,13 @@
var tile_layer_81423970d7bc452c318d35692d0b5676 = L.tileLayer(
var tile_layer_c686e407ed5ff252b28559436200f4ac = L.tileLayer(
"https://tile.openstreetmap.org/{z}/{x}/{y}.png",
{"attribution": "\u0026copy; \u003ca href=\"https://www.openstreetmap.org/copyright\"\u003eOpenStreetMap\u003c/a\u003e contributors", "detectRetina": false, "maxNativeZoom": 19, "maxZoom": 19, "minZoom": 0, "noWrap": false, "opacity": 1, "subdomains": "abc", "tms": false}
);
tile_layer_81423970d7bc452c318d35692d0b5676.addTo(map_899d5215ba479a9bfa5d8b81cf21d734);
tile_layer_c686e407ed5ff252b28559436200f4ac.addTo(map_f8872872d362397e346888da36799a6a);
</script>
@ -87,7 +87,7 @@
}
trajeto_json_add({"features": []});
trajeto_json.addTo(map_899d5215ba479a9bfa5d8b81cf21d734);
trajeto_json.addTo(map_f8872872d362397e346888da36799a6a);
function adicionarGeometria(novaGeometria) {
trajeto_json.addData(novaGeometria);
@ -145,7 +145,7 @@
var marcadorDinamico = L.marker([0, 0], {
icon: customIcon
}).addTo(map_899d5215ba479a9bfa5d8b81cf21d734);
}).addTo(map_f8872872d362397e346888da36799a6a);
// Conectar ao broker MQTT
const client = mqtt.connect('ws://localhost:9001'); // Use wss para conexão segura
@ -184,7 +184,7 @@
marcadorDinamico.setRotationAngle(angulo);
adicionarCoordenada("Tj", [novaLongitude, novaLatitude]);
map_899d5215ba479a9bfa5d8b81cf21d734.setView(novaPosicao, map_899d5215ba479a9bfa5d8b81cf21d734.getZoom());
map_f8872872d362397e346888da36799a6a.setView(novaPosicao, map_f8872872d362397e346888da36799a6a.getZoom());
});
function calcularOrientacao(P1latitude, P1longitude, P2latitude, P2longitude) {