zjamnik/joycontrol
1
0
Fork 0
forked from mirror/joycontrol
Code Pull Requests Activity

Merge branch 'pulls/326281544/41'

Browse Source
This commit is contained in:
Robert Martin
2020-05-16 11:02:14 +02:00
parent 8601dd4702 509579b268
commit 78f015d79b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
joycontrol/controller_state.py
+1 -1
View File
@@ -177,7 +177,7 @@ class ButtonState:
def __iter__(self):
"""
@returns iterator over the button bytes
:returns iterator over the button bytes
"""
yield self._byte_1
yield self._byte_2
joycontrol/ir_nfc_mcu.py
+2 -2
View File
@@ -115,7 +115,7 @@ class IrNfcMcu:
self._bytes[5] = 9
self._bytes[6] = 0x31
self._bytes[7] = 0
elif self.get_action() == Action.READ_TAG or self.get_action() == Action.READ_TAG_2:
elif self.get_action() in (Action.READ_TAG, Action.READ_TAG_2):
self._bytes[0] = 0x3a
self._bytes[1] = 0
self._bytes[2] = 7
@@ -131,7 +131,7 @@ class IrNfcMcu:
else:
data = bytes.fromhex('02000927')
copyarray(self._bytes, 3, data)
copyarray(self._bytes, 3 + len(data), self._nfc_content[245:])
copyarray(self._bytes, 3 + len(data), self._nfc_content[245:540])
self.set_action(Action.READ_FINISHED)
elif self.get_action() == Action.READ_FINISHED:
self._bytes[0] = 0x2a