bluedragon/VSS_Rally_V3
1
0
Fork 0
mirror of https://github.com/bcomsugi/VSS_Rally_V3.git synced 2026-01-11 02:42:39 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

startrally added autoreconnect if websocket is error

Browse Source
This commit is contained in:
Bluedragon 2022-05-02 03:19:50 +07:00
parent d65d980642
commit 7e2ed058a6
3 changed files with 203 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
data/startrally.html
View File

@ -10,67 +10,101 @@
<script type = "text/javascript"> <script type = "text/javascript">
var ping; var ping;
var ws; var ws;
var wsInterval;
window.onerror = function (message, file, line, col, error) {
const date = new Date();
console.log(date.toLocaleTimeString()+";Onerror->Error occurred: " + error.message);
return false;
};
function checkWS(){
const date = new Date();
console.log(date.toLocaleTimeString()+";checkWS")
if (!ws || ws.readyState === 3 ) loaded();
}
function wsStartTimer(){
const date = new Date();
console.log(date.toLocaleTimeString()+";startwsStartTimer")
wsInterval = setInterval(checkWS(), 1000);
}
function wsStopTimer(){
const date = new Date();
console.log(date.toLocaleTimeString()+";clearWSInterval")
if (wsInterval) clearInterval(wsInterval);
console.log(wsInterval);
}
function loaded(){ function loaded(){
ws = new WebSocket("ws://%serveripaddress%/ws"); ws = new WebSocket("ws://%serveripaddress%/ws");
console.log("new ws"); const date = new Date();
console.log(date.toLocaleTimeString()+";new ws");
// const ws = new WebSocket("ws://%serveripaddress%/ws"); // const ws = new WebSocket("ws://%serveripaddress%/ws");
ws.onopen = function() { ws.onopen = function() {
console.log("WebSocket Connected"); const date = new Date();
if(document.getElementById("mainTime").classList.contains("bg-danger")){ console.log(date.toLocaleTimeString()+";WebSocket Connected");
document.getElementById("mainTime").classList.remove("bg-danger") wsStopTimer();
} if(document.getElementById("mainTime").classList.contains("bg-danger")){
ping = 1; document.getElementById("mainTime").classList.remove("bg-danger")
};
ws.onclose = function() {
// alert("WS Connection Closed");
// console.log("WS Connection Closed");
if(!document.getElementById("mainTime").classList.contains("bg-danger")){
document.getElementById("mainTime").classList.add("bg-danger")
}
ping = -1;
};
ws.onmessage = function(event) {
// console.log(event.data);
let data = JSON.parse(event.data);
// if (data.hasOwnProperty("ping")) {
// console.log("with ping key");
// ping++;
// } else{
let curTrack=document.getElementById("currenttrack").innerHTML;
let tripSpeed=document.getElementById("tripspeed").innerHTML;
let tripDist=document.getElementById("tripdist").innerHTML;
let tripTime=document.getElementById("triptime").innerHTML;
let tripsTime=document.getElementById("tripstime").innerHTML;
if(curTrack==data.Trip){
if(tripSpeed!=data.TSpeed || tripDist != data.TDist || tripTime!=data.TTime ||tripsTime!=data.TsTime){
console.log("Refresh Trip "+data.Trip);
changeTrip(data.Trip);
}
} }
ping++; ping = 1;
document.getElementById("counter").innerHTML = data.counter+";"+data.counter2; };
document.getElementById("currenttime").innerHTML = data.Time; ws.onclose = function() {
document.getElementById("currenttrack").innerHTML = data.Trip; // alert("WS Connection Closed");
document.getElementById("tripspeed").innerHTML = data.TSpeed; const date = new Date();
document.getElementById("tripdist").innerHTML = data.TDist; console.log(date.toLocaleTimeString()+";WS Connection Closed");
document.getElementById("triptime").innerHTML = data.TTime; if(!document.getElementById("mainTime").classList.contains("bg-danger")){
document.getElementById("tripstime").innerHTML = data.TsTime; document.getElementById("mainTime").classList.add("bg-danger")
document.getElementById("currentspeed").innerHTML = data.curSpeed; }
document.getElementById("dir1").innerHTML = data.dir1; ping = -1;
document.getElementById("dir2").innerHTML = data.dir2; wsStartTimer();
document.getElementById("odo1").innerHTML = data.curDist1; };
document.getElementById("odo2").innerHTML = data.curDist2; ws.onerror = function(err) {
document.getElementById("time1").innerHTML = data.time1; const date = new Date();
document.getElementById("time2").innerHTML = data.time2; console.error(date.toLocaleTimeString()+';Socket encountered error: ', err.message, 'Closing socket');
document.getElementById("tdiff1").innerHTML = data.TDiff; ws.close();
document.getElementById("tdiff2").innerHTML = data.TDiff; };
// } ws.onmessage = function(event) {
}; // console.log(event.data);
} let data = JSON.parse(event.data);
setInterval(checkPing, 1000); //heartbeat // if (data.hasOwnProperty("ping")) {
// console.log("with ping key");
// ping++;
// } else{
let curTrack=document.getElementById("currenttrack").innerHTML;
let tripSpeed=document.getElementById("tripspeed").innerHTML;
let tripDist=document.getElementById("tripdist").innerHTML;
let tripTime=document.getElementById("triptime").innerHTML;
let tripsTime=document.getElementById("tripstime").innerHTML;
if(curTrack==data.Trip){
if(tripSpeed!=data.TSpeed || tripDist != data.TDist || tripTime!=data.TTime ||tripsTime!=data.TsTime){
console.log("Refresh Trip "+data.Trip);
changeTrip(data.Trip);
}
}
ping++;
document.getElementById("counter").innerHTML = data.counter+";"+data.counter2;
document.getElementById("currenttime").innerHTML = data.Time;
document.getElementById("currenttrack").innerHTML = data.Trip;
document.getElementById("tripspeed").innerHTML = data.TSpeed;
document.getElementById("tripdist").innerHTML = data.TDist;
document.getElementById("triptime").innerHTML = data.TTime;
document.getElementById("tripstime").innerHTML = data.TsTime;
document.getElementById("currentspeed").innerHTML = data.curSpeed;
document.getElementById("dir1").innerHTML = data.dir1;
document.getElementById("dir2").innerHTML = data.dir2;
document.getElementById("odo1").innerHTML = data.curDist1;
document.getElementById("odo2").innerHTML = data.curDist2;
document.getElementById("time1").innerHTML = data.time1;
document.getElementById("time2").innerHTML = data.time2;
document.getElementById("tdiff1").innerHTML = data.TDiff;
document.getElementById("tdiff2").innerHTML = data.TDiff;
// }
};
}
const checkhealt = setInterval(checkPing, 1000); //heartbeat
function checkPing(){ function checkPing(){
// console.log("ping="+ping); // const date = new Date();
// console.log(date.toLocaleTimeString()+";ping="+ping);
ping--; ping--;
if (ping>=0){ if (ping>=0){
ping=0; ping=0;
@ -80,15 +114,17 @@
if(!document.getElementById("mainTime").classList.contains("bg-danger")){ if(!document.getElementById("mainTime").classList.contains("bg-danger")){
document.getElementById("mainTime").classList.add("bg-danger") document.getElementById("mainTime").classList.add("bg-danger")
} }
} }
} }
function onlyNumberKey(evt,e) { function onlyNumberKey(evt,e) {
// Only ASCII character in that range allowed // Only ASCII character in that range allowed
var ASCIICode = (evt.which) ? evt.which : evt.keyCode var ASCIICode = (evt.which) ? evt.which : evt.keyCode
if (ASCIICode > 31 && (ASCIICode < 48 || ASCIICode > 57) && ASCIICode !=46) if (ASCIICode > 31 && (ASCIICode < 48 || ASCIICode > 57) && ASCIICode !=46)
return false; return false;
return true; return true;
} }
</script> </script>
</head><body onload="loaded();"> </head><body onload="loaded();">
<!-- <!--

