Skip to content

Commit 421e095

Browse files
committed
Fix formatting
1 parent db06ec5 commit 421e095

File tree

7 files changed

+22
-17
lines changed

7 files changed

+22
-17
lines changed

src/IO/ArduinoProxy.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@ void ArduinoProxy::initialize()
2424
{
2525
std::lock_guard<std::mutex> lockGuard(serialMutex);
2626

27-
#if DESKTOP_COMPAT == 1
27+
#if DESKTOP_COMPAT == 1
2828
if ((fd = serialOpen("/dev/ttyACM0", 57600)) < 0)
29-
#else
29+
#else
3030
if ((fd = serialOpen("/dev/ttyAMA0", 57600)) < 0)
31-
#endif
31+
#endif
3232
{
3333
SPDLOG_LOGGER_ERROR(logger, "Error while opening serial communication!");
3434
return;
3535
}
3636

37-
#if DESKTOP_COMPAT == 1
37+
#if DESKTOP_COMPAT == 1
3838
std::this_thread::sleep_for(std::chrono::milliseconds(5000));
39-
#endif
39+
#endif
4040

4141
inititialized = true;
4242

@@ -121,7 +121,9 @@ void ArduinoProxy::handleArduinoMessage(const RocketryProto::ArduinoOut &arduino
121121
std::lock_guard<std::mutex> lockGuard(stateMutex);
122122

123123
const auto &dcMotorState = arduinoOut.dcmotorstate();
124-
dcMotorStates[{dcMotorState.motorforwardpin(), dcMotorState.motorreversepin()}] = {dcMotorState.position(), dcMotorState.direction(), dcMotorState.minlimitswitch(), dcMotorState.maxlimitswitch(), std::chrono::steady_clock::now()};
124+
dcMotorStates[{dcMotorState.motorforwardpin(), dcMotorState.motorreversepin()}] = {
125+
dcMotorState.position(), dcMotorState.direction(), dcMotorState.minlimitswitch(),
126+
dcMotorState.maxlimitswitch(), std::chrono::steady_clock::now()};
125127
}
126128
break;
127129
case RocketryProto::ArduinoOut::DATA_NOT_SET:

src/IO/Interface.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ class Interface
2727

2828
virtual void createNewGpioPwmOutput(std::string name, int pinNbr, int safePosition, bool softpwm) = 0;
2929

30-
virtual void createNewGpioDCMotorOutput(std::string name, int pinForward, int pinReverse, int motorPower,
31-
int limitSwitchMinPin, int limitSwitchMaxPin, int potentiometerPin) = 0;
30+
virtual void createNewGpioDCMotorOutput(std::string name, int pinForward, int pinReverse, int motorPower,
31+
int limitSwitchMinPin, int limitSwitchMaxPin, int potentiometerPin) = 0;
3232

3333
#endif
3434

src/IO/gpio/DCMotor.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#include <utility>
99
#include <wiringSerial.h>
1010

11-
DCMotorOutput::DCMotorOutput(std::string name, int pinForward, int pinReverse, int motorPower,
12-
int limitSwitchMinPin, int limitSwitchMaxPin, int potentiometerPin)
13-
: name(std::move(name)), pinNbrForward(pinForward), pinNbrReverse(pinReverse), motorPower(motorPower),
11+
DCMotorOutput::DCMotorOutput(std::string name, int pinForward, int pinReverse, int motorPower, int limitSwitchMinPin,
12+
int limitSwitchMaxPin, int potentiometerPin)
13+
: name(std::move(name)), pinNbrForward(pinForward), pinNbrReverse(pinReverse), motorPower(motorPower),
1414
limitSwitchMinPin(limitSwitchMinPin), limitSwitchMaxPin(limitSwitchMaxPin), potentiometerPin(potentiometerPin)
1515
{
1616
logger = spdlog::default_logger();
@@ -36,7 +36,8 @@ bool DCMotorOutput::setValue(int value)
3636
if (currentState != value)
3737
{
3838
currentState = value;
39-
SPDLOG_LOGGER_INFO(logger, "DC Motor {} changed to {} on pin {} and {}", name, currentState, pinNbrForward, pinNbrReverse);
39+
SPDLOG_LOGGER_INFO(logger, "DC Motor {} changed to {} on pin {} and {}", name, currentState, pinNbrForward,
40+
pinNbrReverse);
4041

4142
#if USE_ARDUINO_PROXY == 1
4243
RocketryProto::ArduinoIn arduinoIn;

src/IO/gpio/DCMotor.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
class DCMotorOutput : public Output
1818
{
1919
public:
20-
DCMotorOutput(std::string name, int pinForward, int pinReverse, int motorPower,
21-
int limitSwitchMinPin, int limitSwitchMaxPin, int potentiometerPin);
20+
DCMotorOutput(std::string name, int pinForward, int pinReverse, int motorPower, int limitSwitchMinPin,
21+
int limitSwitchMaxPin, int potentiometerPin);
2222

2323
bool setValue(int value) override;
2424

src/arduino/DCMotorState.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
#include <chrono>
44

5-
struct DCMotorState {
5+
struct DCMotorState
6+
{
67
int position;
78
int direction;
89
bool minLimitSwitch;

src/data/GpioData.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#pragma once
2+
#include "arduino/DCMotorState.h"
23
#include "config.h"
34
#include <map>
45
#include <string>
5-
#include "arduino/DCMotorState.h"
66

77
struct GpioData
88
{

src/stateMachine/HotFire/HotFireStateMachine.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,8 @@ STATE_DEFINE(HotFireStateMachine, Init, UOSMData)
198198
#endif
199199

200200
#if USE_PWM_MAIN
201-
interface->createNewGpioDCMotorOutput(MAIN_NAME, MAIN_FORWARD_PIN, MAIN_REVERSE_PIN, MAIN_MOTOR_POWER, MAIN_LIMIT_SWITCH_MIN_PIN, MAIN_LIMIT_SWITCH_MAX_PIN, MAIN_POTENTIOMETER_PIN);
201+
interface->createNewGpioDCMotorOutput(MAIN_NAME, MAIN_FORWARD_PIN, MAIN_REVERSE_PIN, MAIN_MOTOR_POWER,
202+
MAIN_LIMIT_SWITCH_MIN_PIN, MAIN_LIMIT_SWITCH_MAX_PIN, MAIN_POTENTIOMETER_PIN);
202203
#endif
203204

204205
#if USE_PWM_PINHOLE

0 commit comments

Comments
 (0)