fix merge

This commit is contained in:
j3d1 2016-10-06 04:06:14 +02:00
parent 34d2c82fd9
commit 654fca9e67

View file

@ -56,6 +56,8 @@ bool Session::parse(std::string s)
} else if (s.size()>=3&&s[0]=='v'&&s[1]==' ') {
//set speed
double speed = atof(s.substr(2).c_str());
if(speed<0)speed=0;
if(speed>3)speed=3;
m_state->setSpeed(m_pid, speed);
} else if (token == "dev") {