diff --git a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/aalborg.xml b/src/drivers/simplix/simplix_ls1/ls1-archer-r9/aalborg.xml
deleted file mode 100644
index 4d828f7f..00000000
--- a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/aalborg.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/allondaz.xml b/src/drivers/simplix/simplix_ls1/ls1-archer-r9/allondaz.xml
deleted file mode 100644
index 758f0457..00000000
--- a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/allondaz.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/alpine-2.xml b/src/drivers/simplix/simplix_ls1/ls1-archer-r9/alpine-2.xml
deleted file mode 100644
index 11e07f99..00000000
--- a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/alpine-2.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/brondehach.xml b/src/drivers/simplix/simplix_ls1/ls1-archer-r9/brondehach.xml
deleted file mode 100644
index 391d6d27..00000000
--- a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/brondehach.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/bueno.xml b/src/drivers/simplix/simplix_ls1/ls1-archer-r9/bueno.xml
deleted file mode 100644
index 36f46665..00000000
--- a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/bueno.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/charmey.xml b/src/drivers/simplix/simplix_ls1/ls1-archer-r9/charmey.xml
deleted file mode 100644
index 427e608f..00000000
--- a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/charmey.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/chemisay.xml b/src/drivers/simplix/simplix_ls1/ls1-archer-r9/chemisay.xml
deleted file mode 100644
index 39a1844f..00000000
--- a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/chemisay.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/corkscrew.xml b/src/drivers/simplix/simplix_ls1/ls1-archer-r9/corkscrew.xml
deleted file mode 100644
index 4799c7ab..00000000
--- a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/corkscrew.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/default.xml b/src/drivers/simplix/simplix_ls1/ls1-archer-r9/default.xml
index cd1b536a..e49c1a31 100644
--- a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/default.xml
+++ b/src/drivers/simplix/simplix_ls1/ls1-archer-r9/default.xml
@@ -2,8 +2,8 @@
-
-
-
-
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
@@ -160,30 +157,31 @@
-
-
+
+
-
-
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
diff --git a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/espie.xml b/src/drivers/simplix/simplix_ls1/ls1-archer-r9/espie.xml
deleted file mode 100644
index 7dc91662..00000000
--- a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/espie.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/forza.xml b/src/drivers/simplix/simplix_ls1/ls1-archer-r9/forza.xml
deleted file mode 100644
index 85239f86..00000000
--- a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/forza.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/goldstone-sand.xml b/src/drivers/simplix/simplix_ls1/ls1-archer-r9/goldstone-sand.xml
deleted file mode 100644
index 19ba6546..00000000
--- a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/goldstone-sand.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/karwada.xml b/src/drivers/simplix/simplix_ls1/ls1-archer-r9/karwada.xml
deleted file mode 100644
index 6ec8c62a..00000000
--- a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/karwada.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/migrants.xml b/src/drivers/simplix/simplix_ls1/ls1-archer-r9/migrants.xml
deleted file mode 100644
index ee65b586..00000000
--- a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/migrants.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/ruudskogen.xml b/src/drivers/simplix/simplix_ls1/ls1-archer-r9/ruudskogen.xml
deleted file mode 100644
index 56acff88..00000000
--- a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/ruudskogen.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/street-1.xml b/src/drivers/simplix/simplix_ls1/ls1-archer-r9/street-1.xml
deleted file mode 100644
index 275f568b..00000000
--- a/src/drivers/simplix/simplix_ls1/ls1-archer-r9/street-1.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/drivers/simplix/src/unitdriver.cpp b/src/drivers/simplix/src/unitdriver.cpp
index 61f95df6..60fda585 100644
--- a/src/drivers/simplix/src/unitdriver.cpp
+++ b/src/drivers/simplix/src/unitdriver.cpp
@@ -238,6 +238,7 @@ TDriver::TDriver(int Index):
oClutchDelta(0.009),
oClutchRange(0.82),
oClutchRelease(0.5),
+ oEarlyShiftFactor(1.0),
oCurrSpeed(0),
// oGearEff,
oExtended(0),
@@ -722,6 +723,11 @@ void TDriver::AdjustDriving(
(float)oClutchRelease);
//GfOut("#oClutchRelease %g\n",oClutchRelease);
+ oEarlyShiftFactor =
+ GfParmGetNum(Handle,TDriver::SECT_PRIV,PRV_EARLY_SHIFT,0,
+ (float)oEarlyShiftFactor);
+ //GfOut("#oEarlyShiftFactor %g\n",oEarlyShiftFactor);
+
oTeamEnabled =
GfParmGetNum(Handle,TDriver::SECT_PRIV,PRV_TEAM_ENABLE,0,
(float)oTeamEnabled) != 0;
@@ -2035,6 +2041,8 @@ void TDriver::Clutching()
{
oClutch = oClutchMax - 0.01;
}
+ else
+ oClutch -= oClutchDelta/10;
}
else
{
@@ -2281,10 +2289,12 @@ void TDriver::InitAdaptiveShiftLevels()
}
}
- if ((TqNext > Tq ) && (Rpm*RpmFactor > 2000))
+ if ((TqNext > oEarlyShiftFactor * Tq ) && (Rpm*RpmFactor > 2000))
{
ToRpm[J] = RpmNext;
oShift[J] = Rpm * 0.98;
+ GfOut("#TqNext > Tq\n");
+ GfOut("#%d/%d: %g(%g) -> %g(%g)\n", J,I, Rpm*RpmFactor,Tq,RpmNext*RpmFactor,TqNext);
break;
}
Rpm += 1;
@@ -2292,9 +2302,10 @@ void TDriver::InitAdaptiveShiftLevels()
}
+ //GfOut("\n#Gear change summary:\n");
//for (J = 1; J < oLastGear; J++)
// GfOut("#%d: Rpm: %g(%g) -> Rpm: %g(%g)\n",
- //J,oShift[J]*RpmFactor,oShift[J],ToRpm[J]*RpmFactor,ToRpm[J]);
+ // J,oShift[J]*RpmFactor,oShift[J],ToRpm[J]*RpmFactor,ToRpm[J]);
free(DataPoints);
free(Edesc);
diff --git a/src/drivers/simplix/src/unitdriver.h b/src/drivers/simplix/src/unitdriver.h
index 09180276..4cf9167c 100644
--- a/src/drivers/simplix/src/unitdriver.h
+++ b/src/drivers/simplix/src/unitdriver.h
@@ -9,7 +9,7 @@
//
// File : unitdriver.h
// Created : 2007.11.25
-// Last changed : 2010.11.04
+// Last changed : 2011.03.06
// Copyright : © 2007-2010 Wolf-Dieter Beelitz
// eMail : wdb@wdbee.de
// Version : 3.00.000
@@ -290,6 +290,7 @@ private:
double oClutchDelta;
double oClutchRange;
double oClutchRelease;
+ double oEarlyShiftFactor;
double oCurrSpeed; // Currend speed
double oGearEff[MAX_GEARS]; // Efficiency of gears
int oExtended; // Information if this robot is extended (oExtended = 1) or not (oExtended = 0).
diff --git a/src/drivers/simplix/src/unitglobal.h b/src/drivers/simplix/src/unitglobal.h
index b6fff80b..9ed7cba1 100644
--- a/src/drivers/simplix/src/unitglobal.h
+++ b/src/drivers/simplix/src/unitglobal.h
@@ -9,7 +9,7 @@
//
// File : unitglobal.cpp
// Created : 2007.11.17
-// Last changed : 2011.02.13
+// Last changed : 2011.03.06
// Copyright : © 2007-2011 Wolf-Dieter Beelitz
// eMail : wdb@wdbee.de
// Version : 3.00.000
@@ -21,17 +21,17 @@
//
// Das Programm wurde unter Windows XP entwickelt und getestet.
// Fehler sind nicht bekannt, dennoch gilt:
-// Wer die Dateien verwendet erkennt an, dass f�r Fehler, Sch�den,
-// Folgefehler oder Folgesch�den keine Haftung �bernommen wird.
+// Wer die Dateien verwendet erkennt an, dass für Fehler, Schäden,
+// Folgefehler oder Folgeschäden keine Haftung übernommen wird.
//--------------------------------------------------------------------------*
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
-// Im �brigen gilt f�r die Nutzung und/oder Weitergabe die
+// Im übrigen gilt für die Nutzung und/oder Weitergabe die
// GNU GPL (General Public License)
-// Version 2 oder nach eigener Wahl eine sp�tere Version.
+// Version 2 oder nach eigener Wahl eine spätere Version.
//--------------------------------------------------------------------------*
#ifndef _UNITGOBAL_H_
#define _UNITGOBAL_H_
@@ -94,7 +94,7 @@
// Racing line version marker
// (Increment if racinglines needs to be recalculated)
//--------------------------------------------------------------------------*
-#define RL_VERSION 115
+#define RL_VERSION 116
//==========================================================================*
//==========================================================================*
@@ -485,6 +485,7 @@ enum
#define PRV_CLUTCH_DELTA "clutch delta" // default 0.05
#define PRV_CLUTCH_RANGE "clutch range" // default 0.82
#define PRV_CLUTCH_RELEASE "clutch release" // default 0.4
+#define PRV_EARLY_SHIFT "early shift" // default 1.0
#define PRV_TEAM_ENABLE "team enable" // default 1