Skip to content
This repository has been archived by the owner on Jul 4, 2024. It is now read-only.

Commit

Permalink
Merge branch 'pre-release'
Browse files Browse the repository at this point in the history 
Signed-off-by: Christian Berger <christian.berger@gu.se>
  • Loading branch information
@chrberger
chrberger committed Dec 2, 2016
2 parents a443f65 + b17af7d commit db85f0c
Show file tree
Hide file tree
Showing 69 changed files with 507 additions and 5,701 deletions.
1 change: 1 addition & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
0.7.0 - Changing CompactPointCloud from half_float to uint16_t
0.6.0 - Improved CompactPointCloud handling in Velodyne 16, upgraded use-cases to docker-compose 1.9.0
0.5.0 - CompactPointCloud in Velodyne
0.4.0 - Upgraded to newest OD4
Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.6.0
0.7.0
2 changes: 1 addition & 1 deletion code/core/system/health/man/opendlv-core-system-health.1
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" Manpage for opendlv-core-system-health
.\" Author: Christian Berger <christian.berger@gu.se>.

.TH opendlv-core-system-health 1 "29 November 2016" "0.6.0" "opendlv-core-system-health man page"
.TH opendlv-core-system-health 1 "02 December 2016" "0.7.0" "opendlv-core-system-health man page"

.SH NAME
opendlv-core-system-health \- This component checks the health of the runtime environment.
Expand Down
2 changes: 1 addition & 1 deletion code/core/system/proxy-applanix/man/opendlv-core-system-proxy-applanix.1
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" Manpage for opendlv-core-proxy-applanix
.\" Author: Christian Berger <christian.berger@gu.se>.

.TH opendlv-core-proxy-applanix 1 "29 November 2016" "0.6.0" "opendlv-core-proxy-applanix man page"
.TH opendlv-core-proxy-applanix 1 "02 December 2016" "0.7.0" "opendlv-core-proxy-applanix man page"

.SH NAME
opendlv-core-proxy-applanix \- This tool interfaces to GPS/IMU unit Applanix.
Expand Down
2 changes: 1 addition & 1 deletion code/core/system/proxy-camera-axis/man/opendlv-core-system-proxy-camera-axis.1
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" Manpage for opendlv-core-proxy-camera-axis
.\" Author: Christian Berger <christian.berger@gu.se>.

.TH opendlv-core-proxy-camera-axis 1 "29 November 2016" "0.6.0" "opendlv-core-proxy-camera-axis man page"
.TH opendlv-core-proxy-camera-axis 1 "02 December 2016" "0.7.0" "opendlv-core-proxy-camera-axis man page"

.SH NAME
opendlv-core-proxy-camera-axis \- This tool interfaces with Axis cameras.
Expand Down
2 changes: 1 addition & 1 deletion code/core/system/proxy-camera/man/opendlv-core-system-proxy-camera.1
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" Manpage for opendlv-core-proxy-camera
.\" Author: Christian Berger <christian.berger@gu.se>.

.TH opendlv-core-proxy-camera 1 "29 November 2016" "0.6.0" "opendlv-core-proxy-camera man page"
.TH opendlv-core-proxy-camera 1 "02 December 2016" "0.7.0" "opendlv-core-proxy-camera man page"

.SH NAME
opendlv-core-proxy-camera \- This tool interfaces with the FH16 truck.
Expand Down
2 changes: 1 addition & 1 deletion code/core/system/proxy-fh16/man/opendlv-core-system-proxy-fh16.1
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" Manpage for opendlv-core-proxy-fh16truck
.\" Author: Christian Berger <christian.berger@gu.se>.

.TH opendlv-core-proxy-fh16truck 1 "29 November 2016" "0.6.0" "opendlv-core-proxy-fh16truck man page"
.TH opendlv-core-proxy-fh16truck 1 "02 December 2016" "0.7.0" "opendlv-core-proxy-fh16truck man page"

.SH NAME
opendlv-core-proxy-fh16truck \- This tool interfaces with the FH16 truck.
Expand Down
2 changes: 1 addition & 1 deletion code/core/system/proxy-imu/man/opendlv-core-system-proxy-imu.1
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" Manpage for opendlv-core-proxy-imu
.\" Author: Christian Berger <christian.berger@gu.se>.

