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

Add support for Octo flow sensor #95

Merged
merged 9 commits into from
Mar 29, 2024
Merged

Add support for Octo flow sensor #95

merged 9 commits into from
Mar 29, 2024

Conversation

dflemstr
Copy link
Contributor

@dflemstr dflemstr commented Mar 29, 2024 •
edited by aleksamagicka
Loading

Adds support for the Octo flow sensor. I have tested with a real Octo device that's installed on my system, and compared the reported value to what the official Aquasuite app reports (which is easy to do by launching Aquasuite in a VM and re-directing the USB device to/from the VM quickly)

I'm not sure how the pulses ctrl register is supposed to work and how to test it reliably, so I copied over the behavior from Quadro for now. Any advice appreciated on how to test this interaction using my hardware!

I'll update docs and such once I have a better understanding of the ctrl register situation!

Fixes #6.

Checklist:

  • My code follows Linux code style guidelines
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have tested my changes on the affected device(s) - note on which
  • All exposed values are being read from the device

@dflemstr
Makefile: refactor somewhat to enable make arg propagation
6bb9bca 
Signed-off-by: David Flemström <david.flemstrom@gmail.com>
dflemstr
dflemstr commented Mar 29, 2024
View reviewed changes
aquacomputer_d5next.c Outdated Show resolved Hide resolved
@dflemstr
Add support for Octo flow sensor
60e8ed5 
Signed-off-by: David Flemström <david.flemstrom@gmail.com>
aleksamagicka
aleksamagicka requested changes Mar 29, 2024
View reviewed changes
Copy link
Owner

@aleksamagicka aleksamagicka left a comment

Choose a reason for hiding this comment

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

Thanks! Some comments enclosed, and docs should also be updated.

aquacomputer_d5next.c Outdated Show resolved Hide resolved
aquacomputer_d5next.c Outdated Show resolved Hide resolved
aquacomputer_d5next.c Outdated Show resolved Hide resolved
aquacomputer_d5next.c Show resolved Hide resolved
@dflemstr
Indent OCTO_FLOW_SENSOR_OFFSET
8a0ecce 
Signed-off-by: David Flemström <david.flemstrom@gmail.com>
@dflemstr
Convert if statement into switch on priv->kind
c32498f 
Signed-off-by: David Flemström <david.flemstrom@gmail.com>
@dflemstr
Remove dynamic_debug register hex dumps
1f2228f 
Signed-off-by: David Flemström <david.flemstrom@gmail.com>
@dflemstr
Indicate possibility that hwmon fan channel 9 might support pulses
6fa02de 
Signed-off-by: David Flemström <david.flemstrom@gmail.com>
aleksamagicka
aleksamagicka reviewed Mar 29, 2024
View reviewed changes
re-docs/PROTOCOLS.md Outdated Show resolved Hide resolved
@dflemstr
Document new flow sensor Octo registers
e61ebf2 
Signed-off-by: David Flemström <david.flemstrom@gmail.com>
@dflemstr
Add kernel docs entry for new fan9_pulses sysfs node
75318ec 
Signed-off-by: David Flemström <david.flemstrom@gmail.com>
@dflemstr
Mention flow sensor support for Octo in kernel docs
7bcca37 
Signed-off-by: David Flemström <david.flemstrom@gmail.com>
@aleksamagicka aleksamagicka merged commit 60a2270 into aleksamagicka:main Mar 29, 2024
3 checks passed
@aleksamagicka
Copy link
Owner

LGTM, thanks! It's late here, so I'll whip up a patch for the kernel tomorrow and ping you.

@dflemstr
Copy link
Contributor Author

Thanks, and no rush with getting this upstreamed, I am happy to run my dev version in the meantime!

@aleksamagicka
Copy link
Owner

Yeah, the earliest it can get in is for 6.10, which is not near.

aleksamagicka added a commit to aleksamagicka/linux that referenced this pull request Mar 31, 2024
@aleksamagicka
hwmon: (aquacomputer_d5next) Add support for Octo flow sensor
32ce356 
Add support for reading the flow sensor value on
the Aquacomputer Octo. Implemented by David Flemstrom [1].

[1] aleksamagicka/aquacomputer_d5next-hwmon#95

Originally-by: David Flemstrom <david.flemstrom@gmail.com>
Signed-off-by: Aleksa Savic <savicaleksa83@gmail.com>
aleksamagicka added a commit to aleksamagicka/linux that referenced this pull request Mar 31, 2024
@aleksamagicka
hwmon: (aquacomputer_d5next) Add support for Octo flow sensor pulses
0210f2b 
Add support for reading and writing the flow sensor pulses on
the Aquacomputer Octo. Implemented by David Flemstrom [1].

[1] aleksamagicka/aquacomputer_d5next-hwmon#95

