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.

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

Merge master to stable #154

Merged
merged 73 commits into from
May 8, 2021
Merged

Merge master to stable #154

merged 73 commits into from
May 8, 2021

Conversation

TrystanLea
Copy link
Member

@TrystanLea TrystanLea commented Apr 17, 2021

Change log:

  • Bluetooth LE sensor interfacer, thanks to @anbugge
  • Goodwe interfacer, thanks to @ziporah
  • Influx DB interfacer, thanks to @ziporah
  • Code formatting improvements, thanks to @bwduncan
  • MBUS interfacer improvements
  • Various fixes thanks to @bwduncan
  • Improvements to EmonHubTx3 interfacer, thanks to @borpin
  • SDM120 interfacer device and baud rate correction, thanks to @pb66
  • HTTP interfacer reply fix

anbugge and others added 30 commits April 8, 2018 21:38
Update to support Sharky 775
Users sometimes make a typo in the config where they mean to set
datacodes to a list but instead set datacode. Log a warning and return
error.
src/interfacers/EmonHubBleInterfacer.py Outdated Show resolved Hide resolved
src/interfacers/EmonHubBleInterfacer.py Show resolved Hide resolved
src/interfacers/EmonHubBleInterfacer.py Outdated Show resolved Hide resolved
src/interfacers/EmonHubBleInterfacer.py Show resolved Hide resolved
src/interfacers/EmonHubBleInterfacer.py Show resolved Hide resolved
src/interfacers/EmonHubBleInterfacer.py Outdated Show resolved Hide resolved
src/interfacers/EmonHubBleInterfacer.py Outdated Show resolved Hide resolved
src/interfacers/EmonHubBleInterfacer.py Outdated Show resolved Hide resolved
src/interfacers/EmonHubBleInterfacer.py Outdated Show resolved Hide resolved
src/interfacers/EmonHubBleInterfacer.py Outdated Show resolved Hide resolved
]

if len(c.realdata)>0:
if r:
Copy link
Contributor

Choose a reason for hiding this comment

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

Can r be False in any reasonable situation? Why not just return in the exception handler above? Unless read_all can return, e.g., [] or None then this is just overcomplicating things.

Copy link
Member Author

Choose a reason for hiding this comment

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

I've added your comment here as an inline comment for now, I will come back to this when I next work on this interfacer and have everything in front of me to test, thanks!

if r:
try:
for i in read_keys:
if i in r:
Copy link
Contributor

Choose a reason for hiding this comment

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

Instead of for i in read_keys, this should use something like for i, (name, scale) in read_keys.items(), rather than using [0] and [1] to index the tuple which is pretty unreadable.

Copy link
Member Author

Choose a reason for hiding this comment

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

same as above, thanks!

@bwduncan
Copy link
Contributor

Some more comments added. Thanks @TrystanLea 😄

@TrystanLea
Copy link
Member Author

Thanks @bwduncan ! 👍

TrystanLea and others added 9 commits April 23, 2021 08:49
Add the requirement for the data string to start with `MSG:xx`
Add explicit instrunction that the channel definition must end with a comma.
The previously named pi3-* device tree overlays got the pi3- prefix removed when Raspberry Pi 4 was released: raspberrypi/firmware@9102977

The old names are still kept valid for backwards compatibility, but this this commit applies the new names, to keep the script future-prove.

Signed-off-by: MichaIng <micha@dietpi.com>
Update device tree overlays names
@TrystanLea TrystanLea merged commit 9994dfb into stable May 8, 2021
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.

7 participants