Browse Source

Adjust telegramm

master
Tim Zeuner 1 year ago
parent
commit
60e19a8968
1 changed files with 18 additions and 16 deletions
  1. 18
    16
      lfr_state_machine.cpp

+ 18
- 16
lfr_state_machine.cpp View File

@@ -25,25 +25,27 @@ void LFR_StateMachine::sanitize (string& s) const

bool LFR_StateMachine::checkStringValidity (const std::vector<std::string>& s) const
{
if(s.size() != 5)
{
return false;
}

try
{
for(int i = 0; i < 4; i ++)
int i = stoi(s[0]);
if(i == 0 && s.size() == 5)
{
if(stod(s[i]) > 1.0 || stod(s[i]) < -1.0)
for(int i = 0; i < 4; i ++)
{
return false;
if(stod(s[i]) > 1.0 || stod(s[i]) < -1.0)
{
return false;
}
}
}
int i = stoi(s[4]);
if(i != 0 && i != 1)
else if(i == 1)
{
return false;
return true;
}
else
{
return false;
}
}
catch(const std::exception& e) {return false;}
return true;
@@ -59,12 +61,12 @@ void LFR_StateMachine::parseString(string s)
return;
}
double wheels[4] = {0.0, 0.0, 0.0, 0.0};
int mode = std::stoi(splitStr[4]);
for(int i = 0; i < 3; i++)
{
wheels[i] = std::stod(splitStr[i]);
}
int mode = std::stoi(splitStr[0]);
if(mode == 0) {
for(int i = 1; i < 4; i++)
{
wheels[i] = std::stod(splitStr[i]);
}
setState(State::Manual::getInstance());
uartCommunicator.sendTelegram(wheels[0], wheels[1], wheels[2], wheels[3]);
}

Loading…
Cancel
Save