Skip to content

Commit fde50d6

Browse files
committed
update:makeテストをするために不要なファイルの削除と修正
1 parent 1836acd commit fde50d6

File tree

12 files changed

+190
-589
lines changed

12 files changed

+190
-589
lines changed

Makefile.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ INCLUDES += \
2525
-I$(mkfile_path)modules/calculators\
2626
-I$(mkfile_path)modules/common\
2727
-I$(mkfile_path)modules/motions\
28-
-I$(mkfile_path)modules/CameraCapture \
29-
-I$(mkfile_path)../../common/library/libcpp-spike/include \
28+
-I$(mkfile_path)modules/CameraCapture\
29+
-I$(mkfile_path)../../common/library/libcpp-spike/include\
3030
-I/usr/include/opencv4
3131

3232
APPL_LIBS += $(shell pkg-config --libs opencv4)

modules/API/Motor.h

Lines changed: 0 additions & 137 deletions
This file was deleted.

modules/API/MotorController.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
*/
66
#include "MotorController.h"
77

8+
using namespace spikeapi;
9+
810
MotorController::MotorController()
9-
: rightWheel(Port::PORT_A),
10-
leftWheel(Port::PORT_B, Motor::EDirection::COUNTERCLOCKWISE),
11-
armMotor(Port::PORT_C, Motor::EDirection::COUNTERCLOCKWISE)
11+
: rightWheel(EPort::PORT_A),
12+
leftWheel(EPort::PORT_B, Motor::EDirection::COUNTERCLOCKWISE),
13+
armMotor(EPort::PORT_C, Motor::EDirection::COUNTERCLOCKWISE)
1214
{
1315
}
1416

@@ -150,4 +152,4 @@ int32_t MotorController::getRightMotorSpeed()
150152
int32_t MotorController::getLeftMotorSpeed()
151153
{
152154
return leftWheel.getSpeed();
153-
}
155+
}

modules/API/MotorController.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
#include "Motor.h"
1010
#include <cstdint>
1111

12+
using namespace spikeapi;
13+
1214
class MotorController {
1315
public:
1416
/** Power値の上限 */

modules/API/Port.h

Lines changed: 0 additions & 26 deletions
This file was deleted.

tests/dummy/ColorJudgeTest.cpp

Lines changed: 0 additions & 165 deletions
This file was deleted.

0 commit comments

Comments
 (0)