Originally-by: David Flemstrom <david.flemstrom@gmail.com>
Signed-off-by: Aleksa Savic <savicaleksa83@gmail.com>
aleksamagicka added a commit to aleksamagicka/linux that referenced this pull request Mar 31, 2024
@aleksamagicka
hwmon: (aquacomputer_d5next) Add support for Octo flow sensor
1eac754 
Add support for reading the flow sensor value on
the Aquacomputer Octo. Implemented by David Flemstrom [1].

[1] aleksamagicka/aquacomputer_d5next-hwmon#95

Originally-from: David Flemstrom <david.flemstrom@gmail.com>
Signed-off-by: Aleksa Savic <savicaleksa83@gmail.com>
aleksamagicka added a commit to aleksamagicka/linux that referenced this pull request Mar 31, 2024
@aleksamagicka
hwmon: (aquacomputer_d5next) Add support for Octo flow sensor pulses
dd3e8be 
Add support for reading and writing the flow sensor pulses on
the Aquacomputer Octo. Implemented by David Flemstrom [1].

[1] aleksamagicka/aquacomputer_d5next-hwmon#95

Originally-from: David Flemstrom <david.flemstrom@gmail.com>
Signed-off-by: Aleksa Savic <savicaleksa83@gmail.com>
aleksamagicka added a commit that referenced this pull request Mar 31, 2024
@aleksamagicka
hwmon: (aquacomputer_d5next) Add support for Octo flow sensor
3a9af81 
Add support for reading the flow sensor value on
the Aquacomputer Octo. Implemented by David Flemstrom [1].

[1] #95

Originally-from: David Flemstrom <david.flemstrom@gmail.com>
Signed-off-by: Aleksa Savic <savicaleksa83@gmail.com>
aleksamagicka added a commit that referenced this pull request Mar 31, 2024
@aleksamagicka
hwmon: (aquacomputer_d5next) Add support for Octo flow sensor pulses
dfc30e1 
Add support for reading and writing the flow sensor pulses on
the Aquacomputer Octo. Implemented by David Flemstrom [1].

[1] #95

Originally-from: David Flemstrom <david.flemstrom@gmail.com>
Signed-off-by: Aleksa Savic <savicaleksa83@gmail.com>
@aleksamagicka aleksamagicka mentioned this pull request Mar 31, 2024
Merged
aleksamagicka added a commit to aleksamagicka/linux that referenced this pull request Mar 31, 2024
@aleksamagicka
hwmon: (aquacomputer_d5next) Add support for Octo flow sensor pulses
2b607cf 
Add support for reading and writing the flow sensor pulses on
the Aquacomputer Octo. Implemented by David Flemstrom [1].

[1] aleksamagicka/aquacomputer_d5next-hwmon#95

Originally-from: David Flemstrom <david.flemstrom@gmail.com>
Signed-off-by: Aleksa Savic <savicaleksa83@gmail.com>
aleksamagicka added a commit that referenced this pull request Mar 31, 2024
@aleksamagicka
hwmon: (aquacomputer_d5next) Add support for Octo flow sensor pulses
bf03fb0 
Add support for reading and writing the flow sensor pulses on
the Aquacomputer Octo. Implemented by David Flemstrom [1].

[1] #95

Originally-from: David Flemstrom <david.flemstrom@gmail.com>
Signed-off-by: Aleksa Savic <savicaleksa83@gmail.com>
aleksamagicka added a commit to aleksamagicka/linux that referenced this pull request Apr 17, 2024
@aleksamagicka
hwmon: (aquacomputer_d5next) Add support for Octo flow sensor
371f904 
Add support for reading the flow sensor value on
the Aquacomputer Octo. Implemented by David Flemstrom [1].

[1] aleksamagicka/aquacomputer_d5next-hwmon#95

Originally-from: David Flemstrom <david.flemstrom@gmail.com>
Signed-off-by: Aleksa Savic <savicaleksa83@gmail.com>
aleksamagicka added a commit to aleksamagicka/linux that referenced this pull request Apr 17, 2024
@aleksamagicka
hwmon: (aquacomputer_d5next) Add support for Octo flow sensor pulses
134bd7b 
Add support for reading and writing the flow sensor pulses on
the Aquacomputer Octo. Implemented by David Flemstrom [1].

[1] aleksamagicka/aquacomputer_d5next-hwmon#95

Originally-from: David Flemstrom <david.flemstrom@gmail.com>
Signed-off-by: Aleksa Savic <savicaleksa83@gmail.com>
intel-lab-lkp pushed a commit to intel-lab-lkp/linux that referenced this pull request Apr 17, 2024
@aleksamagicka @intel-lab-lkp
hwmon: (aquacomputer_d5next) Add support for Octo flow sensor
8f73d45 
Add support for reading the flow sensor value on
the Aquacomputer Octo. Implemented by David Flemstrom [1].

