Move USR_36GP under the new USR scheme.

Fixes #51.

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

Former-commit-id: 288af435a8d34bc957311352f191cb03593d4fbb
Former-commit-id: bfcc91e5547739af02b81a3df79b90d5f978be41

src/drivers/CMakeLists.txt

@@ -5,10 +5,6 @@ ADD_SUBDIRECTORY(human)
 ADD_SUBDIRECTORY(networkhuman)
 ADD_SUBDIRECTORY(kilo2008)
 ADD_SUBDIRECTORY(simplix)
-#ADD_SUBDIRECTORY(usr_36GP)
-#ADD_SUBDIRECTORY(usr_ls1)
-#ADD_SUBDIRECTORY(usr_sc)
-#ADD_SUBDIRECTORY(usr_trb1)
 ADD_SUBDIRECTORY(usr)
 
 # Work-in-progress / unofficial robots.

src/drivers/usr/CMakeLists.txt

@@ -7,6 +7,7 @@ SET(ROBOT_INTERFACE LEGACY WELCOME
                     usr_trb1
                     usr_sc
                     usr_ls1
+                    usr_36GP
                     )
 
 SET(ROBOT_SOURCES
@@ -30,7 +31,7 @@ SET(ROBOT_SOURCES
   src/xmldefs.h)
 
 # Official-only USR instances.
-SET(ROBOT_CLONES usr_trb1 usr_sc usr_ls1)
+SET(ROBOT_CLONES usr_trb1 usr_sc usr_ls1 usr_36GP)
 
 ROBOT_MODULE(NAME ${ROBOT_NAME}
               INTERFACE ${ROBOT_INTERFACE} 
@@ -85,3 +86,16 @@ ROBOT_DATA(NAME usr_ls1 PREFIX usr_ls1
            FILES usr_ls1.xml default.xml logo.rgb readme.txt
            SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png)
 
+###################
+# USR_36GP
+###################
+SET(ROBOT_SUBDIRS 1 2 3 4 5 6 7 8 9 10 11 12
+                  36gp-ettore-t59 36gp-milano-12c36 36gp-milano-tipop3
+                  36gp-motorunion-typec 36gp-tridenti-6c34
+                  36gp-tridenti-v8ri
+                  tracks)
+
+ROBOT_DATA(NAME usr_36GP PREFIX usr_36GP
+           FILES usr_36GP.xml default.xml logo.rgb readme.txt
+           SUBDIRS ${ROBOT_SUBDIRS} PATTERNS *.xml logo.rgb *.png)
+

src/drivers/usr/src/driver.cpp

@@ -215,6 +215,10 @@ Driver::Driver(int index, const int robot_type) :
     case USR_LS1:
       robot_name = "usr_ls1";
       break;
+
+    case USR_36GP:
+      robot_name = "usr_36GP";
+      break;
   }
 }
 

src/drivers/usr/src/driver.h

@@ -49,7 +49,7 @@ class AbstractStrategy;
 enum { TEAM_FRIEND=1, TEAM_FOE };
 enum { avoidleft=1, avoidright=2, avoidside=4, avoidsideclosing=8, avoidback=16 };
 enum { debug_steer=1, debug_overtake=2, debug_brake=4 };
-enum { USR_TRB1=1, USR_SC, USR_LS1 };
+enum { USR_TRB1=1, USR_SC, USR_LS1, USR_36GP };
 
 class Driver {
 	public:

src/drivers/usr/src/usr.cpp

@@ -152,6 +152,13 @@ void SetupUSR_ls1() {
 };
 
 
+// Schismatic init for usr_36GP
+void SetupUSR_36GP() {
+  // Add usr_36GP specific initialization here
+  robot_type = USR_36GP;
+};
+
+
 ////////////////////////////////////////////////////////////
 // Carset specific entry points (functions)
 ////////////////////////////////////////////////////////////
@@ -198,6 +205,20 @@ extern "C" int usr_ls1(tModInfo *ModInfo) {
 }
 
 
+// Schismatic entry point for usr_36GP
+extern "C" int usr_36GP(tModInfo *ModInfo) {
+  int ret = -1;
+  setRobotName("usr_36GP");
+  robot_type = USR_36GP;
+  void *robot_settings = getFileHandle();
+  if (robot_settings) {
+    ret = usr(ModInfo);
+  }
+  
+  return ret;
+}
+
+
 ////////////////////////////////////////////////////////////
 // General entry point (new scheme)
 ////////////////////////////////////////////////////////////
@@ -266,6 +287,8 @@ extern "C" int moduleWelcome(const tModWelcomeIn* welcomeIn,
 		SetupUSR_sc();
   else if (strncmp(robot_name,"usr_ls1", strlen("usr_ls1")) == 0)
 		SetupUSR_ls1();
+  else if (strncmp(robot_name,"usr_36GP", strlen("usr_36GP")) == 0)
+		SetupUSR_36GP();
 
   // Set max nb of interfaces to return.
   welcomeOut->maxNbItf = NBBOTS;