Skip to content

Pijuice cleanup#822

Merged
jimklimov merged 15 commits intonetworkupstools:masterfrom
jimklimov:pijuice-cleanup
Oct 7, 2020
Merged

Pijuice cleanup#822
jimklimov merged 15 commits intonetworkupstools:masterfrom
jimklimov:pijuice-cleanup

Conversation

@jimklimov
Copy link
Copy Markdown
Member

Follows up from #730 to solve its PR-merging nits.

aander07 and others added 15 commits September 12, 2019 19:37
Update the driver Makefile.am to add pijuice driver to the LINUX_I2C_DRIVERLIST
Check for both the i2c-tools 3.x and 4.x include files (i2c-dev.h/smbus.h) and set flags accordingly.

Link with the i2c library file from i2c-tools 4.x if it is available.
Update asem.c to complie cleanly by adding an include for <sys/ioctl.h>
Clean up the upsdebugX() labels
Pull the conditional I2C support code closer to the includes block
Don't report battery temp as UPS temp
Warn if we adjust shutdown_delay
Accommodate one more variation of SMBUS/I2C support  where both the headers and the libraries exist and are usable.
Check for I2C_FUNC_I2C to avoid errors caused by conflicts between linux/i2c-dev.h and linux/i2c.h
@jimklimov jimklimov merged commit ea2e088 into networkupstools:master Oct 7, 2020
@lgtm-com
Copy link
Copy Markdown

lgtm-com Bot commented Oct 7, 2020

This pull request introduces 2 alerts when merging 5ac96a6 into 830876c - view on LGTM.com

new alerts:

  • 2 for Comparison result is always the same

@jimklimov jimklimov deleted the pijuice-cleanup branch November 22, 2020 23:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants