|
 |
5dafa4a |
diff -Naur sicktoolbox-1.0.1.orig/c++/drivers/ld/sickld-1.0/SickLD.cc sicktoolbox-1.0.1/c++/drivers/ld/sickld-1.0/SickLD.cc
|
|
|
5dafa4a |
--- sicktoolbox-1.0.1.orig/c++/drivers/ld/sickld-1.0/SickLD.cc 2010-06-30 23:19:02.000000000 +0200
|
|
|
5dafa4a |
+++ sicktoolbox-1.0.1/c++/drivers/ld/sickld-1.0/SickLD.cc 2016-03-18 14:21:44.602788348 +0100
|
|
|
5dafa4a |
@@ -4757,4 +4757,6 @@
|
|
|
5dafa4a |
|
|
|
5dafa4a |
}
|
|
|
5dafa4a |
|
|
|
5dafa4a |
+ const double SickLD::SICK_MAX_SCAN_ANGULAR_RESOLUTION = 0.125; ///< Minimum valid separation between laser pulses in active
|
|
|
5dafa4a |
+ const double SickLD::SICK_DEGREES_PER_MOTOR_STEP = 0.0625; ///< Each odometer tick is equivalent to rotating the scan he
|
|
|
5dafa4a |
} //namespace SickToolbox
|
|
|
5dafa4a |
diff -Naur sicktoolbox-1.0.1.orig/c++/drivers/ld/sickld-1.0/SickLD.hh sicktoolbox-1.0.1/c++/drivers/ld/sickld-1.0/SickLD.hh
|
|
|
5dafa4a |
--- sicktoolbox-1.0.1.orig/c++/drivers/ld/sickld-1.0/SickLD.hh 2010-06-30 23:19:02.000000000 +0200
|
|
|
5dafa4a |
+++ sicktoolbox-1.0.1/c++/drivers/ld/sickld-1.0/SickLD.hh 2016-03-18 14:17:22.270901575 +0100
|
|
|
5dafa4a |
@@ -69,8 +69,8 @@
|
|
|
5dafa4a |
static const uint16_t SICK_MAX_MEAN_PULSE_FREQUENCY = 10800; ///< Max mean pulse frequence of the current device configuration (in Hz) (see page 22 of the operator's manual)
|
|
|
5dafa4a |
static const uint16_t SICK_MAX_PULSE_FREQUENCY = 14400; ///< Max pulse frequency of the device (in Hz) (see page 22 of the operator's manual)
|
|
|
5dafa4a |
static const uint16_t SICK_NUM_TICKS_PER_MOTOR_REV = 5760; ///< Odometer ticks per revolution of the Sick LD scan head
|
|
|
5dafa4a |
- static const double SICK_MAX_SCAN_ANGULAR_RESOLUTION = 0.125; ///< Minimum valid separation between laser pulses in active scan ares (deg)
|
|
|
5dafa4a |
- static const double SICK_DEGREES_PER_MOTOR_STEP = 0.0625; ///< Each odometer tick is equivalent to rotating the scan head this many degrees
|
|
|
5dafa4a |
+ static const double SICK_MAX_SCAN_ANGULAR_RESOLUTION /* = 0.125 */; ///< Minimum valid separation between laser pulses in active scan ares (deg)
|
|
|
5dafa4a |
+ static const double SICK_DEGREES_PER_MOTOR_STEP /* = 0.0625 */; ///< Each odometer tick is equivalent to rotating the scan head this many degrees
|
|
|
5dafa4a |
|
|
|
5dafa4a |
/* Sick LD sensor modes of operation */
|
|
|
5dafa4a |
static const uint8_t SICK_SENSOR_MODE_IDLE = 0x01; ///< The Sick LD is powered but idle
|
|
|
5dafa4a |
diff -Naur sicktoolbox-1.0.1.orig/c++/examples/ld/ld_config/src/main.cc sicktoolbox-1.0.1/c++/examples/ld/ld_config/src/main.cc
|
|
|
5dafa4a |
--- sicktoolbox-1.0.1.orig/c++/examples/ld/ld_config/src/main.cc 2010-06-30 23:25:02.000000000 +0200
|
|
|
5dafa4a |
+++ sicktoolbox-1.0.1/c++/examples/ld/ld_config/src/main.cc 2016-03-18 14:25:45.336849106 +0100
|
|
|
5dafa4a |
@@ -260,7 +260,7 @@
|
|
|
5dafa4a |
config_path = getFilename();
|
|
|
5dafa4a |
|
|
|
5dafa4a |
/* Instantiate the parser */
|
|
|
5dafa4a |
- if(ifstream(config_path.c_str()) != NULL) {
|
|
|
5dafa4a |
+ if(ifstream(config_path.c_str())) {
|
|
|
5dafa4a |
sick_config_file = ConfigFile(config_path);
|
|
|
5dafa4a |
}
|
|
|
5dafa4a |
else {
|