Skip to content

Commit 9bb2c68

Browse files
author
Darby Lim
committed
sync turtlebot3_core
1 parent d008b6f commit 9bb2c68

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

arduino/opencr_arduino/opencr/libraries/turtlebot3/examples/turtlebot3_with_open_manipulator/turtlebot3_with_open_manipulator_core/turtlebot3_with_open_manipulator_core.ino

+10-1
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,15 @@ void publishSensorStateMsg(void)
282282
else
283283
return;
284284

285+
sensor_state_msg.bumper = sensors.checkPushBumper();
286+
287+
sensor_state_msg.cliff = sensors.getIRsensorData();
288+
289+
// TODO
290+
// sensor_state_msg.sonar = sensors.getSonarData();
291+
292+
sensor_state_msg.illumination = sensors.getIlluminationData();
293+
285294
sensor_state_msg.button = sensors.checkPushButton();
286295

287296
sensor_state_msg.torque = motor_driver.getTorque();
@@ -761,7 +770,7 @@ void sendDebuglog(void)
761770
DEBUG_SERIAL.println("---------------------------------------");
762771
DEBUG_SERIAL.println("EXTERNAL SENSORS");
763772
DEBUG_SERIAL.println("---------------------------------------");
764-
DEBUG_SERIAL.print("Bumper : "); DEBUG_SERIAL.println(sensors.getPushedBumper());
773+
DEBUG_SERIAL.print("Bumper : "); DEBUG_SERIAL.println(sensors.checkPushBumper());
765774
DEBUG_SERIAL.print("Cliff : "); DEBUG_SERIAL.println(sensors.getIRsensorData());
766775
DEBUG_SERIAL.print("Sonar : "); DEBUG_SERIAL.println(sensors.getSonarData());
767776
DEBUG_SERIAL.print("Illumination : "); DEBUG_SERIAL.println(sensors.getIlluminationData());

arduino/opencr_arduino/opencr/libraries/turtlebot3/examples/turtlebot3_with_open_manipulator/turtlebot3_with_open_manipulator_core/turtlebot3_with_open_manipulator_core_config.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,14 @@
4646

4747
#define HARDWARE_VER "1.0.0"
4848
#define SOFTWARE_VER "1.0.0"
49-
#define FIRMWARE_VER "1.0.1"
49+
#define FIRMWARE_VER "1.2.0"
5050

5151
#define CONTROL_MOTOR_SPEED_FREQUENCY 30 //hz
5252
#define IMU_PUBLISH_FREQUENCY 200 //hz
5353
#define CMD_VEL_PUBLISH_FREQUENCY 30 //hz
5454
#define DRIVE_INFORMATION_PUBLISH_FREQUENCY 30 //hz
5555
#define VERSION_INFORMATION_PUBLISH_FREQUENCY 1 //hz
56-
#define DEBUG_LOG_FREQUENCY 2 //hz
56+
#define DEBUG_LOG_FREQUENCY 10 //hz
5757

5858
#define WHEEL_NUM 2
5959

0 commit comments

Comments
 (0)