Skip to content

added return before several write calls to enable error checks #929

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

Open
modrisb wants to merge 2 commits into
base: master
Choose a base branch
from
Open

added return before several write calls to enable error checks #929

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1747075
added return before several write calls to enable error checks
modrisb Nov 18, 2022
0fe2cba
Making batStatusEnum, powerInStatusEnum visible on package/class level
modrisb Nov 21, 2022
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
18 changes: 9 additions & 9 deletions Software/Source/pijuice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,9 @@ def __enter__(self):
def __exit__(self, exc_type, exc_val, exc_tb):
return False # Don't suppress exceptions.

batStatusEnum = ['NORMAL', 'CHARGING_FROM_IN',
'CHARGING_FROM_5V_IO', 'NOT_PRESENT']
powerInStatusEnum = ['NOT_PRESENT', 'BAD', 'WEAK', 'PRESENT']
def GetStatus(self):
result = self.interface.ReadData(self.STATUS_CMD, 1)
if result['error'] != 'NO_ERROR':
Expand All @@ -171,12 +174,9 @@ def GetStatus(self):
status = {}
status['isFault'] = bool(d & 0x01)
status['isButton'] = bool(d & 0x02)
batStatusEnum = ['NORMAL', 'CHARGING_FROM_IN',
'CHARGING_FROM_5V_IO', 'NOT_PRESENT']
status['battery'] = batStatusEnum[(d >> 2) & 0x03]
powerInStatusEnum = ['NOT_PRESENT', 'BAD', 'WEAK', 'PRESENT']
status['powerInput'] = powerInStatusEnum[(d >> 4) & 0x03]
status['powerInput5vIo'] = powerInStatusEnum[(d >> 6) & 0x03]
status['battery'] = self.batStatusEnum[(d >> 2) & 0x03]
status['powerInput'] = self.powerInStatusEnum[(d >> 4) & 0x03]
status['powerInput5vIo'] = self.powerInStatusEnum[(d >> 6) & 0x03]
return {'data': status, 'error': 'NO_ERROR'}

def GetChargeLevel(self):
Expand Down Expand Up @@ -219,7 +219,7 @@ def ResetFaultFlags(self, flags):
d = d & ~(0x01 << self.faultEvents.index(ev))
except:
ev
self.interface.WriteData(self.FAULT_EVENT_CMD, [d]) # clear fault events
return self.interface.WriteData(self.FAULT_EVENT_CMD, [d]) # clear fault events

buttonEvents = ['NO_EVENT', 'PRESS', 'RELEASE',
'SINGLE_PRESS', 'DOUBLE_PRESS', 'LONG_PRESS1', 'LONG_PRESS2']
Expand Down Expand Up @@ -253,7 +253,7 @@ def AcceptButtonEvent(self, button):
except ValueError:
return {'error': 'BAD_ARGUMENT'}
d = [0xF0, 0xFF] if b == 0 else [0x0F, 0xFF] if b == 1 else [0xFF, 0xF0]
self.interface.WriteData(self.BUTTON_EVENT_CMD, d) # clear button events
return self.interface.WriteData(self.BUTTON_EVENT_CMD, d) # clear button events

def GetBatteryTemperature(self):
result = self.interface.ReadData(self.BATTERY_TEMPERATURE_CMD, 2)
Expand Down Expand Up @@ -1560,7 +1560,7 @@ def GetFirmwareVersion(self):
'error': 'NO_ERROR'}

def RunTestCalibration(self):
self.interface.WriteData(248, [0x55, 0x26, 0xa0, 0x2b])
return self.interface.WriteData(248, [0x55, 0x26, 0xa0, 0x2b])


# Create an interface object for accessing PiJuice features via I2C bus.
Expand Down