cleaned up folder

This commit is contained in:
Ruixiang Du
2021-07-08 23:48:42 +08:00
parent 08d16fedff
commit 44a793ef89
16 changed files with 17 additions and 19 deletions

View File

@@ -24,7 +24,7 @@ struct can_frame {
}; };
#endif #endif
#include "ugv_sdk/interface/agilex_message.h" #include "ugv_sdk/details/interface/agilex_message.h"
struct ParserInterface { struct ParserInterface {
// CAN support // CAN support

View File

@@ -12,7 +12,7 @@
#include <string> #include <string>
#include "ugv_sdk/interface/agilex_message.h" #include "ugv_sdk/details/interface/agilex_message.h"
namespace westonrobot { namespace westonrobot {
enum class ProtocolType { AGX_V1, AGX_V2 }; enum class ProtocolType { AGX_V1, AGX_V2 };

View File

@@ -12,7 +12,7 @@
#include <string> #include <string>
#include "ugv_sdk/interface/agilex_message.h" #include "ugv_sdk/details/interface/agilex_message.h"
namespace westonrobot { namespace westonrobot {
struct ScoutState { struct ScoutState {

View File

@@ -10,7 +10,7 @@
#ifndef SCOUT_PROTOCOL_V1_PARSER_HPP #ifndef SCOUT_PROTOCOL_V1_PARSER_HPP
#define SCOUT_PROTOCOL_V1_PARSER_HPP #define SCOUT_PROTOCOL_V1_PARSER_HPP
#include "ugv_sdk/interface/parser_interface.hpp" #include "ugv_sdk/details/interface/parser_interface.hpp"
namespace westonrobot { namespace westonrobot {
class ScoutProtocolV1Parser : public ParserInterface { class ScoutProtocolV1Parser : public ParserInterface {

View File

@@ -28,7 +28,7 @@ struct can_frame {
}; };
#endif #endif
#include "ugv_sdk/interface/agilex_message.h" #include "ugv_sdk/details/interface/agilex_message.h"
bool DecodeCanFrame(const struct can_frame *rx_frame, AgxMessage *msg); bool DecodeCanFrame(const struct can_frame *rx_frame, AgxMessage *msg);
void EncodeCanFrame(const AgxMessage *msg, struct can_frame *tx_frame); void EncodeCanFrame(const AgxMessage *msg, struct can_frame *tx_frame);

View File

@@ -10,7 +10,7 @@
#ifndef PROTOCOL_V2_PARSER_HPP #ifndef PROTOCOL_V2_PARSER_HPP
#define PROTOCOL_V2_PARSER_HPP #define PROTOCOL_V2_PARSER_HPP
#include "ugv_sdk/interface/parser_interface.hpp" #include "ugv_sdk/details/interface/parser_interface.hpp"
namespace westonrobot { namespace westonrobot {
class ProtocolV2Parser : public ParserInterface { class ProtocolV2Parser : public ParserInterface {

View File

@@ -24,9 +24,8 @@
#include "ugv_sdk/details/stopwatch.hpp" #include "ugv_sdk/details/stopwatch.hpp"
#include "ugv_sdk/details/async_port/async_can.hpp" #include "ugv_sdk/details/async_port/async_can.hpp"
#include "ugv_sdk/details/interface/robot_interface.hpp"
#include "ugv_sdk/interface/robot_interface.hpp" #include "ugv_sdk/details/protocol_v2/agilex_msg_parser.h"
#include "ugv_sdk/protocol_v2/agilex_msg_parser.h"
namespace westonrobot { namespace westonrobot {
template <typename ParserType> template <typename ParserType>

View File

@@ -15,7 +15,7 @@
#include <thread> #include <thread>
#include <mutex> #include <mutex>
#include "ugv_sdk/interface/scout_interface.hpp" #include "ugv_sdk/details/interface/scout_interface.hpp"
#include "ugv_sdk/details/robot_base/agilex_base.hpp" #include "ugv_sdk/details/robot_base/agilex_base.hpp"
namespace westonrobot { namespace westonrobot {
@@ -113,8 +113,8 @@ class ScoutBase : public AgilexBase<Parser>, public ScoutInterface {
}; };
} // namespace westonrobot } // namespace westonrobot
#include "ugv_sdk/protocol_v1/scout_protocol_v1_parser.hpp" #include "ugv_sdk/details/protocol_v1/scout_protocol_v1_parser.hpp"
#include "ugv_sdk/protocol_v2/protocol_v2_parser.hpp" #include "ugv_sdk/details/protocol_v2/protocol_v2_parser.hpp"
namespace westonrobot { namespace westonrobot {
using ScoutBaseV1 = ScoutBase<ScoutProtocolV1Parser>; using ScoutBaseV1 = ScoutBase<ScoutProtocolV1Parser>;

View File

@@ -12,8 +12,8 @@
#include <memory> #include <memory>
#include "ugv_sdk/interface/robot_interface.hpp" #include "ugv_sdk/details/interface/robot_interface.hpp"
#include "ugv_sdk/interface/scout_interface.hpp" #include "ugv_sdk/details/interface/scout_interface.hpp"
namespace westonrobot { namespace westonrobot {
class ScoutRobot : public RobotInterface, public ScoutInterface { class ScoutRobot : public RobotInterface, public ScoutInterface {

View File

@@ -7,7 +7,7 @@
* Copyright (c) 2021 Ruixiang Du (rdu) * Copyright (c) 2021 Ruixiang Du (rdu)
*/ */
#include "ugv_sdk/protocol_v1/scout_protocol_v1_parser.hpp" #include "ugv_sdk/details/protocol_v1/scout_protocol_v1_parser.hpp"
#include "protocol_v1/scout/scout_can_parser.h" #include "protocol_v1/scout/scout_can_parser.h"

View File

@@ -8,7 +8,7 @@
*/ */
#include "agx_protocol_v2.h" #include "agx_protocol_v2.h"
#include "ugv_sdk/protocol_v2/agilex_msg_parser.h" #include "ugv_sdk/details/protocol_v2/agilex_msg_parser.h"
#include "stdio.h" #include "stdio.h"
#include "string.h" #include "string.h"

View File

@@ -7,9 +7,8 @@
* Copyright (c) 2021 Weston Robot Pte. Ltd. * Copyright (c) 2021 Weston Robot Pte. Ltd.
*/ */
#include "ugv_sdk/protocol_v2/agilex_msg_parser.h" #include "ugv_sdk/details/protocol_v2/agilex_msg_parser.h"
#include "ugv_sdk/details/protocol_v2/protocol_v2_parser.hpp"
#include "ugv_sdk/protocol_v2/protocol_v2_parser.hpp"
namespace westonrobot { namespace westonrobot {
bool ProtocolV2Parser::DecodeMessage(const struct can_frame *rx_frame, bool ProtocolV2Parser::DecodeMessage(const struct can_frame *rx_frame,