|
|
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 |
|
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 |
|
bpmcgeeney
|
cce72b9114
|
Initial test function, still needs to be run on teensy to verify
|
2021-11-04 15:56:55 -07:00 |
|
|
|
15b3cf04fd
|
Merge branch 'make-teensy-compile' into 'main'
Make teensy compile
See merge request lander-team/lander-cpp!19
|
2021-11-04 19:46:10 +00:00 |
|
|
|
b9ccfd110e
|
Make teensy compile
|
2021-11-04 19:46:10 +00:00 |
|
|
|
ce4cbff8bd
|
ignore files managed by PIO
|
2021-11-03 20:02:35 -07:00 |
|
|
|
c0bd8128fe
|
Merge branch 'platformio-stuff' into 'main'
Platformio stuff
See merge request lander-team/lander-cpp!18
|
2021-11-04 02:58:49 +00:00 |
|
|
|
5abdc75c81
|
Platformio stuff
|
2021-11-04 02:58:49 +00:00 |
|
|
|
0d3c0a9d1c
|
Merge branch 'loadCellCalibrate' into 'main'
Load cell calibrate
See merge request lander-team/lander-cpp!16
|
2021-11-03 22:44:24 +00:00 |
|
|
|
a129221588
|
Load cell calibrate
|
2021-11-03 22:44:23 +00:00 |
|
|
|
50dd49481a
|
Merge branch '25-separate-native-and-teensy-code' into 'main'
Resolve "Separate native and teensy code"
Closes #25
See merge request lander-team/lander-cpp!14
|
2021-11-03 22:33:10 +00:00 |
|
|
|
66590a33fe
|
Resolve "Separate native and teensy code"
|
2021-11-03 22:33:10 +00:00 |
|
|
|
ad602ca834
|
Only build Julia plots for main since they take forever.
|
2021-11-03 19:31:48 +00:00 |
|
Matthew Robinaugh
|
326b5592f6
|
Added -wall to tasks.json
|
2021-11-02 18:24:51 -07:00 |
|
|
|
378c6d8014
|
Merge branch 'main' of gitlab.com:lander-team/lander-cpp
|
2021-10-20 13:43:44 -07:00 |
|
|
|
656ce8ed8d
|
fix being able to build from any file
|
2021-10-20 13:43:40 -07:00 |
|
|
|
30cef521c0
|
fix units
|
2021-10-19 17:50:18 +00:00 |
|
|
|
1746f670a9
|
Merge branch '21-prettier-plots' into 'main'
Resolve "prettier plots"
Closes #21
See merge request lander-team/lander-cpp!10
|
2021-10-19 16:29:04 +00:00 |
|
|
|
c73fc0fd7c
|
Resolve "prettier plots"
|
2021-10-19 16:29:04 +00:00 |
|
bpmcgeeney
|
cebccecf2b
|
Fixed logging errors
|
2021-10-18 15:22:40 -07:00 |
|
|
|
c3f3c34c5b
|
remove columns in csv header !9
|
2021-10-15 14:37:03 -07:00 |
|
|
|
a7de8b71a3
|
Merge branch 'main' of gitlab.com:lander-team/lander-cpp
|
2021-10-15 14:31:46 -07:00 |
|
|
|
64a50b97e0
|
change to new delim !9
|
2021-10-15 14:31:41 -07:00 |
|
Brendan McGeeney
|
d28fe808dd
|
Merge branch '20-not-writing-csv-data-for-every-column' into 'main'
Resolve "Not writing CSV data for every column"
Closes #20
See merge request lander-team/lander-cpp!9
|
2021-10-15 20:07:43 +00:00 |
|
bpmcgeeney
|
2f4a9044ef
|
Added thrust logging, deleted deriv column along with spaces in csv file
|
2021-10-15 13:04:46 -07:00 |
|
Brendan McGeeney
|
016ddc1261
|
Merge branch '11-servos-need-a-rate-limitation' into 'main'
Resolve "Servos need a rate limitation"
Closes #11
See merge request lander-team/lander-cpp!8
|
2021-10-15 19:49:45 +00: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 |
|
