Anson/Lander-Embedded
1
0
Fork 0
mirror of https://gitlab.com/lander-team/lander-cpp.git synced 2025-06-16 07:06:51 +00:00
Code Releases Activity

Merge branch '28-increment-file-name-on-sd-card' into 'main'

Browse Source 
Resolve "Increment File Name on SD Card"

Closes #28

See merge request lander-team/lander-cpp!21
This commit is contained in:
Brendan McGeeney 2021-11-08 20:37:19 +00:00
commit fe1a5b9bc0
2 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.vscode/settings.json vendored
View File

@ -45,7 +45,8 @@
"string": "cpp", "string": "cpp",
"chrono": "cpp", "chrono": "cpp",
"ratio": "cpp", "ratio": "cpp",
"thread": "cpp" "thread": "cpp",
"string_view": "cpp"
}, },
"C_Cpp.clang_format_fallbackStyle": "LLVM", "C_Cpp.clang_format_fallbackStyle": "LLVM",
"editor.formatOnSave": true, "editor.formatOnSave": true,

46
include/teensy.h
View File

@ -1,5 +1,4 @@
#include "Vehicle.h" #include "Vehicle.h"
#include <Arduino.h> #include <Arduino.h>
#include <SD.h> #include <SD.h>
#include <SPI.h> #include <SPI.h>
@ -35,20 +34,43 @@ void initFile() {
} }
Serial.println("Card initialized."); Serial.println("Card initialized.");
// Delete any previous existing files int i = 1;
Serial.print("simOut_" + String(i) + ".csv");
const char *fileName;
if (SD.exists("simOut.csv")) { if (SD.exists("simOut.csv")) {
SD.remove("simOut.csv"); while (i > 0) {
} fileName = ("simOut_" + String(i) + ".csv").c_str();
// Open simOut.csv if (!SD.exists(fileName)) {
dataFile = SD.open("simOut.csv", FILE_WRITE); // Open simOut_i.csv
if (dataFile) { dataFile = SD.open(fileName, FILE_WRITE);
Serial.println("File successfully opened!");
if (dataFile) {
Serial.println("File successfully opened!");
} else {
// if the file didn't open, print an error:
Serial.println("Error opening output file. \n\nABORTING SIMULATION");
teensyAbort();
}
i = 0;
} else {
i++;
}
}
} else { } else {
// if the file didn't open, print an error: // Open simOut.csv
Serial.println("Error opening simOut.csv. \n\nABORTING SIMULATION"); dataFile = SD.open("simOut.csv", FILE_WRITE);
teensyAbort(); if (dataFile) {
Serial.println("File successfully opened!");
} else {
// if the file didn't open, print an error:
Serial.println("Error opening output file. \n\nABORTING SIMULATION");
teensyAbort();
}
} }
// File Header // File Header
@ -176,7 +198,7 @@ void printSimResults(Vehicle &State) {
State.yaw = State.yaw * 180 / M_PI; State.yaw = State.yaw * 180 / M_PI;
State.pitch = State.pitch * 180 / M_PI; State.pitch = State.pitch * 180 / M_PI;
State.roll = State.roll * 180 / M_PI; State.roll = State.roll * 180 / M_PI;
double landing_angle = double landing_angle =
pow(State.yaw * State.yaw + State.pitch * State.pitch, .5); pow(State.yaw * State.yaw + State.pitch * State.pitch, .5);