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

New load cell calibration and exit condition

Browse Source
This commit is contained in:
bpmcgeeney 2021-11-23 11:59:58 -07:00
parent 54a0beae49
commit f9e7f8f283
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/teensy.h
View File

@ -35,10 +35,10 @@ const int pin_lc2 = 19; // White
const int pin_lc3 = 20; // Black const int pin_lc3 = 20; // Black
const int pin_igniter = 7; const int pin_igniter = 7;
double lcGain0 = -98.32; double lcGain0 = -107.39;
double lcGain1 = -97.59; double lcGain1 = -107.39;
double lcGain2 = -100.51; double lcGain2 = -107.39;
double lcGain3 = -118.65; double lcGain3 = -107.39;
// SD card stuff // SD card stuff
const int chipSelect = BUILTIN_SDCARD; const int chipSelect = BUILTIN_SDCARD;
@ -113,13 +113,13 @@ void initLoadCells(Vehicle &State) {
lc2.set_scale(); lc2.set_scale();
lc3.set_scale(); lc3.set_scale();
lc0.tare(50); lc0.tare(200);
Serial.print("."); Serial.print(".");
lc1.tare(50); lc1.tare(200);
Serial.print("."); Serial.print(".");
lc2.tare(50); lc2.tare(200);
Serial.println("."); Serial.println(".");
lc3.tare(50); lc3.tare(200);
// Attach ISRs to load cell data pins to read data when available // Attach ISRs to load cell data pins to read data when available
attachInterrupt(digitalPinToInterrupt(pin_lc0), read_lc0, LOW); attachInterrupt(digitalPinToInterrupt(pin_lc0), read_lc0, LOW);

2
src/main.cpp
View File

@ -75,7 +75,7 @@ void loop() {
PrevState = State; PrevState = State;
State.time += State.stepSize; State.time += State.stepSize;
if ((State.z < 0.0) && (State.thrustFiring == 2)) { if ((State.z < 0.0) ) {
analogWrite(pin_igniter, 0); analogWrite(pin_igniter, 0);
Serial.println("Run duration:" + String((micros() - initTime) / 1e6) + Serial.println("Run duration:" + String((micros() - initTime) / 1e6) +
" seconds"); " seconds");