Anson/Lander-Embedded
1
0
Fork 0
mirror of https://gitlab.com/lander-team/lander-cpp.git synced 2025-07-23 14:41:25 +00:00
Code Releases Activity

now reading from load cells each loop

Browse Source
This commit is contained in:
Anson Biggs
2021-11-13 11:17:44 -07:00
parent 069ab2a9e4
commit b9c2e7fb35
3 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
include/LoadCells.h
View File

@@ -2,20 +2,22 @@
#include <HX711.h>
struct LoadCells {
HX711 loadcell_0;
HX711 loadcell_1;
HX711 loadcell_2;
HX711 loadcell_3;
HX711 lc0;
HX711 lc1;
HX711 lc2;
HX711 lc3;
double lc0Value;
double lc1Value;
double lc2Value;
double lc3Value;
// Current calibrated value
double lc0Val;
double lc1Val;
double lc2Val;
double lc3Val;
double lc0Calibration;
double lc1Calibration;
double lc2Calibration;
double lc3Calibration;
// Calibration offset
double lc0Cal;
double lc1Cal;
double lc2Cal;
double lc3Cal;
};
double loadCellCalibrate(HX711 loadCell) {
@@ -28,10 +30,9 @@ double loadCellCalibrate(HX711 loadCell) {
return loadTotal / 10.0;
}
void init_LoadCells(LoadCells &loadCells) {
loadCells.lc0Calibration = loadCellCalibrate(loadCells.loadcell_0);
loadCells.lc1Calibration = loadCellCalibrate(loadCells.loadcell_1);
loadCells.lc2Calibration = loadCellCalibrate(loadCells.loadcell_2);
loadCells.lc3Calibration = loadCellCalibrate(loadCells.loadcell_3);
void update_LoadCells(LoadCells &loadCells) {
loadCells.lc0Val = loadCells.lc0.read();
loadCells.lc1Val = loadCells.lc1.read();
loadCells.lc2Val = loadCells.lc2.read();
loadCells.lc3Val = loadCells.lc3.read();
}

5
include/teensy.h
View File

@@ -14,7 +14,6 @@ void teensyAbort();
const int chipSelect = BUILTIN_SDCARD;
File dataFile;
void initFile() {
Serial.print("Initializing SD card...");
@@ -102,8 +101,8 @@ void processTVC(Vehicle &State, LoadCells &loadCells) {
// Vector math to aqcuire thrust vector components
// PLACEHOLDER PLACEHOLDERPLACEHOLDER PLACEHOLDERPLACEHOLDER
// PLACEHOLDERPLACEHOLDER PLACEHOLDERPLACEHOLDER PLACEHOLDER
State.Fx = loadCells.lc1Value + loadCells.lc2Value;
State.Fy = loadCells.lc0Value + loadCells.lc3Value;
State.Fx = loadCells.lc1Val + loadCells.lc2Val;
State.Fy = loadCells.lc0Val + loadCells.lc3Val;
State.Fz = sqrt(pow(State.thrust, 2) - pow(State.Fx, 2) - pow(State.Fy, 2)) +
(State.mass * g);