150
src/index.h
View File

@ -11,67 +11,101 @@ const char HTML_startrally[] PROGMEM = R"rawliteral(
<script type = "text/javascript"> <script type = "text/javascript">
var ping; var ping;
var ws; var ws;
var wsInterval;
window.onerror = function (message, file, line, col, error) {
const date = new Date();
console.log(date.toLocaleTimeString()+";Onerror->Error occurred: " + error.message);
return false;
};
function checkWS(){
const date = new Date();
console.log(date.toLocaleTimeString()+";checkWS")
if (!ws || ws.readyState === 3 ) loaded();
}
function wsStartTimer(){
const date = new Date();
console.log(date.toLocaleTimeString()+";startwsStartTimer")
wsInterval = setInterval(checkWS(), 1000);
}
function wsStopTimer(){
const date = new Date();
console.log(date.toLocaleTimeString()+";clearWSInterval")
if (wsInterval) clearInterval(wsInterval);
console.log(wsInterval);
}
function loaded(){ function loaded(){
ws = new WebSocket("ws://%serveripaddress%/ws"); ws = new WebSocket("ws://%serveripaddress%/ws");
console.log("new ws"); const date = new Date();
console.log(date.toLocaleTimeString()+";new ws");
// const ws = new WebSocket("ws://%serveripaddress%/ws"); // const ws = new WebSocket("ws://%serveripaddress%/ws");
ws.onopen = function() { ws.onopen = function() {
console.log("WebSocket Connected"); const date = new Date();
if(document.getElementById("mainTime").classList.contains("bg-danger")){ console.log(date.toLocaleTimeString()+";WebSocket Connected");
document.getElementById("mainTime").classList.remove("bg-danger") wsStopTimer();
} if(document.getElementById("mainTime").classList.contains("bg-danger")){
ping = 1; document.getElementById("mainTime").classList.remove("bg-danger")
};
ws.onclose = function() {
// alert("WS Connection Closed");
// console.log("WS Connection Closed");
if(!document.getElementById("mainTime").classList.contains("bg-danger")){
document.getElementById("mainTime").classList.add("bg-danger")
}
ping = -1;
};
ws.onmessage = function(event) {
// console.log(event.data);
let data = JSON.parse(event.data);
// if (data.hasOwnProperty("ping")) {
// console.log("with ping key");
// ping++;
// } else{
let curTrack=document.getElementById("currenttrack").innerHTML;
let tripSpeed=document.getElementById("tripspeed").innerHTML;
let tripDist=document.getElementById("tripdist").innerHTML;
let tripTime=document.getElementById("triptime").innerHTML;
let tripsTime=document.getElementById("tripstime").innerHTML;
if(curTrack==data.Trip){
if(tripSpeed!=data.TSpeed || tripDist != data.TDist || tripTime!=data.TTime ||tripsTime!=data.TsTime){
console.log("Refresh Trip "+data.Trip);
changeTrip(data.Trip);
}
} }
ping++; ping = 1;
document.getElementById("counter").innerHTML = data.counter+";"+data.counter2; };
document.getElementById("currenttime").innerHTML = data.Time; ws.onclose = function() {
document.getElementById("currenttrack").innerHTML = data.Trip; // alert("WS Connection Closed");
document.getElementById("tripspeed").innerHTML = data.TSpeed; const date = new Date();
document.getElementById("tripdist").innerHTML = data.TDist; console.log(date.toLocaleTimeString()+";WS Connection Closed");
document.getElementById("triptime").innerHTML = data.TTime; if(!document.getElementById("mainTime").classList.contains("bg-danger")){
document.getElementById("tripstime").innerHTML = data.TsTime; document.getElementById("mainTime").classList.add("bg-danger")
document.getElementById("currentspeed").innerHTML = data.curSpeed; }
document.getElementById("dir1").innerHTML = data.dir1; ping = -1;
document.getElementById("dir2").innerHTML = data.dir2; wsStartTimer();
document.getElementById("odo1").innerHTML = data.curDist1; };
document.getElementById("odo2").innerHTML = data.curDist2; ws.onerror = function(err) {
document.getElementById("time1").innerHTML = data.time1; const date = new Date();
document.getElementById("time2").innerHTML = data.time2; console.error(date.toLocaleTimeString()+';Socket encountered error: ', err.message, 'Closing socket');
document.getElementById("tdiff1").innerHTML = data.TDiff; ws.close();
document.getElementById("tdiff2").innerHTML = data.TDiff; };
// } ws.onmessage = function(event) {
}; // console.log(event.data);
} let data = JSON.parse(event.data);
setInterval(checkPing, 1000); //heartbeat // if (data.hasOwnProperty("ping")) {
// console.log("with ping key");
// ping++;
// } else{
let curTrack=document.getElementById("currenttrack").innerHTML;
let tripSpeed=document.getElementById("tripspeed").innerHTML;
let tripDist=document.getElementById("tripdist").innerHTML;
let tripTime=document.getElementById("triptime").innerHTML;
let tripsTime=document.getElementById("tripstime").innerHTML;
if(curTrack==data.Trip){
if(tripSpeed!=data.TSpeed || tripDist != data.TDist || tripTime!=data.TTime ||tripsTime!=data.TsTime){
console.log("Refresh Trip "+data.Trip);
changeTrip(data.Trip);
}
}
ping++;
document.getElementById("counter").innerHTML = data.counter+";"+data.counter2;
document.getElementById("currenttime").innerHTML = data.Time;
document.getElementById("currenttrack").innerHTML = data.Trip;
document.getElementById("tripspeed").innerHTML = data.TSpeed;
document.getElementById("tripdist").innerHTML = data.TDist;
document.getElementById("triptime").innerHTML = data.TTime;
document.getElementById("tripstime").innerHTML = data.TsTime;
document.getElementById("currentspeed").innerHTML = data.curSpeed;
document.getElementById("dir1").innerHTML = data.dir1;
document.getElementById("dir2").innerHTML = data.dir2;
document.getElementById("odo1").innerHTML = data.curDist1;
document.getElementById("odo2").innerHTML = data.curDist2;
document.getElementById("time1").innerHTML = data.time1;
document.getElementById("time2").innerHTML = data.time2;
document.getElementById("tdiff1").innerHTML = data.TDiff;
document.getElementById("tdiff2").innerHTML = data.TDiff;
// }
};
}
const checkhealt = setInterval(checkPing, 1000); //heartbeat
function checkPing(){ function checkPing(){
// console.log("ping="+ping); // const date = new Date();
// console.log(date.toLocaleTimeString()+";ping="+ping);
ping--; ping--;
if (ping>=0){ if (ping>=0){
ping=0; ping=0;
@ -81,15 +115,17 @@ const char HTML_startrally[] PROGMEM = R"rawliteral(
if(!document.getElementById("mainTime").classList.contains("bg-danger")){ if(!document.getElementById("mainTime").classList.contains("bg-danger")){
document.getElementById("mainTime").classList.add("bg-danger") document.getElementById("mainTime").classList.add("bg-danger")
} }
} }
} }
function onlyNumberKey(evt,e) { function onlyNumberKey(evt,e) {
// Only ASCII character in that range allowed // Only ASCII character in that range allowed
var ASCIICode = (evt.which) ? evt.which : evt.keyCode var ASCIICode = (evt.which) ? evt.which : evt.keyCode
if (ASCIICode > 31 && (ASCIICode < 48 || ASCIICode > 57) && ASCIICode !=46) if (ASCIICode > 31 && (ASCIICode < 48 || ASCIICode > 57) && ASCIICode !=46)
return false; return false;
return true; return true;
} }
</script> </script>
</head><body onload="loaded();"> </head><body onload="loaded();">
<!-- <!--

