Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Libhal 2.0 port science #114

Merged
merged 135 commits into from
Jan 30, 2024
Merged

Libhal 2.0 port science #114

merged 135 commits into from
Jan 30, 2024

Conversation

Viha123
Copy link
Contributor

@Viha123 Viha123 commented Jan 23, 2024

This branch not only ports the entire science subsystem to the updated Libhal-2.0 code architecture. We have also added multiple demos for sensors that may be useful in this science competition or in the future. The demos and drivers included are:

  1. Pressure Sensor (@andrew-bork )
  2. CO2 Sensor Driver (@MichaelYKersey and @Kirthika-Ashokkumar )
  3. Color Sensor Driver (@Viha123 )
  4. LED strips for the Beacon (@andrew-bork )
  5. Soil Sensor Driver (@andrew-bork )

Coreyboy1820 and others added 30 commits July 4, 2023 15:25
@Coreyboy1820
🚧 working on porting to 2.0, started base file structure
b3cf470
@Coreyboy1820
started porting to libhal prebuilts
c491d15
@Coreyboy1820
working on port
de04b29
@Coreyboy1820
Nearly finished up the init platform. Will work on mc next
4c3b370
@Coreyboy1820
✨ finished the initalizing platform
6336afe
@Coreyboy1820
✨ 🚧 finished converting all the basic logic to libhal2.0
b06e2b2
@Coreyboy1820
:constructions: nealy finished mission control implementation
24f6c90
@Coreyboy1820
🚧 finished adding mission control just need to fix errors
c6f2dbf
@Coreyboy1820
This is before I switch all of the pairs to using pointers
68d8825
@Coreyboy1820
✨ finished switching the servos over to offset homing
ee8c8be
@Coreyboy1820
✨ finished changing from shared pointers to regular pointers, then al…
9e25e2f 
…lowing for multiple legs to be used in the control loop
@Coreyboy1820
updated the mission control
90cfa27
@Coreyboy1820
✨ changed homing function to be a template function so it no longer n…
0b156d9 
…eeds pairs when passing in legs.
@Coreyboy1820
✨ switched away from int to size_t
f805225
@Coreyboy1820
✨ finished switching from templates
fd323b2
@Coreyboy1820
✨updated code to use homing structs instead of passing in seperate ma…
686776e 
…gnets, homed booleans, and servos while matching them
@Coreyboy1820
🐛finished testing and slight bug fixing
b5bf910
@Coreyboy1820
fixed arm to build succesfully
5307bd8
@Viha123
untested stuff to get commands
5f7de42
@Viha123
fixing bugs drive esp
050fbda
@Coreyboy1820
:bandaid: fixed project name in cmake
c42cdb5
@Coreyboy1820
🚧 finished testing for the day
9230c83
@Coreyboy1820
Fixed main part of code
49b5fbe
@Coreyboy1820
found issue with version numbers
b5a0ca1
@Coreyboy1820
🚧 ✨ got code to cycle through but the floats are outputting weird num…
f2f7691 
…bers. Need to test in person
@Coreyboy1820
✨ reverted back to using hardware and not print implementations
28852a0
@Coreyboy1820
✨ added floating point support in cmake
ad92cc7
@Coreyboy1820
Merge branch 'libhal2.0-port-reverting-to-hardware' into libhal2.0-port
ef9a7bd
@FluffyFTW
builds lmao
f0d9dfe
@Coreyboy1820
Parsing commands currently works, just need to work out a bug which c…
ada2831 
…loses the connection
Kirthika Ashokkumar and others added 22 commits January 6, 2024 16:16
Finished basic setting functions have not tested set_settings
ff6590d
@andrew-bork
added soil_sensor_demo to science demos cmake
55c6a95
@andrew-bork
Created soil sensor demo
ece3aa5
@andrew-bork
Added untested warnings
b5c4a48
@andrew-bork
Fixed default parameters and scaling factors for sensor functions
f7a0cc3
@Viha123
deleeted extra files and color sensor works kind of, will need to buy…
a997978 
… another sensor to cross reference
@MichaelYKersey
Seprate scd40 crc method into generate and validate
8f55fe7
Chages finally committed
f36f904
merge conflict somewhat resolved
30eddd2
@MichaelYKersey
Merge branch 'libhal-2.0-port-science' into scd40-driver-libhal-2.0
7494a44
Gave option to set some of the settings
846f0e7
@MichaelYKersey
Create blank perstaltic-pump.cpp & .hpp
cdd5259
data type of settings and read_data channged from double to float
d9f7fa4
@andrew-bork
Created Light Strip Driver
2e69bda
@andrew-bork
Create led strip driver
ec48887
@andrew-bork
Updated driver with lights array seperated
3ea6fbe
@Viha123
Merge pull request #108 from SJSURoboticsTeam/scd40-driver-libhal-2.0
a47c064 
Scd40 driver libhal-science-2.0
@Viha123
Merge branch 'libhal-2.0-port-science' into sk922-led-strip-driver
f228532
@Viha123
Merge pull request #112 from SJSURoboticsTeam/sk922-led-strip-driver
5d3fd83 
Sk922 led strip driver
@Viha123
Merge branch 'libhal-2.0-port-science' into soil-sensor-driver
faa8a63
@Viha123
Merge pull request #113 from SJSURoboticsTeam/soil-sensor-driver
75a1a0d 
Soil sensor driver
@Viha123
Merge branch 'main' into libhal-2.0-port-science
ee08e0e
kammce
kammce requested changes Jan 23, 2024
View reviewed changes
Copy link
Contributor

@kammce kammce left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why does this commit make changes to the drive code?

@Viha123
Copy link
Contributor Author

Viha123 commented Jan 24, 2024

Why does this commit make changes to the drive code?

I think I initially branched it off of the drive port branch because that had the latest stuff at the time

Coreyboy1820
Coreyboy1820 requested changes Jan 29, 2024
View reviewed changes
Copy link
Contributor

@Coreyboy1820 Coreyboy1820 left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Get this pr to pass all tests before merging. @Viha123

@Coreyboy1820
Copy link
Contributor

@kammce are all of these commits from previous branches due to the fact that this was rebased instead of merged when trying to update the branch to main?

@Viha123 Viha123 merged commit 474c4cf into main Jan 30, 2024
3 checks passed
@Viha123 Viha123 deleted the libhal-2.0-port-science branch February 2, 2024 16:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Coreyboy1820 Coreyboy1820 Coreyboy1820 requested changes

@kammce kammce kammce requested changes

Assignees
No one assigned
Labels
None yet
Projects
No open projects
Arm System
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Viha123 @Coreyboy1820 @kammce @FluffyFTW @MichaelYKersey @andrew-bork