[1] aleksamagicka/aquacomputer_d5next-hwmon#95

Originally-from: David Flemstrom <david.flemstrom@gmail.com>
Signed-off-by: Aleksa Savic <savicaleksa83@gmail.com>
intel-lab-lkp pushed a commit to intel-lab-lkp/linux that referenced this pull request Apr 17, 2024
@aleksamagicka @intel-lab-lkp
hwmon: (aquacomputer_d5next) Add support for Octo flow sensor pulses
49b7c04 
Add support for reading and writing the flow sensor pulses on
the Aquacomputer Octo. Implemented by David Flemstrom [1].

[1] aleksamagicka/aquacomputer_d5next-hwmon#95

Originally-from: David Flemstrom <david.flemstrom@gmail.com>
Signed-off-by: Aleksa Savic <savicaleksa83@gmail.com>
@aleksamagicka
Copy link
Owner

@dflemstr This just made it in! 🚀

aleksamagicka added a commit that referenced this pull request Apr 28, 2024
@aleksamagicka
hwmon: (aquacomputer_d5next) Add support for Octo flow sensor
4a8c209 
Add support for reading the flow sensor value on
the Aquacomputer Octo. Implemented by David Flemstrom [1].

[1] #95

Originally-from: David Flemstrom <david.flemstrom@gmail.com>
Signed-off-by: Aleksa Savic <savicaleksa83@gmail.com>
aleksamagicka added a commit that referenced this pull request Apr 28, 2024
@aleksamagicka
hwmon: (aquacomputer_d5next) Add support for Octo flow sensor pulses
0c7c088 
Add support for reading and writing the flow sensor pulses on
the Aquacomputer Octo. Implemented by David Flemstrom [1].

[1] #95

Originally-from: David Flemstrom <david.flemstrom@gmail.com>
Signed-off-by: Aleksa Savic <savicaleksa83@gmail.com>
intel-lab-lkp pushed a commit to intel-lab-lkp/linux that referenced this pull request Apr 29, 2024
@aleksamagicka @groeck
hwmon: (aquacomputer_d5next) Add support for Octo flow sensor
b16986e 
Add support for reading the flow sensor value on
the Aquacomputer Octo. Implemented by David Flemstrom [1].

[1] aleksamagicka/aquacomputer_d5next-hwmon#95

Originally-from: David Flemstrom <david.flemstrom@gmail.com>
Signed-off-by: Aleksa Savic <savicaleksa83@gmail.com>
Link: https://lore.kernel.org/r/20240417175037.32499-2-savicaleksa83@gmail.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
intel-lab-lkp pushed a commit to intel-lab-lkp/linux that referenced this pull request Apr 29, 2024
@aleksamagicka @groeck
hwmon: (aquacomputer_d5next) Add support for Octo flow sensor pulses
8c3fae5 
Add support for reading and writing the flow sensor pulses on
the Aquacomputer Octo. Implemented by David Flemstrom [1].

[1] aleksamagicka/aquacomputer_d5next-hwmon#95

Originally-from: David Flemstrom <david.flemstrom@gmail.com>
Signed-off-by: Aleksa Savic <savicaleksa83@gmail.com>
Link: https://lore.kernel.org/r/20240417175037.32499-3-savicaleksa83@gmail.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
intel-lab-lkp pushed a commit to intel-lab-lkp/linux that referenced this pull request Apr 30, 2024
@aleksamagicka @groeck
hwmon: (aquacomputer_d5next) Add support for Octo flow sensor
120584c 
Add support for reading the flow sensor value on
the Aquacomputer Octo. Implemented by David Flemstrom [1].

[1] aleksamagicka/aquacomputer_d5next-hwmon#95

Originally-from: David Flemstrom <david.flemstrom@gmail.com>
Signed-off-by: Aleksa Savic <savicaleksa83@gmail.com>
Link: https://lore.kernel.org/r/20240417175037.32499-2-savicaleksa83@gmail.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
intel-lab-lkp pushed a commit to intel-lab-lkp/linux that referenced this pull request Apr 30, 2024
@aleksamagicka @groeck
hwmon: (aquacomputer_d5next) Add support for Octo flow sensor pulses
bf7b5a1 
Add support for reading and writing the flow sensor pulses on
the Aquacomputer Octo. Implemented by David Flemstrom [1].

[1] aleksamagicka/aquacomputer_d5next-hwmon#95

Originally-from: David Flemstrom <david.flemstrom@gmail.com>
Signed-off-by: Aleksa Savic <savicaleksa83@gmail.com>
Link: https://lore.kernel.org/r/20240417175037.32499-3-savicaleksa83@gmail.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aleksamagicka aleksamagicka aleksamagicka approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Any plans to support a water flow sensor via the Octo?
2 participants
@dflemstr @aleksamagicka