diff --git a/backup/startrally1.html b/backup/startrally1.html index 5ec26a6..73fd221 100644 --- a/backup/startrally1.html +++ b/backup/startrally1.html @@ -1,302 +1,349 @@ - Rally TerraTrip v1 - - - - - - - -
-
-
12345
-

Time: 00:00:00

-

123.4Km/h

-
-
-
-
-
- - -
-
-
S:123.45Km | V:123.4Km/h | T: 123Min
- -
sTime: 12:34:50
- -
-
- -
-

OD 1->

-

123.4567 km

-

DIRECT

-

00:00:00

-
-
-

- -

-
-

- - -

-
-

-
- -

-
-
-
- -
-

OD 2->123.456 km

-

DIRECT

-

00:00:00

-
-
-
- -
-
-
- - -
-
-

-
- -
-

-
- -
- - - - - - +
+
+
12345
+

Time: 00:00:00

+

123.4Km/h

+
+
+
+
+
+ + +
+
+
S: 123.45Km | V: 123.4Km/h | T: 123Min
+ +
ST: 12:34:50
+
+
+ +
+

OD 1->

+

123.4567 km

+

DIRECT

+

TDiff:

+

00:00:00

+
+
+

+ + +

+
+

+ + +

+
+

+
+ +

+
+
+ + +
+

OD 2->123.456 km

+

DIRECT

+

TDiff:

+

00:00:00

+
+
+
+ + +
+
+
+ + +
+
+

+
+ +
+

+
+ +
+ + + + + - \ No newline at end of file + + \ No newline at end of file diff --git a/src/index.h b/src/index.h index 836f3bf..0e829c8 100644 --- a/src/index.h +++ b/src/index.h @@ -1,312 +1,310 @@ const char HTML_startrally1[] PROGMEM = R"rawliteral( - Rally TerraTrip v1 - - - - - - - -
-
-
12345
-

Time: 00:00:00

-

123.4Km/h

-
-
-
-
-
- - -
-
-
S: 123.45Km | V: 123.4Km/h | T: 123Min
- -
ST: 12:34:50
-
-
- -
-

OD 1->

-

123.4567 km

-

DIRECT

-

TDiff:

-

00:00:00

-
-
-

- -

-
-

- - -

-
-

-
- -

-
-
- - -
-

OD 2->123.456 km

-

DIRECT

-

TDiff:

-

00:00:00

-
-
-
- -
-
-
- - -
-
-

-
- -
-

-
- -
- - - - - - +
+
+
12345
+

Time: 00:00:00

+

123.4Km/h

+
+
+
+
+
+ + +
+
+
S: 123.45Km | V: 123.4Km/h | T: 123Min
+ +
ST: 12:34:50
+
+
+ +
+

OD 1->

+

123.4567 km

+

DIRECT

+

TDiff:

+

00:00:00

+
+
+

+ + +

+
+

+ + +

+
+

+
+ +

+
+
+ + +
+

OD 2->123.456 km

+

DIRECT

+

TDiff:

+

00:00:00

+
+
+
+ + +
+
+
+ + +
+
+

+
+ +
+

+
+ +
+ + + + + - + + )rawliteral"; //HTML_CALIBRATION diff --git a/src/main.cpp b/src/main.cpp index 20e7790..6fb8bf7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1385,7 +1385,7 @@ void redrawcalibrationMenu() // } } // Declaration for calculationRally Variable - char gcur_speed_str[6]; + char gcur_speed_str[7]; char gcur_distance1_str[7]; char gcur_distance2_str[7]; char gcur_time1_str[12]; @@ -3832,7 +3832,7 @@ void loop() //loop from VSS RALLY V2 iscalculatingRally=true; // redrawrallyMenu(); //Distance is edited? // calculationRally(); - Serial.println(millis()-testLoadTime); + // Serial.println(millis()-testLoadTime); fillRallyLCDScreen(); iscalculatingRally=false; } @@ -3913,7 +3913,8 @@ void loop() //loop from VSS RALLY V2 else if (VSSCountDiff <= 600) gVSSCountDiff='6';//lcd.print("6"); else if (VSSCountDiff <= 900) gVSSCountDiff='7';//lcd.print("7"); else if (VSSCountDiff <= 1200) gVSSCountDiff='8';//lcd.print("8"); - else if (VSSCountDiff > 1200) gVSSCountDiff='9';//lcd.print("9"); + else if (VSSCountDiff <= 1500) gVSSCountDiff='9';//lcd.print("9"); + else if (VSSCountDiff > 1500) gVSSCountDiff='>';//lcd.print("9"); //lcd.print(VSSCountDiff); //lcd.print(" "); @@ -3952,16 +3953,17 @@ void loop() //loop from VSS RALLY V2 prevCalculatingRallyMillis=now1; } - if ((millis()-broadcastwebsocket) > 333 && !isloadingConst && globalClientRally) { - broadcastwebsocket = millis(); + if ((millis()-broadcastwebsocket) > 330 && !isloadingConst && globalClientRally) { + broadcastwebsocket = micros(); iscalculatingRally=true; - // calculationRally(); - Serial.print("calculationRallyTime=");Serial.println(millis()-broadcastwebsocket); + // calculationRally(); fillRallyJsonWithData(); + // Serial.print("calculationRallyTime=");Serial.println(micros()-broadcastwebsocket); iscalculatingRally=false; // Serial.println(getRallyJson); ws.textAll(getRallyJson); - Serial.print("calculationRallyToTTime=");Serial.println(millis()-broadcastwebsocket); + // Serial.print("calculationRallyToTTime=");Serial.println(micros()-broadcastwebsocket); + broadcastwebsocket = millis(); } if ((millis()-broadcastwebsocketcalib) > 499 && !isloadingConst && globalClientCalib) {