Skip to content
This repository was archived by the owner on Dec 1, 2020. It is now read-only.

Commit 5c9f182

Browse files
OlavhaasieProjectMarchIsha DijcksJorisWeeda
authored andcommitted
Release: v0.2.0 (#204)
* Rename namespace to march (#196) * Fix incrementing byte offsets with register And changed to unordered map * Fix clang format * Fix inconsistent variable naming * Fix: recalibrate right hip aa (#198) * Recalibrate * Fix travis dependency Co-authored-by: Project March <tech@projectmarch.nl> Co-authored-by: JorisWeeda <45165354+JorisWeeda@users.noreply.github.com> * add time updater for IMU message Co-authored-by: Project March <tech@projectmarch.nl> Co-authored-by: Isha Dijcks <I.E.Dijcks@student.tudelft.nl> Co-authored-by: JorisWeeda <45165354+JorisWeeda@users.noreply.github.com>
1 parent 9584e51 commit 5c9f182

File tree

69 files changed

+373
-402
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+373
-402
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ env:
2929
- BUILDER=colcon
3030
- CATKIN_LINT=pedantic
3131
- CATKIN_LINT_ARGS='--ignore literal_project_name --ignore target_name_collision'
32-
- UPSTREAM_WORKSPACE='.rosinstall -march/march_data_collector -march/march_gait_scheduler -march/march_gain_scheduling -march/march_gait_selection -march/march_launch -march/march_safety -march/march_sound_scheduler -march/march_state_machine'
32+
- UPSTREAM_WORKSPACE='.rosinstall -march/march_data_collector -march/march_gait_scheduler -march/march_gain_scheduling -march/march_gait_selection -march/march_launch -march/march_safety -march/march_state_machine'
3333

3434
jobs:
3535
include:

march_hardware/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ if (CATKIN_ENABLE_TESTING)
6666
endif()
6767

6868
add_rostest_gmock(${PROJECT_NAME}-test
69-
test/march4cpp.test
69+
test/march_hardware.test
7070
test/TestRunner.cpp
7171
test/TestEncoder.cpp
7272
test/TestIMotionCube.cpp

march_hardware/include/march_hardware/ActuationMode.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <string>
66
#include <ros/console.h>
77

8-
namespace march4cpp
8+
namespace march
99
{
1010
class ActuationMode
1111
{
@@ -87,6 +87,6 @@ class ActuationMode
8787
private:
8888
Value value = unknown;
8989
};
90-
} // namespace march4cpp
90+
} // namespace march
9191

9292
#endif // MARCH_HARDWARE_ACTUATIONMODE_H

march_hardware/include/march_hardware/Encoder.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include <ostream>
77

8-
namespace march4cpp
8+
namespace march
99
{
1010
class Encoder
1111
{
@@ -75,6 +75,6 @@ class Encoder
7575
<< "safetyMarginRad: " << encoder.safetyMarginRad;
7676
}
7777
};
78-
} // namespace march4cpp
78+
} // namespace march
7979

8080
#endif // MARCH_HARDWARE_ENCODER_H

march_hardware/include/march_hardware/EtherCAT/EthercatIO.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <soem/ethercatconfig.h>
1616
#include <soem/ethercatprint.h>
1717

18-
namespace march4cpp
18+
namespace march
1919
{
2020
// struct used to easily get specific bytes from a 64 bit variable
2121
struct packed_bit64
@@ -105,5 +105,5 @@ union bit8 get_output_bit8(uint16 slave_no, uint8 module_index);
105105

106106
void set_output_bit(uint16 slave_no, uint8 module_index, uint8 value);
107107

108-
} // namespace march4cpp
108+
} // namespace march
109109
#endif // MARCH_HARDWARE_ETHERCAT_ETHERCATIO_H

march_hardware/include/march_hardware/EtherCAT/EthercatMaster.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
#include <march_hardware/Joint.h>
99

10-
namespace march4cpp
10+
namespace march
1111
{
1212
/**
1313
* Base class of the ethercat master supported with the SOEM library
@@ -46,5 +46,5 @@ class EthercatMaster
4646
void stop();
4747
};
4848

49-
} // namespace march4cpp
49+
} // namespace march
5050
#endif // MARCH_HARDWARE_ETHERCAT_ETHERCATMASTER_H

march_hardware/include/march_hardware/EtherCAT/EthercatSDO.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
#include <cstdint>
66

7-
namespace march4cpp
7+
namespace march
88
{
99
int sdo_bit8(int slave, uint32_t index, uint8_t sub, uint8_t value);
1010
int sdo_bit16(int slave, uint32_t index, uint8_t sub, uint16_t value);
1111
int sdo_bit32(int slave, uint32_t index, uint8_t sub, uint32_t value);
1212

13-
} // namespace march4cpp
13+
} // namespace march
1414

1515
#endif // MARCH_HARDWARE_ETHERCAT_ETHERCATSDO_H

march_hardware/include/march_hardware/HighVoltage.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <march_hardware/NetDriverOffsets.h>
99
#include <march_hardware/NetMonitorOffsets.h>
1010

11-
namespace march4cpp
11+
namespace march
1212
{
1313
class HighVoltage
1414
{
@@ -46,5 +46,5 @@ class HighVoltage
4646
}
4747
};
4848

49-
} // namespace march4cpp
49+
} // namespace march
5050
#endif // MARCH_HARDWARE_HIGHVOLTAGE_H

march_hardware/include/march_hardware/IMotionCube.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#ifndef MARCH_HARDWARE_IMOTIONCUBE_H
44
#define MARCH_HARDWARE_IMOTIONCUBE_H
55

6-
#include <map>
6+
#include <unordered_map>
77
#include <string>
88

99
#include <march_hardware/ActuationMode.h>
@@ -14,7 +14,7 @@
1414
#include <march_hardware/IMotionCubeState.h>
1515
#include <march_hardware/IMotionCubeTargetState.h>
1616

17-
namespace march4cpp
17+
namespace march
1818
{
1919
class IMotionCube : public Slave
2020
{
@@ -24,8 +24,8 @@ class IMotionCube : public Slave
2424

2525
void actuateIU(int iu);
2626

27-
std::map<IMCObjectName, int> misoByteOffsets;
28-
std::map<IMCObjectName, int> mosiByteOffsets;
27+
std::unordered_map<IMCObjectName, int> misoByteOffsets;
28+
std::unordered_map<IMCObjectName, int> mosiByteOffsets;
2929
void mapMisoPDOs();
3030
void mapMosiPDOs();
3131
void validateMisoPDOs();
@@ -85,8 +85,8 @@ class IMotionCube : public Slave
8585
return os << "slaveIndex: " << iMotionCube.slaveIndex << ", "
8686
<< "encoder: " << iMotionCube.encoder;
8787
}
88-
bool goToTargetState(march4cpp::IMotionCubeTargetState targetState);
88+
bool goToTargetState(march::IMotionCubeTargetState targetState);
8989
};
9090

91-
} // namespace march4cpp
91+
} // namespace march
9292
#endif // MARCH_HARDWARE_IMOTIONCUBE_H

march_hardware/include/march_hardware/IMotionCubeState.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#include <string>
66

7-
namespace march4cpp
7+
namespace march
88
{
99
class IMCState
1010
{
@@ -97,6 +97,6 @@ struct IMotionCubeState
9797
float motorVoltage;
9898
};
9999

100-
} // namespace march4cpp
100+
} // namespace march
101101

102102
#endif // MARCH_HARDWARE_IMOTIONCUBESTATE_H

0 commit comments

Comments
 (0)