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

Nano33 apds9960 #2091

Merged
merged 25 commits into from Sep 29, 2020
Merged

Nano33 apds9960 #2091

merged 25 commits into from Sep 29, 2020

Conversation

arjundeopujari
Copy link
Contributor

Pull Request Overview

Part of #1977

Adds proximity sensor interface and driver for Apds9960 chip for Nano33ble board.
Hil Design:
- proximity.rs sensor interface:
read_proximity()
read_proximity_on_interrupt(low,high)

- Files added:
     proximity.rs (sensor - userland interface)
     apds9960.rs (IC driver)

Testing Strategy

Tested with corresponding libtock-c app for proximity sensor.

TODO or Help Wanted

N/A

Documentation Updated

  • Updated the relevant files in /docs, or no updates are required.

Formatting

  • Ran make prepush.

arjundeopujari and others added 17 commits July 6, 2020 15:43
@arjundeopujari @bradjc
Finish APDS9960 implementation
b951c12
@bradjc
nano33: add apds9960 to board file
57fcb07
@bradjc
debugging, add id get
5d7be2d 
proximity in loop
@arjundeopujari
Add persistence to apds-9960
667a6da
@arjundeopujari
APDS-9960 Driver: Add proximity gain setter and remove endless interr…
4f6d9b1 
…upt loop for take_measurement()
@arjundeopujari
Add take_measurement() to hil proximity interface
82a8fbe
@arjundeopujari
Take out HIGH_THRESH and LOW_THRESH
aa0f213
@arjundeopujari
Implement proximity.rs
03c0d80
@arjundeopujari
Add callbacks to proximityGain() and interruptthresholds commands
c4e425a
@arjundeopujari
Change Driver::NUM::Proximity
5355e4b
@arjundeopujari
Change user proximity interface
d44b634
@arjundeopujari
Clean up proximity.rs logic
8a5dd23
@arjundeopujari
Nano33ble main.rs: Add init and code for the apds9960 proximity sensor
9b099d4
@arjundeopujari
Clean up code
52a1e37
@arjundeopujari
Fix apds9960.take_measurement()
41e55d5
@arjundeopujari
Delete superfluous debug statements
e64830e
@arjundeopujari
cargo fmt
b05f71c
hudson-ayers
hudson-ayers requested changes Sep 8, 2020
View reviewed changes
Copy link
Contributor

@hudson-ayers hudson-ayers left a comment

Choose a reason for hiding this comment

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

Thanks for this very nice contribution! Looking forward to having robust sensor support for the nano33!

I reviewed everything except the apds9960 capsule, and have a few comments throughout.

kernel/src/hil/sensors.rs Outdated Show resolved Hide resolved
kernel/src/hil/sensors.rs Outdated Show resolved Hide resolved
kernel/src/hil/sensors.rs Outdated Show resolved Hide resolved
capsules/src/proximity.rs Show resolved Hide resolved
capsules/src/proximity.rs Outdated Show resolved Hide resolved
capsules/src/proximity.rs Outdated Show resolved Hide resolved
capsules/src/proximity.rs Outdated Show resolved Hide resolved
capsules/src/driver.rs Outdated Show resolved Hide resolved
boards/nano33ble/src/main.rs Outdated Show resolved Hide resolved
boards/nano33ble/src/main.rs Outdated Show resolved Hide resolved
hudson-ayers
hudson-ayers reviewed Sep 22, 2020
View reviewed changes
kernel/src/hil/sensors.rs Outdated Show resolved Hide resolved
capsules/src/proximity.rs Outdated Show resolved Hide resolved
hudson-ayers
hudson-ayers reviewed Sep 22, 2020
View reviewed changes
capsules/src/proximity.rs Outdated Show resolved Hide resolved
capsules/src/proximity.rs Outdated Show resolved Hide resolved
capsules/src/proximity.rs Outdated Show resolved Hide resolved
capsules/src/apds9960.rs Outdated Show resolved Hide resolved
capsules/src/proximity.rs Show resolved Hide resolved
hudson-ayers
hudson-ayers reviewed Sep 22, 2020
View reviewed changes
Copy link
Contributor

@hudson-ayers hudson-ayers left a comment

Choose a reason for hiding this comment

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

A few more comments, this is looking close.

hudson-ayers
hudson-ayers previously approved these changes Sep 24, 2020
View reviewed changes
@bradjc
Copy link
Contributor

bradjc commented Sep 25, 2020

It looks like something in upstream tock changed along the way. Look at https://github.com/tock/tock/blob/master/capsules/src/fxos8700cq.rs#L181 for an example how to address the build errors.

@arjundeopujari
Copy link
Contributor Author

@hudson-ayers @bradjc Sorry for the commotion there. Ill remember to merge more often for my later works and run the ci jobs locally ahead of time. It should be good to go here.

@bradjc bradjc added last-call Final review period for a pull request. HIL This affects a Tock HIL interface. labels Sep 28, 2020
ppannuto
ppannuto approved these changes Sep 28, 2020
View reviewed changes
Copy link
Member

@ppannuto ppannuto left a comment

Choose a reason for hiding this comment

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

Just looked at HIL, looks good

@bradjc
Copy link
Contributor

bradjc commented Sep 29, 2020

bors r+

@bors
Copy link
Contributor

bors bot commented Sep 29, 2020

Build succeeded:

@bors bors bot merged commit 2acd4c5 into tock:master Sep 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ppannuto ppannuto ppannuto approved these changes

@bradjc bradjc bradjc approved these changes

@hudson-ayers hudson-ayers hudson-ayers approved these changes

Assignees
No one assigned
Labels
HIL This affects a Tock HIL interface. last-call Final review period for a pull request.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@arjundeopujari @bradjc @ppannuto @hudson-ayers