|
|
7a523bab6d
|
Merge branch '36-move-init_loadcells-to-teensy-h' into 'main'
Resolve "Move init_loadCells() to teensy.h"
Closes #36
See merge request lander-team/lander-cpp!28
|
2021-11-22 19:55:20 +00:00 |
|
Brendan McGeeney
|
9442884d44
|
Resolve "Move init_loadCells() to teensy.h"
|
2021-11-22 19:55:19 +00:00 |
|
Brendan McGeeney
|
8054e26857
|
Merge branch '36-move-init_loadcells-to-teensy-h' into 'main'
Resolve "Move init_loadCells() to teensy.h"
Closes #36
See merge request lander-team/lander-cpp!26
|
2021-11-15 03:39:27 +00:00 |
|
bpmcgeeney
|
6a4437614e
|
added read_lc declaration back in main.cpp
|
2021-11-14 20:34:47 -07:00 |
|
bpmcgeeney
|
503bf40c5b
|
Moved init_loadCells() to teensy.h
|
2021-11-14 20:31:17 -07:00 |
|
Brendan McGeeney
|
f7acf25479
|
Merge branch '31-avionics-integration-test' into 'main'
Resolve "Avionics Integration Test"
Closes #31
See merge request lander-team/lander-cpp!25
|
2021-11-15 00:21:42 +00:00 |
|
|
|
62d8a37517
|
Merge branch '31-avionics-integration-test' of gitlab.com:lander-team/lander-cpp into 31-avionics-integration-test
|
2021-11-14 17:13:56 -07:00 |
|
|
|
8528b028e5
|
keep platforms the same
|
2021-11-14 17:13:49 -07:00 |
|
bpmcgeeney
|
5a99508761
|
More robust gimbal test function, delay based on step size of Sim
|
2021-11-14 17:10:58 -07:00 |
|
bpmcgeeney
|
e6f7e4c160
|
Formal build for Avionics Integration Test
|
2021-11-14 16:41:25 -07:00 |
|
bpmcgeeney
|
82e43b1fe8
|
Added test gimbal function
|
2021-11-14 14:23:28 -07:00 |
|
bpmcgeeney
|
8fa9dba55e
|
Integrated servos, just neefds to be slowed down now
|
2021-11-14 13:59:51 -07:00 |
|
|
|
d487d6d30a
|
should make sure code compiles before pushing
|
2021-11-14 10:33:16 -07:00 |
|
|
|
0f3e267af8
|
organized main
|
2021-11-14 10:32:04 -07:00 |
|
|
|
812f62f22a
|
load cell integration
|
2021-11-13 14:48:12 -07:00 |
|
Matthew Robinaugh
|
c05bbb6845
|
Merge branch '31-avionics-integration-test' of gitlab.com:lander-team/lander-cpp into 31-avionics-integration-test
|
2021-11-13 11:32:49 -07:00 |
|
Matthew Robinaugh
|
717bb92678
|
Update lc values to be calibrated and vector math
|
2021-11-13 11:32:42 -07:00 |
|
|
|
47e8042a57
|
cleaned write2csv
|
2021-11-13 11:25:44 -07:00 |
|
|
|
b9c2e7fb35
|
now reading from load cells each loop
|
2021-11-13 11:17:44 -07:00 |
|
|
|
069ab2a9e4
|
extra code
|
2021-11-12 15:54:34 -07:00 |
|
|
|
554f0fdc53
|
Merge branch '31-avionics-integration-test' of gitlab.com:lander-team/lander-cpp into 31-avionics-integration-test
|
2021-11-12 15:52:26 -07:00 |
|
|
|
a6dcb6863f
|
added load cells to csv
|
2021-11-12 15:47:27 -07:00 |
|
Matthew Robinaugh
|
f32bf60c72
|
Merge branch '31-avionics-integration-test' of gitlab.com:lander-team/lander-cpp into 31-avionics-integration-test
|
2021-11-12 15:34:28 -07:00 |
|
|
|
289f2e7a43
|
Merge branch '31-avionics-integration-test' into 'main'
Print Timing Info
See merge request lander-team/lander-cpp!24
|
2021-11-12 22:23:30 +00:00 |
|
Brendan McGeeney
|
4594c87fe6
|
Print Timing Info
|
2021-11-12 22:23:30 +00:00 |
|
bpmcgeeney
|
03c5b6d16f
|
printing timing info
|
2021-11-12 15:05:03 -07:00 |
|
|
|
e9d8063604
|
Merge branch '22-make-function-to-turn-test-stand-load-cells-into-thrust-vector' into 'main'
Resolve "Make function to turn test stand load cells into thrust vector"
Closes #22
See merge request lander-team/lander-cpp!17
|
2021-11-12 20:51:20 +00:00 |
|
|
|
175c5a0b41
|
initialize loadTotal
|
2021-11-12 13:50:26 -07:00 |
|
|
|
f7c34b6c8c
|
Merge branch 'main' into '22-make-function-to-turn-test-stand-load-cells-into-thrust-vector'
# Conflicts:
# .vscode/extensions.json
# include/teensy.h
# src/main.cpp
|
2021-11-12 20:46:35 +00:00 |
|
|
|
2a0426334d
|
load cells dont run on native
|
2021-11-12 13:38:06 -07:00 |
|
|
|
4ef7619217
|
compiling 😆
|
2021-11-12 13:35:06 -07:00 |
|
Brendan McGeeney
|
8ec17dd820
|
Merge branch '27-fix-simulation-on-teensy' into 'main'
Resolve "Fix SImulation on Teensy"
Closes #27
See merge request lander-team/lander-cpp!23
pre-integration
|
2021-11-12 19:26:58 +00:00 |
|
Brendan McGeeney
|
1e4ee942e2
|
Merge branch 'main' into '27-fix-simulation-on-teensy'
# Conflicts:
# src/main.cpp
|
2021-11-12 19:23:05 +00:00 |
|
bpmcgeeney
|
0058af9667
|
Fixed differences between native and teensy, added getThrust() function to clean up thrustInfo()
|
2021-11-11 21:58:57 -07:00 |
|
Matthew Robinaugh
|
01cf0966f2
|
Initialize load cell values
|
2021-11-10 14:42:57 -07:00 |
|
|
|
f0577a8fce
|
outfile now has more precision
|
2021-11-10 14:42:47 -07:00 |
|
Matthew Robinaugh
|
1ec624cc55
|
Update to load cell calibration and initialize lc
|
2021-11-10 14:36:31 -07:00 |
|
Matthew Robinaugh
|
541d7f4281
|
Added Struct for load cells
|
2021-11-08 15:37:56 -07:00 |
|
bpmcgeeney
|
87fb8f8621
|
fixed, gonna make some more changes to make sure we're utilizing our whole burn
|
2021-11-08 14:43:52 -07:00 |
|
|
|
851edaa361
|
Merge branch '26-simulation-abort-indication' into 'main'
Resolve "Simulation Abort Indication"
Closes #26
See merge request lander-team/lander-cpp!22
|
2021-11-08 21:05:00 +00:00 |
|
|
|
7cffb33ff1
|
donezo
|
2021-11-08 13:54:12 -07:00 |
|
Brendan McGeeney
|
fe1a5b9bc0
|
Merge branch '28-increment-file-name-on-sd-card' into 'main'
Resolve "Increment File Name on SD Card"
Closes #28
See merge request lander-team/lander-cpp!21
|
2021-11-08 20:37:19 +00:00 |
|
|
|
4f44788038
|
no longer angry
|
2021-11-08 13:31:49 -07:00 |
|
bpmcgeeney
|
cce451f069
|
its angry
|
2021-11-08 11:19:06 -07:00 |
|
Brendan McGeeney
|
995d856d08
|
Merge branch '15-integrate-with-sd-card' into 'main'
Resolve "Integrate with SD Card"
Closes #15
See merge request lander-team/lander-cpp!20
|
2021-11-05 21:00:43 +00:00 |
|
bpmcgeeney
|
9bce55f7af
|
fixed time duration display
|
2021-11-05 13:58:27 -07:00 |
|
Matthew Robinaugh
|
3eb9369371
|
Fixed Linux build error
|
2021-11-05 13:32:15 -07:00 |
|
|
|
48c1059c0a
|
fixed outVector size and removed teensy
|
2021-11-05 06:04:30 -07:00 |
|
bpmcgeeney
|
897b5c1d7d
|
outvector struct now only created when building native
|
2021-11-04 21:56:39 -07:00 |
|
bpmcgeeney
|
a305b9599e
|
Now printing entire sim to simOut.csv on SD card
|
2021-11-04 21:24:55 -07:00 |
|
