Skip to content
This repository was archived by the owner on Mar 25, 2021. It is now read-only.

Wrapper for SD #79

Merged
merged 3 commits into from
Mar 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .arduino-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

unittest:
platforms:
- mega2560
Expand All @@ -9,6 +8,7 @@ unittest:
- "LiquidCrystal"
- "RTClib"
- "Keypad"
- "SD"

compile:
platforms:
Expand All @@ -20,3 +20,4 @@ compile:
- "LiquidCrystal"
- "RTClib"
- "Keypad"
- "SD"
50 changes: 50 additions & 0 deletions src/Devices/SD_TC.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
#include "Devices/SD_TC.h"

// class variables
SDClass_TC* SDClass_TC::_instance = nullptr;

// class methods
/**
* accessor for singleton
*/
SDClass_TC* SDClass_TC::instance() {
if (!_instance) {
_instance = new SDClass_TC();
}
return _instance;
}

// instance methods
/**
* print the root directory and all subdirectories
*/
void SDClass_TC::printRootDirectory() {
File root = open("/");
printDirectory(root, 0);
}

/**
* print a specified directory with an indent
*/
void SDClass_TC::printDirectory(File dir, int numTabs) {
while (true) {
File entry = dir.openNextFile();
if (!entry) {
// no more files
break;
}
for (uint8_t i = 0; i < numTabs; i++) {
Serial.print('\t');
}
Serial.print(entry.name());
if (entry.isDirectory()) {
Serial.println(F("/"));
printDirectory(entry, numTabs + 1);
} else {
// files have sizes, directories do not
Serial.print(F("\t\t"));
Serial.println(entry.size(), DEC);
}
entry.close();
}
}
24 changes: 24 additions & 0 deletions src/Devices/SD_TC.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#pragma once

#include <Arduino.h>
#ifdef MOCK_PINS_COUNT
#include <SD_CI.h>
#else
#include <SD.h>
#endif

class SDClass_TC : public SDClass {
public:
// class methods
static SDClass_TC* instance();

// instance methods
void printRootDirectory();

private:
// class variables
static SDClass_TC* _instance;

// instance methods
void printDirectory(File dir, int numTabs);
};
1 change: 1 addition & 0 deletions src/TankControllerLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ TankControllerLib::TankControllerLib() {
lcd = LiquidCrystal_TC::instance();
log = Serial_TC::instance();
log->print(F("TankControllerLib::TankControllerLib() - version "), TANK_CONTROLLER_VERSION);
SDClass_TC::instance()->printRootDirectory();
}

/**
Expand Down
1 change: 1 addition & 0 deletions src/TankControllerLib.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "Devices/EthernetServer_TC.h"
#include "Devices/Keypad_TC.h"
#include "Devices/LiquidCrystal_TC.h"
#include "Devices/SD_TC.h"
#include "Devices/Serial_TC.h"

const char TANK_CONTROLLER_VERSION[] = "0.3.0";
Expand Down
13 changes: 13 additions & 0 deletions test/SD.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#include <Arduino.h>
#include <ArduinoUnitTests.h>

#include "TankControllerLib.h"

unittest(test) {
TankControllerLib* tank = TankControllerLib::instance();
SDClass_TC* sd = SDClass_TC::instance();
assertTrue(tank != nullptr);
assertTrue(sd != nullptr);
}

unittest_main()