iceflower/speed-dreams-code
1
0
Fork 0
forked from speed-dreams/speed-dreams-code
Code Pull requests Activity

- added mpa12-murasama by Julien

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

Former-commit-id: faa808355a31cdaa5dea2e8acffe647a881dcaed
Former-commit-id: ee04e1e3ab72607b13073e90c4eec08b978e6446
This commit is contained in:
torcs-ng 2015-07-26 20:08:43 +00:00
parent bd1d82458f
commit 2a55e3d434
4 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/drivers/shadow/CMakeLists.txt
View file

@ -69,7 +69,7 @@ SET(ROBOT_SOURCES src/Array.h
# Official-only shadow instances. # Official-only shadow instances.
SET(ROBOT_CLONES shadow_36GP shadow_sc shadow_srw shadow_trb1 shadow_ls1 shadow_ls2 shadow_mp5 SET(ROBOT_CLONES shadow_36GP shadow_sc shadow_srw shadow_trb1 shadow_ls1 shadow_ls2 shadow_mp5
shadow_mpa1 shadow_mpa11 shadow_lp1 shadow_ref) shadow_mpa1 shadow_mpa11 shadow_mpa12 shadow_lp1 shadow_ref)
# The ubiquitous robot module and its clones. # The ubiquitous robot module and its clones.
ROBOT_MODULE(NAME ${ROBOT_NAME} VERSION 3.3.0 SOVERSION 1.0.0 ROBOT_MODULE(NAME ${ROBOT_NAME} VERSION 3.3.0 SOVERSION 1.0.0

5
src/drivers/shadow/src/Driver.cpp
View file

@ -252,6 +252,11 @@ TDriver::TDriver(int Index, const int robot_type):
robot_name = "shadow_mpa11"; robot_name = "shadow_mpa11";
Frc = 0.88; Frc = 0.88;
break; break;
case SHADOW_MPA12:
robot_name = "shadow_mpa12";
Frc = 0.88;
break;
} }
for( int i = 0; i < 50; i++ ) for( int i = 0; i < 50; i++ )

2
src/drivers/shadow/src/Driver.h
View file

@ -113,7 +113,7 @@ static const int MAXNBBOTS = MAX_NBBOTS; // Number of drivers/robots
static const int BUFSIZE = 256; static const int BUFSIZE = 256;
enum { SHADOW_TRB1=1, SHADOW_SC, SHADOW_SRW, SHADOW_LS1, SHADOW_LS2, SHADOW_36GP, enum { SHADOW_TRB1=1, SHADOW_SC, SHADOW_SRW, SHADOW_LS1, SHADOW_LS2, SHADOW_36GP,
SHADOW_RS, SHADOW_LP1, SHADOW_MPA1, SHADOW_MPA11 }; SHADOW_RS, SHADOW_LP1, SHADOW_MPA1, SHADOW_MPA11, SHADOW_MPA12 };
class TDriver class TDriver
{ {

26
src/drivers/shadow/src/Shadow.cpp
View file

@ -205,13 +205,20 @@ void SetupSHADOW_mpa1()
robot_type = SHADOW_MPA1; robot_type = SHADOW_MPA1;
}; };
// Schismatic init for shadow_mpa1 // Schismatic init for shadow_mpa11
void SetupSHADOW_mpa11() void SetupSHADOW_mpa11()
{ {
// Add shadow_mpa1 specific initialization here // Add shadow_mpa1 specific initialization here
robot_type = SHADOW_MPA11; robot_type = SHADOW_MPA11;
}; };
// Schismatic init for shadow_mpa12
void SetupSHADOW_mpa12()
{
// Add shadow_mpa1 specific initialization here
robot_type = SHADOW_MPA12;
};
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Carset specific entry points (functions) // Carset specific entry points (functions)
@ -323,6 +330,21 @@ extern "C" int shadow_mpa11(tModInfo *ModInfo)
return ret; return ret;
} }
// Schismatic entry point for shadow_mpa12
extern "C" int shadow_mpa12(tModInfo *ModInfo)
{
int ret = -1;
setRobotName("shadow_mpa12");
robot_type = SHADOW_MPA12;
void *robot_settings = getFileHandle();
if (robot_settings)
{
ret = shadow(ModInfo);
}
return ret;
}
// Schismatic entry point for shadow_36GP // Schismatic entry point for shadow_36GP
extern "C" int shadow_36GP(tModInfo *ModInfo) extern "C" int shadow_36GP(tModInfo *ModInfo)
{ {
@ -469,6 +491,8 @@ extern "C" int moduleWelcome(const tModWelcomeIn* welcomeIn,
SetupSHADOW_mpa1(); SetupSHADOW_mpa1();
else if (strncmp(robot_name,"shadow_mpa11", strlen("shadow_mpa11")) == 0) else if (strncmp(robot_name,"shadow_mpa11", strlen("shadow_mpa11")) == 0)
SetupSHADOW_mpa11(); SetupSHADOW_mpa11();
else if (strncmp(robot_name,"shadow_mpa12", strlen("shadow_mpa12")) == 0)
SetupSHADOW_mpa12();
// Set max nb of interfaces to return. // Set max nb of interfaces to return.