1
0
mirror of https://gitlab.com/lander-team/lander-cpp.git synced 2025-06-16 15:17:23 +00:00

59 Commits

Author SHA1 Message Date
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
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
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
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
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
4ef7619217 compiling 😆 2021-11-12 13:35:06 -07: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
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
7cffb33ff1 donezo 2021-11-08 13:54:12 -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
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
bpmcgeeney
c06693e6aa added back delay at the end of the sim 2021-11-04 17:51:52 -07:00
bpmcgeeney
05663a5ac7 fixed file open error, it works! 2021-11-04 17:41:20 -07:00
b9ccfd110e Make teensy compile 2021-11-04 19:46:10 +00:00
5abdc75c81 Platformio stuff 2021-11-04 02:58:49 +00:00
66590a33fe Resolve "Separate native and teensy code" 2021-11-03 22:33:10 +00:00
bpmcgeeney
cebccecf2b Fixed logging errors 2021-10-18 15:22:40 -07:00
bpmcgeeney
b0a94c663d Servo rate limiting implemented with a new limit function 2021-10-15 12:44:37 -07:00
bpmcgeeney
59345992db Adding back PID gains since they didn't survive the merge for some reason 2021-10-14 18:25:33 -07:00
14d68f852c Merge branch 'main' of gitlab.com:lander-team/lander-cpp 2021-10-14 18:14:22 -07:00
b30154a62d Resolve "More verbose simulation results" 2021-10-14 18:14:13 +00:00
bpmcgeeney
591ddc77e4 started debugging 2021-10-11 11:30:51 -07:00
bpmcgeeney
1b13a88c7d more cleanup 2021-09-21 22:14:10 -07:00
bpmcgeeney
9eb9bce77c Cleaned up PID 2021-09-21 21:42:18 -07:00
acf37e4b65 Revert "Resolved #7 - added inputs.csv for initial conditions"
This reverts commit ee67077664c5f25c4b0b4b0f31f0dbb5f98a1d52
2021-09-20 22:03:04 +00:00
bpmcgeeney
382566a8da changed up vehicle dynamics in accordance with simulink changes 2021-09-20 11:35:11 -07:00
bpmcgeeney
768bcb7964 Initial Pass, still lots of bugs to fix 2021-09-20 10:34:20 -07:00
bpmcgeeney
ee67077664 Resolved #7 - added inputs.csv for initial conditions 2021-09-18 16:26:54 -07:00
d7425c9d09 bandaid ci until I know a real fix 2021-09-17 14:28:55 -07:00
67917edb90 Closes #9 2021-09-17 13:24:38 -07:00
ea6045b0d1 make sim output more interesting 2021-09-17 13:20:54 -07:00
bpmcgeeney
61a82eb579 Resolved #3 2021-09-17 12:53:59 -07:00
bpmcgeeney
fdddd1f741 implemented new criteria for stopping simulation as well as a failure/success message 2021-09-15 19:56:35 -07:00
61a2ca3676 Resolve "Relocate Initial Conditions" 2021-09-16 01:17:58 +00:00
a8019c6dc8 addressed in gitlab issues 2021-09-15 14:46:17 -07:00
bpmcgeeney
16d0ddc60b added #define for M_PI as well as a few TODO's 2021-09-14 22:17:03 -07:00
952ffaac4e lots of code cleanup and variable renaming 2021-09-13 14:22:57 -07:00