Skip to content

Commit 78abf96

Browse files
committed
File cleanup
1 parent 4f4698e commit 78abf96

File tree

5 files changed

+1
-64
lines changed

5 files changed

+1
-64
lines changed

ground_station/LICENSE

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

ground_station/net.ini

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

ground_station/src/config.cpp

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,6 @@ SystemParser systemParser{};
99
Config systemConfig{};
1010
// NOLINTEND(cppcoreguidelines-avoid-non-const-global-variables)
1111

12-
/*
13-
if(systemParser.loadFile(configFileName))
14-
{
15-
if(systemParser.getUsbVid() != -1)
16-
{
17-
vid = systemParser.getUsbVid();
18-
}
19-
if(systemParser.getUsbPid() != -1)
20-
{
21-
pid = systemParser.getUsbPid();
22-
}
23-
if(strlen(systemParser.getUsbSerial()))
24-
{
25-
serial = systemParser.getUsbSerial();
26-
}
27-
console.ok.println("[UTILS] System config loading was successful.");
28-
}
29-
else
30-
{
31-
console.error.println("[UTILS] System config loading failed.");
32-
status = false;
33-
}
34-
*/
35-
3612
void Config::save() {
3713
systemParser.setTestingPhrase(config.testingPhrase);
3814
systemParser.setLinkPhrase1(config.linkPhrase1);

ground_station/src/utils.hpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,14 @@
3434
#include <Arduino.h>
3535
#include <SdFat.h>
3636

37-
inline constexpr const char *DEFAULT_CONFIG_FILE_NAME = "system.json";
38-
3937
constexpr float PI_F = static_cast<float>(PI);
4038

4139
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
4240
extern FatFileSystem fatfs;
4341

4442
class Utils {
4543
public:
46-
explicit Utils(const char *systemConfigFilename = DEFAULT_CONFIG_FILE_NAME) : configFileName(systemConfigFilename) {}
44+
explicit Utils() = default;
4745
bool begin(uint32_t watchdogTimeout = 0, const char *labelName = "DRIVE", bool forceFormat = false);
4846
static void startBootloader();
4947
static void startWatchdog(uint32_t seconds);
@@ -57,7 +55,6 @@ class Utils {
5755
explicit operator bool() const { return mscReady; }
5856

5957
private:
60-
const char *configFileName;
6158
const char *serial = "0";
6259
volatile bool mscReady = false;
6360

ground_station/system.json

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

0 commit comments

Comments
 (0)