.TH opendlv-core-proxy-imu 1 "29 November 2016" "0.6.0" "opendlv-core-proxy-imu man page"
.TH opendlv-core-proxy-imu 1 "02 December 2016" "0.7.0" "opendlv-core-proxy-imu man page"

.SH NAME
opendlv-core-proxy-imu \- This tool interfaces with a imu.
Expand Down
2 changes: 1 addition & 1 deletion code/core/system/proxy-ledstrip/man/opendlv-core-system-proxy-ledstrip.1
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" Manpage for opendlv-core-proxy-ledstrip
.\" Author: Christian Berger <christian.berger@gu.se>.

.TH opendlv-core-proxy-ledstrip 1 "29 November 2016" "0.6.0" "opendlv-core-proxy-ledstrip man page"
.TH opendlv-core-proxy-ledstrip 1 "02 December 2016" "0.7.0" "opendlv-core-proxy-ledstrip man page"

.SH NAME
opendlv-core-proxy-ledstrip \- This tool interfaces with an LED strip.
Expand Down
2 changes: 1 addition & 1 deletion code/core/system/proxy-sick/man/opendlv-core-system-proxy-sick.1
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" Manpage for opendlv-core-proxy-sick
.\" Author: Christian Berger <christian.berger@gu.se>.

.TH opendlv-core-proxy-sick 1 "29 November 2016" "0.6.0" "opendlv-core-proxy-sick man page"
.TH opendlv-core-proxy-sick 1 "02 December 2016" "0.7.0" "opendlv-core-proxy-sick man page"

.SH NAME
opendlv-core-proxy-sick \- This tool interfaces with the Sick lidar device.
Expand Down
2 changes: 1 addition & 1 deletion code/core/system/proxy-trimble/man/opendlv-core-system-proxy-trimble.1
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" Manpage for opendlv-core-proxy-trimble
.\" Author: Christian Berger <christian.berger@gu.se>.

.TH opendlv-core-proxy-trimble 1 "29 November 2016" "0.6.0" "opendlv-core-proxy-trimble man page"
.TH opendlv-core-proxy-trimble 1 "02 December 2016" "0.7.0" "opendlv-core-proxy-trimble man page"

.SH NAME
opendlv-core-proxy-trimble \- This tool interfaces to GPS/IMU unit Trimble.
Expand Down
2 changes: 1 addition & 1 deletion code/core/system/proxy-v2v/man/opendlv-core-system-proxy-v2v.1
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" Manpage for opendlv-core-proxy-v2v
.\" Author: Christian Berger <christian.berger@gu.se>.

.TH opendlv-core-proxy-v2v 1 "29 November 2016" "0.6.0" "opendlv-core-proxy-v2v man page"
.TH opendlv-core-proxy-v2v 1 "02 December 2016" "0.7.0" "opendlv-core-proxy-v2v man page"

.SH NAME
opendlv-core-proxy-v2v \- This tool interfaces with a V2V unit.
Expand Down
3 changes: 1 addition & 2 deletions code/core/system/proxy-velodyne16/include/velodyne16DecoderCPC.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
#include "opendavinci/odcore/data/Container.h"
#include <opendavinci/odcore/io/StringListener.h>
#include "opendavinci/generated/odcore/data/CompactPointCloud.h"
#include "opendavinci/odcore/wrapper/half_float.h"

namespace opendlv {
namespace core {
Expand Down Expand Up @@ -77,7 +76,7 @@ class Velodyne16DecoderCPC : public odcore::io::StringListener {
std::stringstream m_distanceStringStream; //The string stream with distance values for all points of one frame
bool m_isStartAzimuth; //Indicate if an azimuth is the starting azimuth of a new frame
uint8_t m_sensorOrderIndex[16];//Specify the order for each 16 points in the string with distance values
half m_16Sensors[16];//Store the distance values of the current 16 sensors
uint16_t m_16Sensors[16];//Store the distance values (in cm) of the current 16 sensors
};
}
}
Expand Down
2 changes: 1 addition & 1 deletion code/core/system/proxy-velodyne16/man/opendlv-core-system-proxy-velodyne16.1
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" Manpage for opendlv-core-proxy-velodyne16
.\" Author: Christian Berger <christian.berger@gu.se>.

