diff --git a/src/shared/actuators/stepper/Stepper.cpp b/src/shared/actuators/stepper/Stepper.cpp index 482d51b56be614a072c73a8918ebda4d3afdb9d9..a39622273e1568163304b6b0c04ce441516dcda7 100644 --- a/src/shared/actuators/stepper/Stepper.cpp +++ b/src/shared/actuators/stepper/Stepper.cpp @@ -167,18 +167,11 @@ bool Stepper::isEnabled() { return enabled; } StepperData Stepper::getState(float moveDeg) { return {TimestampTimer::getTimestamp(), - -#ifndef COMPILE_FOR_HOST - stepPin.getPort(), + static_cast<unsigned int>(stepPin.getPort()), stepPin.getNumber(), -#else - 0, - 0, -#endif enabled, getCurrentDegPosition(), speed, - static_cast<uint8_t>(currentDirection), moveDeg}; } diff --git a/src/shared/actuators/stepper/StepperData.h b/src/shared/actuators/stepper/StepperData.h index 5ad99d5da7c3324a3e1e0bf296debd6e848b3958..57ffa3930f82822d3e3f1249af80515d85ea2a73 100644 --- a/src/shared/actuators/stepper/StepperData.h +++ b/src/shared/actuators/stepper/StepperData.h @@ -31,11 +31,10 @@ struct StepperData { uint64_t timestamp; unsigned int pulsePinPort; - unsigned char pulsePinNumber; + unsigned int pulsePinNumber; bool enabled; float positionDeg; float speed; - uint8_t direction; float moveDeg; static std::string header() @@ -47,10 +46,9 @@ struct StepperData void print(std::ostream& os) const { - os << timestamp << "," << static_cast<int>(pulsePinPort) << "," - << static_cast<int>(pulsePinNumber) << "," - << static_cast<int>(enabled) << "," << positionDeg << "," << speed - << "," << direction << "," << moveDeg << "\n"; + os << timestamp << "," << pulsePinPort << "," << pulsePinNumber << "," + << enabled << "," << positionDeg << "," << speed << "," << moveDeg + << "\n"; } }; diff --git a/src/shared/logger/LogTypes.h b/src/shared/logger/LogTypes.h index be18505e7ed1e127478f509cb8d0fd752a2cb129..4d36569c99e8b0ec9beb8972ee11ed3db4c75379 100644 --- a/src/shared/logger/LogTypes.h +++ b/src/shared/logger/LogTypes.h @@ -23,6 +23,7 @@ #pragma once #include <actuators/Servo/ServoData.h> +#include <actuators/stepper/StepperData.h> #include <algorithms/ADA/ADAData.h> #include <algorithms/NAS/NASState.h> #include <diagnostic/CpuMeter/CpuMeter.h> @@ -80,6 +81,7 @@ namespace LogTypes void registerTypes(Deserializer& ds) { + ds.registerType<StepperData>(); ds.registerType<ServoData>(); ds.registerType<ADAState>(); ds.registerType<NASState>();