Merge pull request #44 from diegoferigo/feature/CodeGenerationFixes

Code generation fixes
dbdxnuliba · Oct 9, 2018 · 115a1fc · 115a1fc
2 parents 63aef13 + bd01e1d
commit 115a1fc
Show file tree

Hide file tree

Showing 3 changed files with 514 additions and 502 deletions.
diff --git a/cmake/CreateAutogeneratedCodeTargets.cmake.in b/cmake/CreateAutogeneratedCodeTargets.cmake.in
@@ -10,8 +10,13 @@ add_generated_code_lib(MODELNAME ${MDL_NAME})
 # Set the target name for the custom driver
 set(CODER_MAIN "CoderMain_${MDL_NAME}")
 
+configure_file(
+    "${PROJECT_SOURCE_DIR}/src/driver.cpp.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/driver.cpp"
+    @ONLY)
+
 add_executable(${CODER_MAIN}
-    "${CMAKE_SOURCE_DIR}/src/driver.cpp"
+    "${CMAKE_CURRENT_BINARY_DIR}/driver.cpp"
 )
 
 target_link_libraries(${CODER_MAIN} PUBLIC ${MDL_NAME}_LIB)
diff --git a/torque-controllers/momentum-based-yoga/initTorqueBalancingYoga.m b/torque-controllers/momentum-based-yoga/initTorqueBalancingYoga.m
@@ -27,7 +27,7 @@
 % and set the environmental variable YARP_ROBOT_NAME in the .bashrc file.
 
 % Simulation time in seconds
-Config.SIMULATION_TIME = inf;   
+Config.SIMULATION_TIME = 600;
 
 %% PRELIMINARY CONFIGURATIONS 
 % Sm.SM_TYPE: defines the kind of state machines that can be chosen.