diff --git a/doc/classdiagramm.uxf b/doc/classdiagramm.uxf index 943a1c7..1d8fd99 100644 --- a/doc/classdiagramm.uxf +++ b/doc/classdiagramm.uxf @@ -6,7 +6,7 @@ 120 670 - 210 + 220 510 <<hardware>> @@ -46,9 +46,9 @@ MotorControl UMLClass - 380 + 360 670 - 210 + 220 330 <<hardware>> @@ -77,13 +77,47 @@ Speedometer UMLClass - 900 - 660 - 210 + 120 + 270 + 270 + 370 + + MoveControl +-- +- debug: DebugMqtt* +- left_motor: MotorControl* +- right_motor: MotorControl* +- left_speedometer: Speedometer* +- right_speedometer: Speedometer* +- driving_status: DrivingStatus = stop +- x_speed: double = 0 +- rotation_speed: double = 0 +- wheelspeed_left_target: double = 0 +- wheelspeed_right_target: double = 0 +-- ++ MoveControl() ++ init(left_motor: MotorControl*, +    right_motor: MotorControl*, +    left_speedometer: Speedometer*, +    right_speedometer: Speedometer*) ++ runMoveControl() ++ setDrivingStatus(status: DrivingStatus) ++ setSpeed(speed: double) ++ setRotationspeed(speed: double) +- calcWheelSpeed() +- regulateMotors() + + + + UMLClass + + 1110 + 670 + 220 330 - <<hardware>> -Speedometer + <<driveModi>> +ManualContro -- - encoder: ESP32Encoder - debug: DebugMqtt* diff --git a/src/driveModi/captureRoute.cpp b/src/driveModi/captureRoute.cpp new file mode 100644 index 0000000..e69de29 diff --git a/src/driveModi/captureRoute.h b/src/driveModi/captureRoute.h new file mode 100644 index 0000000..e69de29 diff --git a/src/moveControl.h b/src/moveControl.h index 47bd57e..8ebb663 100644 --- a/src/moveControl.h +++ b/src/moveControl.h @@ -9,19 +9,11 @@ #include "debugMqtt.h" enum DrivingStatus {stop, - straightForward, - straightBackward, - arcForwardLeft, - arcForwardRight, - arcBackwardLeft, - arcBackwardRight, + forward, + backward, rotateLeft, rotateRight}; -// enum regulateStatus {stop, -// drive, -// rotateLeft, -// rotateRight}; class MoveControl { public: