Browse files

Fixed type and updated wrapper

  • Loading branch information...
1 parent 0e3e84b commit c978c64fc5b962161164f161416fbfd4d36be8d9 @bmcdorman bmcdorman committed Jul 28, 2011
Showing with 3 additions and 7 deletions.
  1. +2 −6 userlib/libcbc/src/cbc2cxx.h
  2. +1 −1 userlib/libcbc/src/create.h
View
8 userlib/libcbc/src/cbc2cxx.h
@@ -158,18 +158,16 @@ namespace Vision {
};
struct Camera {
- Camera() : m_channels((Channel[4]) { Channel(0), Channel(1), Channel(2), Channel(3) }) { init(); }
+ Camera() : m_channels((Channel[4]) { Channel(0), Channel(1), Channel(2), Channel(3) }) {}
- int update() { return track_update(); }
+ void update() { track_update(); }
int getFrame() { return track_get_frame(); }
int getTimeSinceCapture() { return track_capture_time(); }
Channel& getChannel(int ch) { return m_channels[ch]; }
private:
- int init() { return init_camera(); }
-
Channel m_channels[4];
};
}
@@ -346,12 +344,10 @@ struct Create {
CreateSensor::PlayButton getPlayButton(float lag = 0.1) const { return CreateSensor::PlayButton(lag); }
int getDistance(float lag = 0.1) { return get_create_distance(lag); }
- int getIncrementalDistance(float lag = 0.1) { return get_create_incremental_distance(lag); }
void setDistance(int dist) { set_create_distance(dist); }
int getNormalizedAngle(float lag = 0.1) { return get_create_normalized_angle(lag); }
int getTotalAngle(float lag = 0.1) { return get_create_total_angle(lag); }
- int getIncrementalAngle(float lag = 0.1) { return get_create_incremental_angle(lag); }
void setNormalizedAngle(int a) { set_create_normalized_angle(a); }
void setTotalAngle(int a) { set_create_total_angle(a); }
View
2 userlib/libcbc/src/create.h
@@ -156,7 +156,7 @@ int get_create_song_playing(float lag);
int get_create_number_of_stream_packets(float lag);
int get_create_requested_velocity(float lag);
int get_create_requested_radius(float lag);
-int get_create_requested__right_velocity(float lag);
+int get_create_requested_right_velocity(float lag);
int get_create_requested_left_velocity(float lag);
void create_stop();
void create_drive (int speed, int radius);

0 comments on commit c978c64

Please sign in to comment.