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

ESP8266 and passive mode fixes #7

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ESP8266 and passive mode fixes #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ Of course you can change everything later as you see fit and change the reading
* active_mode: boolean, defaults to True; in active_mode the device will send new data every few seconds and the library just listens; in passive mode interval_passive_mode is used to periodically request data from the device
* eco_mode: boolean, defaults to True, if the device is in passive mode, then it will be put to sleep between data requests
* assume_sleeping: boolean, defaults to True; assume that the device is in sleeping state when library starts. If set to False and device happens to be in sleeping state (e.g. because of microcontroller reset) the library will probably fail as it can't read anything. Only change this if you know why you do it.
* accept_zero_values: boolean, defaults to False, it's possible that your sensor correctly returns all zeros which you may want to include in your data collection.
* _error/_warn/_debug: These are logging functions and can be adapted in a subclass
* setEcoMode(boolean): Change EcoMode
* async setActiveMode(): Set mode to active
Expand Down
17 changes: 10 additions & 7 deletions pms5003.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

import uasyncio as asyncio
import time
import uos

try:
import struct
Expand Down Expand Up @@ -57,8 +58,9 @@ def set_debug(debug):

class PMS5003_base:
def __init__(self, uart, lock=None, set_pin=None, reset_pin=None, interval_passive_mode=None,
event=None, active_mode=True, eco_mode=True, assume_sleeping=True):
event=None, active_mode=True, eco_mode=True, assume_sleeping=True, accept_zero_values=False):
self._uart = uart # accepts a uart object
self._accept_zero_values = accept_zero_values
self._set_pin = set_pin
if set_pin is not None:
set_pin.value(1)
Expand Down Expand Up @@ -192,8 +194,8 @@ async def wakeUp(self):
wait=WAIT_AFTER_WAKEUP * 1000)
if res is None:
await asyncio.sleep_ms(100)
res = await self._sendCommand(0xe4, 0x01, False, delay=16000,
wait=WAIT_AFTER_WAKEUP * 1000)
res = await self._sendCommand(0xe2, 0x00, False)

if res is None:
self._error("No response to wakeup command")
return False
Expand Down Expand Up @@ -242,6 +244,7 @@ async def _sendCommand(self, command, data, expect_command=True, delay=1000, wai
self._uart.write(arr)
et = time.ticks_ms() + delay + (wait if wait else 0)
frame_len = CMD_FRAME_LENGTH + 4 if expect_command else DATA_FRAME_LENGTH + 4
if uos.uname().sysname == 'esp8266': frame_len = 1 # uart.any() always returns 1 on esp8266
# self._debug("Expecting {!s}".format(frame_len))
if wait:
self._debug("waiting {!s}s".format(wait / 1000))
Expand Down Expand Up @@ -453,7 +456,7 @@ async def __read_frame(self, with_async):
else:
await self.__await_bytes(preframe_len, 100)
data = self._uart.read(preframe_len)
if len(data) is None:
if data is None or len(data)==0:
self._debug("Read no data from uart despite having waited for data")
return None
if len(data) != preframe_len and len(data) > 0:
Expand Down Expand Up @@ -499,7 +502,7 @@ async def __read_frame(self, with_async):
for i in range(6, 12):
if frame[i] != 0:
no_values = False
if no_values:
if no_values and not self._accept_zero_values: # if your air is superduper clean, it's possible to receive all zero values
buffer = []
self._debug("got no values")
await asyncio.sleep_ms(50)
Expand Down Expand Up @@ -605,11 +608,11 @@ def timestamp(self):

class PMS5003(PMS5003_base):
def __init__(self, uart, lock=None, set_pin=None, reset_pin=None, interval_passive_mode=None,
event=None, active_mode=True, eco_mode=True, assume_sleeping=True):
event=None, active_mode=True, eco_mode=True, assume_sleeping=True, accept_zero_values=False):
super().__init__(uart, set_pin=set_pin, reset_pin=reset_pin,
interval_passive_mode=interval_passive_mode,
event=event, active_mode=active_mode, eco_mode=eco_mode,
assume_sleeping=assume_sleeping)
assume_sleeping=assume_sleeping, accept_zero_values=accept_zero_values)

async def _makeResilient(self, *args, **kwargs):
if "first_try" not in kwargs:
Expand Down