Anson/Lander-Embedded
1
0
Fork 0
mirror of https://gitlab.com/lander-team/lander-cpp.git synced 2025-06-16 15:17:23 +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
Show Stats 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> #include <HX711.h>
struct LoadCells { struct LoadCells {
HX711 loadcell_0; HX711 lc0;
HX711 loadcell_1; HX711 lc1;
HX711 loadcell_2; HX711 lc2;
HX711 loadcell_3; HX711 lc3;
double lc0Value; // Current calibrated value
double lc1Value; double lc0Val;
double lc2Value; double lc1Val;
double lc3Value; double lc2Val;
double lc3Val;
double lc0Calibration; // Calibration offset
double lc1Calibration; double lc0Cal;
double lc2Calibration; double lc1Cal;
double lc3Calibration; double lc2Cal;
double lc3Cal;
}; };
double loadCellCalibrate(HX711 loadCell) { double loadCellCalibrate(HX711 loadCell) {
@ -28,10 +30,9 @@ double loadCellCalibrate(HX711 loadCell) {
return loadTotal / 10.0; return loadTotal / 10.0;
} }
void init_LoadCells(LoadCells &loadCells) { void update_LoadCells(LoadCells &loadCells) {
loadCells.lc0Val = loadCells.lc0.read();
loadCells.lc0Calibration = loadCellCalibrate(loadCells.loadcell_0); loadCells.lc1Val = loadCells.lc1.read();
loadCells.lc1Calibration = loadCellCalibrate(loadCells.loadcell_1); loadCells.lc2Val = loadCells.lc2.read();
loadCells.lc2Calibration = loadCellCalibrate(loadCells.loadcell_2); loadCells.lc3Val = loadCells.lc3.read();
loadCells.lc3Calibration = loadCellCalibrate(loadCells.loadcell_3);
} }

5
include/teensy.h
View File

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

18
src/main.cpp
View File

@ -58,6 +58,17 @@ void setup() {
pinMode(lc_data_1, INPUT); pinMode(lc_data_1, INPUT);
pinMode(lc_data_2, INPUT); pinMode(lc_data_2, INPUT);
pinMode(lc_data_3, INPUT); pinMode(lc_data_3, INPUT);
loadCells.lc0.begin(lc_data_0, lc_clock);
loadCells.lc1.begin(lc_data_1, lc_clock);
loadCells.lc2.begin(lc_data_2, lc_clock);
loadCells.lc3.begin(lc_data_3, lc_clock);
Serial.println("Load Cells Initialized");
loadCells.lc0Cal = loadCellCalibrate(loadCells.lc0);
loadCells.lc1Cal = loadCellCalibrate(loadCells.lc1);
loadCells.lc2Cal = loadCellCalibrate(loadCells.lc2);
loadCells.lc3Cal = loadCellCalibrate(loadCells.lc3);
Serial.println("Load Cells Calibrated");
delay(1000); delay(1000);
init_Vehicle(State); init_Vehicle(State);
@ -69,8 +80,6 @@ void setup() {
Serial.println("Starting Height Calculated"); Serial.println("Starting Height Calculated");
delay(1000); delay(1000);
init_LoadCells(loadCells);
Serial.println("Load Cells Calibrated"); Serial.println("Load Cells Calibrated");
delay(1000); delay(1000);
initFile(); initFile();
@ -103,6 +112,7 @@ void loop() {
void loop() { void loop() {
last = micros(); last = micros();
update_LoadCells(loadCells);
vehicleDynamics(State, PrevState); vehicleDynamics(State, PrevState);
thrustInfo(State); thrustInfo(State);
pidController(State, PrevState); pidController(State, PrevState);
@ -111,8 +121,8 @@ void loop() {
processTVC(State, loadCells); processTVC(State, loadCells);
State.stepDuration = micros() - last; State.stepDuration = micros() - last;
write2CSV(State, loadCells.lc0Value, loadCells.lc1Value, loadCells.lc2Value, write2CSV(State, loadCells.lc0Val, loadCells.lc1Val, loadCells.lc2Val,
loadCells.lc3Value); loadCells.lc3Val);
// Set "prev" values for next timestep // Set "prev" values for next timestep
PrevState = State; PrevState = State;