supleed2/ELEC50003-P1-CW
1
0
Fork 0
mirror of https://github.com/supleed2/ELEC50003-P1-CW.git synced 2024-11-10 01:35:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Integration' of https://github.com/supleed2/EE2Rover into Integration

Browse source
This commit is contained in:
Mee2001 2021-06-15 03:38:49 +01:00
parent 6f6320e920 72021e7208
commit 1961951de0
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Control/src/main.cpp
View file

@ -195,6 +195,7 @@ void loop()
break; break;
} }
lastExecutedCommand = instr->id; // Update tracker of last processed command lastExecutedCommand = instr->id; // Update tracker of last processed command
InstrQueue.pop();
} }
} }
break; break;
@ -439,10 +440,7 @@ void recvFromCompass()
void emergencyStop() void emergencyStop()
{ {
DynamicJsonDocument tdoc(1024); DynamicJsonDocument tdoc(1024);
tdoc["rH"] = heading; tdoc["stp"] = 1;
tdoc["dist"] = -1;
tdoc["sp"] = -1;
tdoc["cH"] = heading;
serializeJson(tdoc, Serial1); // Send stop signals to Drive serializeJson(tdoc, Serial1); // Send stop signals to Drive
sendToEnergy(0); // Send stop signal to Energy sendToEnergy(0); // Send stop signal to Energy
while (InstrQueue.size()) while (InstrQueue.size())