speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
7
1
Fork 3
Code Issues 8 Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fixes #952: remove isnan/isinf checks for car->ctrl->gear

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6405 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 444c4ecb4f78c31cf0749721ee8ec7092668bee6
Former-commit-id: c9d486b70bcfe595cf3b3b1526bc88af4a3e6119
This commit is contained in:
kakukri 2016-05-08 23:28:48 +00:00
parent 1ec00621b2
commit 5c64ce2e8a
4 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/modules/simu/simuv2.1/simu.cpp
View file

@ -61,13 +61,11 @@ ctrlCheck(tCar *car)
if (isnan(car->ctrl->brakeCmd) || isinf(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
if (isnan(car->ctrl->clutchCmd) || isinf(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0;
if (isnan(car->ctrl->steer) || isinf(car->ctrl->steer)) car->ctrl->steer = 0;
if (isnan(car->ctrl->gear) || isinf(car->ctrl->gear)) car->ctrl->gear = 0;
#else
if (isnan(car->ctrl->accelCmd)) car->ctrl->accelCmd = 0;
if (isnan(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
if (isnan(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0;
if (isnan(car->ctrl->steer)) car->ctrl->steer = 0;
if (isnan(car->ctrl->gear)) car->ctrl->gear = 0;
#endif
/* When the car is broken try to send it on the track side */

2
src/modules/simu/simuv2/simu.cpp
View file

@ -61,13 +61,11 @@ ctrlCheck(tCar *car)
if (isnan(car->ctrl->brakeCmd) || isinf(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
if (isnan(car->ctrl->clutchCmd) || isinf(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0;
if (isnan(car->ctrl->steer) || isinf(car->ctrl->steer)) car->ctrl->steer = 0;
if (isnan(car->ctrl->gear) || isinf(car->ctrl->gear)) car->ctrl->gear = 0;
#else
if (isnan(car->ctrl->accelCmd)) car->ctrl->accelCmd = 0;
if (isnan(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
if (isnan(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0;
if (isnan(car->ctrl->steer)) car->ctrl->steer = 0;
if (isnan(car->ctrl->gear)) car->ctrl->gear = 0;
#endif
/* When the car is broken try to send it on the track side */

2
src/modules/simu/simuv3/simu.cpp
View file

@ -79,13 +79,11 @@ ctrlCheck(tCar *car)
if (isnan(car->ctrl->brakeCmd) || isinf(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
if (isnan(car->ctrl->clutchCmd) || isinf(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0;
if (isnan(car->ctrl->steer) || isinf(car->ctrl->steer)) car->ctrl->steer = 0;
if (isnan(car->ctrl->gear) || isinf(car->ctrl->gear)) car->ctrl->gear = 0;
#else
if (isnan(car->ctrl->accelCmd)) car->ctrl->accelCmd = 0;
if (isnan(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
if (isnan(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0;
if (isnan(car->ctrl->steer)) car->ctrl->steer = 0;
if (isnan(car->ctrl->gear)) car->ctrl->gear = 0;
#endif
/* When the car is broken try to send it on the track side */

2
src/modules/simu/simuv4/simu.cpp
View file

@ -61,7 +61,6 @@ ctrlCheck(tCar *car)
if (isnan(car->ctrl->brakeCmd) || isinf(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
if (isnan(car->ctrl->clutchCmd) || isinf(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0;
if (isnan(car->ctrl->steer) || isinf(car->ctrl->steer)) car->ctrl->steer = 0;
if (isnan(car->ctrl->gear) || isinf(car->ctrl->gear)) car->ctrl->gear = 0;
if (isnan(car->ctrl->wingFrontCmd) || isinf(car->ctrl->wingFrontCmd)) car->ctrl->wingFrontCmd = 0;
if (isnan(car->ctrl->wingRearCmd) || isinf(car->ctrl->wingRearCmd)) car->ctrl->wingRearCmd = 0;
if (isnan(car->ctrl->brakeFrontLeftCmd) || isinf(car->ctrl->brakeFrontLeftCmd)) car->ctrl->brakeFrontLeftCmd = 0;
@ -73,7 +72,6 @@ ctrlCheck(tCar *car)
if (isnan(car->ctrl->brakeCmd)) car->ctrl->brakeCmd = 0;
if (isnan(car->ctrl->clutchCmd)) car->ctrl->clutchCmd = 0;
if (isnan(car->ctrl->steer)) car->ctrl->steer = 0;
if (isnan(car->ctrl->gear)) car->ctrl->gear = 0;
if (isnan(car->ctrl->wingFrontCmd)) car->ctrl->wingFrontCmd = 0;
if (isnan(car->ctrl->wingRearCmd)) car->ctrl->wingRearCmd = 0;
if (isnan(car->ctrl->brakeFrontLeftCmd)) car->ctrl->brakeFrontLeftCmd = 0;