Skip to content

Commit

Permalink
Move headers
Browse files Browse the repository at this point in the history
Signed-off-by: Alberto Tudela <ajtudela@gmail.com>
  • Loading branch information
ajtudela committed Sep 30, 2024
1 parent 41881e5 commit b9a8abc
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* limitations under the License.
*/

#ifndef COMMON__SCANNERSICKS300_HPP_
#define COMMON__SCANNERSICKS300_HPP_
#ifndef SICKS300_2__COMMON__SCANNERSICKS300_HPP_
#define SICKS300_2__COMMON__SCANNERSICKS300_HPP_

// base classes
#include <math.h>
Expand All @@ -25,8 +25,8 @@
#include <string>
#include <vector>

#include "common/SerialIO.hpp"
#include "common/TelegramS300.hpp"
#include "sicks300_2/common/SerialIO.hpp"
#include "sicks300_2/common/TelegramS300.hpp"

/**
* Driver class for the laser scanner SICK S300 Professional.
Expand Down Expand Up @@ -127,4 +127,4 @@ class ScannerSickS300
std::vector<ScanPolarType> & vecScanPolar);
};

#endif // COMMON__SCANNERSICKS300_HPP_
#endif // SICKS300_2__COMMON__SCANNERSICKS300_HPP_
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* limitations under the License.
*/

#ifndef COMMON__SERIALIO_HPP_
#define COMMON__SERIALIO_HPP_
#ifndef SICKS300_2__COMMON__SERIALIO_HPP_
#define SICKS300_2__COMMON__SERIALIO_HPP_

#include <termios.h>
#include <sys/select.h>
Expand Down Expand Up @@ -205,4 +205,4 @@ class SerialIO
};


#endif // COMMON__SERIALIO_HPP_
#endif // SICKS300_2__COMMON__SERIALIO_HPP_
File renamed without changes.
2 changes: 1 addition & 1 deletion include/sicks300_2/sicks300.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "diagnostic_msgs/msg/diagnostic_array.hpp"

// Common
#include "common/ScannerSickS300.hpp"
#include "sicks300_2/common/ScannerSickS300.hpp"

namespace sicks300_2
{
Expand Down
2 changes: 1 addition & 1 deletion src/common/ScannerSickS300.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

#include <stdint.h>
#include "common/ScannerSickS300.hpp"
#include "sicks300_2/common/ScannerSickS300.hpp"

//-----------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion src/common/SerialIO.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <linux/serial.h>
#include <iostream>

#include "common/SerialIO.hpp"
#include "sicks300_2/common/SerialIO.hpp"

// #define _PRINT_BYTES

Expand Down

0 comments on commit b9a8abc

Please sign in to comment.