Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fixed gripper bug reported by Pante a

  • Loading branch information...
commit 1fdc189b2a0b885e387c0700f3d83648ed2e0884 1 parent a522d66
rtv authored
View
1  examples/ctrl/CMakeLists.txt
@@ -5,6 +5,7 @@ SET( PLUGINS
sink
source
wander
+ justATest
)
View
4 libstage/model_gripper.cc
@@ -257,7 +257,7 @@ void ModelGripper::Update()
}
// // move the paddles
- if( cfg.paddles == PADDLE_OPENING && !cfg.paddles_stalled )
+ if( cfg.paddles == PADDLE_OPENING )// && !cfg.paddles_stalled )
{
cfg.paddle_position -= 0.05;
@@ -281,7 +281,7 @@ void ModelGripper::Update()
}
}
- else if( cfg.paddles == PADDLE_CLOSING && !cfg.paddles_stalled )
+ else if( cfg.paddles == PADDLE_CLOSING ) //&& !cfg.paddles_stalled )
{
cfg.paddle_position += 0.05;
//printf( "paddle position %.2f\n", cfg.paddle_position );
View
33 libstage/option.cc
@@ -6,20 +6,27 @@
using namespace Stg;
-Option::Option( std::string n, std::string tok, std::string key, bool v, World* world ) :
-optName( n ),
-value( v ),
-wf_token( tok ),
-shortcut( key ),
-menu( NULL ),
-menuCb( NULL ),
-_world( world ),
-htname( strdup(n.c_str()) )
-{ }
+Option::Option( std::string n,
+ std::string tok,
+ std::string key,
+ bool v,
+ World* world ) :
+ optName( n ),
+ value( v ),
+ wf_token( tok ),
+ shortcut( key ),
+ menu( NULL ),
+ menuCb( NULL ),
+ _world( world ),
+ htname( strdup(n.c_str()) )
+{
+ /* do nothing */
+}
-Fl_Menu_Item* getMenuItem( Fl_Menu_* menu, int i ) {
- const Fl_Menu_Item* mArr = menu->menu();
- return const_cast<Fl_Menu_Item*>( &mArr[ i ] );
+Fl_Menu_Item* getMenuItem( Fl_Menu_* menu, int i )
+{
+ const Fl_Menu_Item* mArr = menu->menu();
+ return const_cast<Fl_Menu_Item*>( &mArr[ i ] );
}
Please sign in to comment.
Something went wrong with that request. Please try again.