diff --git a/Control/data/index.html b/Control/data/index.html index aa07511..2e9db40 100644 --- a/Control/data/index.html +++ b/Control/data/index.html @@ -256,11 +256,11 @@ var data = JSON.parse(raw_data); state = data.st; - batteryLevel = data.bV; + batteryLevel = data.bL; batteryVoltage = data.bV; batteryCycles = data.bC; totalTripDistance = data.tD; - currentHeading = data.cH + 180; + currentHeading = 180 - data.cH; current_pos = data.pos; current_x = current_pos[0]; current_y = current_pos[1]; @@ -349,7 +349,7 @@ function moveCmd(dist,hdg,spd){ mode = 1; reqDistance = dist; - reqHeading = hdg; + reqHeading = 360 - hdg; reqSpeed = spd; reqCharge = 0; pstop_time = 0; diff --git a/Control/src/main.cpp b/Control/src/main.cpp index 7780ed1..a799f4f 100644 --- a/Control/src/main.cpp +++ b/Control/src/main.cpp @@ -410,7 +410,8 @@ void sendToCommand() tdoc["bV"] = batteryVoltage; tdoc["bL"] = 100; // tdoc["bL"] = batteryLevel; Hardcoded value as Energy is not present on demo Rover time(&now); - tdoc["bC"] = (now - 1623750000)/21600; // tdoc["bC"] = batteryCycles; Estimates cycles in number of 6 hour periods + // Serial.println(now); + tdoc["bC"] = ((float)now - 1623000000.0)/21600.0; // tdoc["bC"] = batteryCycles; Estimates cycles in number of 6 hour periods tdoc["tD"] = odometer; tdoc["cH"] = heading; tdoc["pos"][0] = xpos;