Skip to content

Commit d0f6416

Browse files
committed
fix: testing compile issues
1 parent fef0f52 commit d0f6416

19 files changed

+49
-133
lines changed

src/IO/ArduinoProxy.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#include "ArduinoProxy.h"
22

3-
#if USE_ARDUINO_PROXY == 1
4-
53
#include "IO/ArduinoEncoder.h"
64
#include <spdlog/spdlog.h>
75
#include <sys/poll.h>
@@ -173,5 +171,3 @@ int ArduinoProxy::getServoState(int pin)
173171
return state.first;
174172
}
175173
}
176-
177-
#endif

src/IO/ArduinoProxy.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#pragma once
22
#include "config.h"
33

4-
#if USE_ARDUINO_PROXY == 1
5-
64
#include "IO.h"
75
#include <ArduinoComm.pb.h>
86
#include <wiringSerial.h>
@@ -39,5 +37,3 @@ class ArduinoProxy : IO
3937

4038
void handleArduinoMessage(const RocketryProto::ArduinoOut &arduinoOut);
4139
};
42-
43-
#endif

src/IO/Input.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#pragma once
2-
#if USE_INPUT == 1
32

43
#include "EventQueue.h"
54
#include "IO.h"
@@ -23,5 +22,3 @@ class Input : IO
2322

2423
static bool isNumber(const std::string &s);
2524
};
26-
27-
#endif

src/IO/Radio.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include "config.h"
2-
#if USE_RADIO == 1
32

43
#include "Radio.h"
54
#include "data/StateData.h"
@@ -96,5 +95,3 @@ void Radio::sendData(const StateData &currentState) const
9695

9796
serialPrintf(fd, data.c_str());
9897
}
99-
100-
#endif // USE_RADIO

src/IO/Radio.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
#pragma once
22

3-
#include "config.h"
4-
#if USE_RADIO == 1
5-
63
#include "../data/StateData.h"
74
#include "EventQueue.h"
85
#include "IO.h"
6+
#include "config.h"
97
#include <condition_variable>
108
#include <mutex>
119
#include <queue>
@@ -58,5 +56,3 @@ class Radio : public IO
5856
InitStatus wiringPiStatus = INIT;
5957
} status;
6058
};
61-
62-
#endif

src/IO/SBGSensor.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
#include "config.h"
22

3-
#if USE_SBG == 1
4-
53
#include "SBGSensor.h"
64
#include <sbgDefines.h>
75

@@ -328,6 +326,4 @@ sbgData SBGSensor::getData()
328326
{
329327
std::lock_guard<std::mutex> lockGuard(mutex);
330328
return data;
331-
}
332-
333-
#endif
329+
}

src/IO/SBGSensor.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
#pragma once
22

33
#include "config.h"
4-
#if USE_SBG == 1
5-
6-
#include "../data/SBGData.h"
7-
#include "IO.h"
84

95
// sbgECom headers
106
#include <sbgCommon.h>
117
#include <sbgEComLib.h>
128

9+
#include "../data/SBGData.h"
10+
#include "IO.h"
1311
#include <ctime>
1412

1513
class SBGSensor : public IO
@@ -32,5 +30,3 @@ class SBGSensor : public IO
3230
{
3331
} status;
3432
};
35-
36-
#endif

src/IO/gpio/DigitalOutput.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
#pragma once
22
#include "config.h"
3-
#if USE_GPIO == 1
43

54
#include "Output.h"
65

7-
#if USE_ARDUINO_PROXY == 1
86
#include "IO/ArduinoProxy.h"
9-
#endif
10-
117
#include <spdlog/logger.h>
128
#include <string>
139

@@ -25,9 +21,5 @@ class DigitalOutput : public Output
2521
std::string name;
2622
const int pinNbr;
2723

28-
#if USE_ARDUINO_PROXY == 1
2924
ArduinoProxy *arduinoProxy;
30-
#endif
3125
};
32-
33-
#endif

src/IO/gpio/Gpio.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#pragma once
22

33
#include "config.h"
4-
#if USE_GPIO == 1
54

65
#include "IO/IO.h"
76
#include "IO/gpio/DigitalOutput.h"
@@ -50,5 +49,3 @@ class Gpio : public IO
5049
template <typename T, typename std::enable_if<std::is_base_of<Output, T>::value>::type * = nullptr>
5150
std::map<std::string, int> toRawMap(std::map<std::string, T> map);
5251
};
53-
54-
#endif

src/IO/gpio/Output.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#pragma once
22
#include "config.h"
3-
#if USE_GPIO == 1
43

54
#include <string>
65

@@ -13,5 +12,3 @@ class Output
1312
protected:
1413
int currentState = -1;
1514
};
16-
17-
#endif

0 commit comments

Comments
 (0)