.TH opendlv-core-proxy-velodyne16 1 "29 November 2016" "0.6.0" "opendlv-core-proxy-velodyne man page"
.TH opendlv-core-proxy-velodyne16 1 "02 December 2016" "0.7.0" "opendlv-core-proxy-velodyne man page"

.SH NAME
opendlv-core-proxy-velodyne16 \- This tool interfaces with the FH16 truck.
Expand Down
6 changes: 2 additions & 4 deletions code/core/system/proxy-velodyne16/src/velodyne16DecoderCPC.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ void Velodyne16DecoderCPC::nextString(const string &payload) {

//The payload of a VLP-16 packet consists of 12 blocks with 100 bytes each. Decode each block separately.
static uint8_t firstByte, secondByte;
static uint32_t dataValue;
static uint16_t dataValue;
for (uint8_t blockID = 0; blockID < 12; blockID++) {
//Skip the flag: 0xFFEE(2 bytes)
position += 2;
Expand Down Expand Up @@ -149,9 +149,7 @@ void Velodyne16DecoderCPC::nextString(const string &payload) {
//Decode distance: 2 bytes. Swap the bytes, change to decimal, and divide it by 500
firstByte = (uint8_t)(payload.at(position));
secondByte = (uint8_t)(payload.at(position + 1));
dataValue = ntohs(firstByte * 256 + secondByte);
m_distance = dataValue / 500.0; //*2mm-->/1000 for meter
m_16Sensors[sensorID]=static_cast<half>(m_distance);
m_16Sensors[sensorID] = ntohs(firstByte * 256 + secondByte)/5;

if(sensorID==15){
for(uint8_t index=0;index<16;index++){
Expand Down
2 changes: 1 addition & 1 deletion code/core/system/proxy-velodyne64/man/opendlv-core-system-proxy-velodyne64.1
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" Manpage for opendlv-core-proxy-velodyne
.\" Author: Christian Berger <christian.berger@gu.se>.

.TH opendlv-core-proxy-velodyne 1 "29 November 2016" "0.6.0" "opendlv-core-proxy-velodyne man page"
.TH opendlv-core-proxy-velodyne 1 "02 December 2016" "0.7.0" "opendlv-core-proxy-velodyne man page"

.SH NAME
opendlv-core-proxy-velodyne \- This tool interfaces with the FH16 truck.
Expand Down
2 changes: 1 addition & 1 deletion code/core/system/ps3controller/man/opendlv-core-system-ps3controller.1
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" Manpage for opendlv-core-ps3controller
.\" Author: Christian Berger <christian.berger@gu.se>.

.TH opendlv-core-ps3controller 1 "29 November 2016" "0.6.0" "opendlv-core-ps3controller man page"
.TH opendlv-core-ps3controller 1 "02 December 2016" "0.7.0" "opendlv-core-ps3controller man page"

.SH NAME
opendlv-core-ps3controller \- This tool interfaces with the FH16 truck.
Expand Down
2 changes: 1 addition & 1 deletion docker/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
###############################################################################
# Parameters for this Makefile.
BASE_IMAGE=seresearch/opendavinci-ubuntu-16.04-complete
BASE_IMAGE_VERSION=v4.4.2
BASE_IMAGE_VERSION=v4.4.3

###############################################################################
# Tools.
Expand Down
Binary file removed usecases/latest/velodyne16CPC/calibrate.velodyne16/Car.objx
View file
Binary file not shown.
77 changes: 0 additions & 77 deletions usecases/latest/velodyne16CPC/calibrate.velodyne16/README.md
View file

This file was deleted.

Binary file removed usecases/latest/velodyne16CPC/calibrate.velodyne16/Track.scnx
View file
Binary file not shown.
Loading

0 comments on commit db85f0c

Please sign in to comment.