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

Issue #7 #8

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
+11 −3
Open

Issue #7 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27b4716
#7
RomanKovalev Aug 31, 2020
edd6d16
Merge branch 'dev' of github.com:RomanKovalev/SportiduinoPQ into dev
RomanKovalev Aug 31, 2020
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
7 changes: 5 additions & 2 deletions SportiduinoPQ.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import design

from serial import Serial
from sportiduino import Sportiduino, SportiduinoException, SportiduinoTimeout
from sportiduino import Sportiduino, SportiduinoException, SportiduinoTimeout, SportiduinoNoCardPresentException
from basestation import BaseStation
from datetime import datetime, timedelta, timezone
from PyQt5 import uic, QtWidgets, QtPrintSupport, QtCore, sip
Expand Down Expand Up @@ -177,7 +177,10 @@ def ReadCard_clicked(self):

self._show_card_data(data, card_type)
self._save_card_data_to_file(data)


except SportiduinoNoCardPresentException as err:
self.log(self.tr("Card not found. Place card near reader and try again"))

except Exception as err:
self._process_error(err)
raise err
Expand Down
7 changes: 6 additions & 1 deletion sportiduino.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,7 @@ def _connect_master_station(self, port):

def _send_command(self, code, parameters=None, wait_response=True, timeout=None):
resp_code, data = self._serialproto.send_command(self._serial, code, parameters, wait_response, timeout)

return Sportiduino._preprocess_response(resp_code, data, self._log_debug)


Expand Down Expand Up @@ -659,7 +660,7 @@ def _preprocess_response(func, data, log_debug):
raise SportiduinoException(Sportiduino._translate("sportiduino","Can't read EEPROM"))
elif err_code == Sportiduino.ERR_CARD_NOT_FOUND:
if card_type == 0 or card_type == 0xff:
raise SportiduinoException(Sportiduino._translate("sportiduino","Card is not found"))
raise SportiduinoNoCardPresentException(Sportiduino._translate("sportiduino","Card is not found"))
else :
raise SportiduinoException(Sportiduino._translate("sportiduino","Unsupported card type = {}").format(card_type))
elif err_code == Sportiduino.ERR_UNKNOWN_CMD:
Expand Down Expand Up @@ -781,6 +782,10 @@ class SportiduinoException(Exception):
pass


class SportiduinoNoCardPresentException(Exception):
pass


class SportiduinoTimeout(SportiduinoException):
pass

Expand Down