20
src/main.cpp
View File

@ -4321,23 +4321,33 @@ void loop() //loop from VSS RALLY V2
// Serial.print("calculationRallyTime=");Serial.println(micros()-broadcastwebsocket); // Serial.print("calculationRallyTime=");Serial.println(micros()-broadcastwebsocket);
iscalculatingRally=false; iscalculatingRally=false;
// Serial.println(strRallyJson); // Serial.println(strRallyJson);
ws.textAll(strRallyJson); if (strRallyJson){
ws.textAll(strRallyJson);
} else {
Serial.print("strRallyJson error:");Serial.println(strRallyJson);
}
// Serial.print("calculationRallyToTTime=");Serial.println(micros()-broadcastwebsocket); // Serial.print("calculationRallyToTTime=");Serial.println(micros()-broadcastwebsocket);
broadcastwebsocket = millis(); broadcastwebsocket = millis();
} }
if ((millis()-timerWebsocketCalibration) > 499 && !isloadingConst && gHasCalibClient) { if ((millis()-timerWebsocketCalibration) > 499 && !isloadingConst && gHasCalibClient) {
timerWebsocketCalibration = millis(); timerWebsocketCalibration = millis();
// if (gHasCalibClient) { redrawcalibrationMenuForESP32();
redrawcalibrationMenuForESP32(); if (strCalibJson){
wscal.textAll(strCalibJson); wscal.textAll(strCalibJson);
// } } else {
Serial.print("strCalibJson error:");Serial.println(strCalibJson);
}
} }
if ((millis()-timerWebsocketSetTime) > 450 && gHasSetTimeClient) { if ((millis()-timerWebsocketSetTime) > 450 && gHasSetTimeClient) {
timerWebsocketSetTime = millis(); timerWebsocketSetTime = millis();
fillSetTimeJsonForESP32(); fillSetTimeJsonForESP32();
wssettime.textAll(strSetTimeJson); if (strSetTimeJson){
wssettime.textAll(strSetTimeJson);
} else {
Serial.print("strSetTimeJson error:");Serial.println(strSetTimeJson);
}
} }
if ((millis()-timerDS3231Get) > 500 && (gHasCalibClient || gHasRallyClient || gHasSetTimeClient || gHasLcdClient)) { if ((millis()-timerDS3231Get) > 500 && (gHasCalibClient || gHasRallyClient || gHasSetTimeClient || gHasLcdClient)) {