Skip to content

Commit

Permalink
Merge branch 'release/2.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Daisuke Baba committed May 27, 2018
2 parents 05d646c + e65750f commit 94a43e8
Show file tree
Hide file tree
Showing 6 changed files with 330 additions and 23 deletions.
3 changes: 3 additions & 0 deletions README.md
View file
Expand Up @@ -65,6 +65,9 @@ $ ./setup.py publish
```

# Revision history
* 2.0.0
- Add new categories for `gnss`
- Fix an issue where modem_init() returned an error when SIM card is absent
* 1.3.1
- Fix an issue where modem_show() throws a runtime error when the command result is error
* 1.3.0
Expand Down
181 changes: 162 additions & 19 deletions lib/candy_board_qws/__init__.py
View file
Expand Up @@ -28,6 +28,7 @@
import glob
import platform
import traceback
import errno

# SerialPort class was imported from John Wiseman's
# https://github.com/wiseman/arduino-serial/blob/master/arduinoserial.py
Expand Down Expand Up @@ -330,6 +331,13 @@ def run(self):
packed_message = packer_body.pack(message)
connection.sendall(packed_message)

except socket.error, e:
if isinstance(e.args, tuple):
if e[0] == errno.EPIPE:
continue
exc_type, exc_value, exc_traceback = sys.exc_info()
traceback.print_exception(exc_type, exc_value, exc_traceback)

except Exception:
exc_type, exc_value, exc_traceback = sys.exc_info()
traceback.print_exception(exc_type, exc_value, exc_traceback)
Expand Down Expand Up @@ -387,7 +395,9 @@ def send_at(self, cmd, ok="OK"):
count = count + 1
elif line == cmd:
continue
elif line == ok or line == "ERROR":
elif line == ok or \
line == "ERROR" or \
line.startswith("+CME ERROR"):
status = line
elif line is None:
status = "UNKNOWN"
Expand Down Expand Up @@ -786,23 +796,20 @@ def modem_init(self, cmd={}):
- Set baudrate (optional)
- Reset packet counter (optional)
"""
tz_update = "N/A"
counter_reset_ret = "N/A"
baudrate_ret = "N/A"
if 'tz_update' not in cmd or cmd['tz_update'] is True:
status, result = self.send_at("AT+CTZU?")
if status != "OK":
message = {
'status': status,
'result': result,
'cmd': 'tz_update'
}
return json.dumps(message)
for at in ["AT+COPS=2", "AT+CTZU=1", "AT+COPS=0"]:
status, result = self.send_at(at)
if status != "OK":
break
if status == "OK":
tz_update = "OK"
for at in ["AT+COPS=2", "AT+CTZU=1", "AT+COPS=0"]:
status, result = self.send_at(at)
if status != "OK":
tz_update = "ERROR"
break
if 'counter_reset' in cmd and cmd['counter_reset']:
counter_reset_ret = self._counter_reset()
status = counter_reset_ret['status']
result = counter_reset_ret['result']
counter_reset_ret = self._counter_reset()['status']
status, result_qnvw = self.send_at(
'AT+QNVW=4548,0,"0000400C00000210"')
if status != "OK":
Expand All @@ -813,17 +820,153 @@ def modem_init(self, cmd={}):
}
return json.dumps(message)
if 'baudrate' in cmd:
status, result = self.send_at("AT+IPR=%s" % cmd['baudrate'])
if status != "OK":
baudrate_ret, result = self.send_at("AT+IPR=%s" % cmd['baudrate'])
if baudrate_ret != "OK":
message = {
'status': status,
'status': baudrate_ret,
'result': result,
'cmd': 'baudrate'
}
return json.dumps(message)
message = {
'status': status,
'result': result
'result': {
'counter_reset': counter_reset_ret,
'baudrate': baudrate_ret
}
}
return json.dumps(message)

def gnss_start(self, cmd={}):
status, result = self.send_at('AT+QGPSCFG="gpsnmeatype",31')
if status != "OK":
result = status
status = "ERROR"
message = {
'status': status,
'result': result,
'cmd': 'gpsnmeatype'
}
return json.dumps(message)
status, result = self.send_at('AT+QGPSCFG="nmeasrc",1')
if status != "OK":
result = status
status = "ERROR"
message = {
'status': status,
'result': result,
'cmd': 'nmeasrc'
}
return json.dumps(message)
status, result = self.send_at("AT+QGPS=1,30,50,0,1")
if status == "OK":
result = ""
elif status == "+CME ERROR: 504":
status = "OK"
else:
result = status
status = "ERROR"
message = {
'status': status,
'result': result,
}
return json.dumps(message)

def gnss_status(self, cmd={}):
status, result = self.send_at("AT+QGPS?")
if status == "OK":
gnssstate = result.split(':')[1].strip()
if gnssstate == "0":
result = 'stopped'
elif gnssstate == "1":
result = 'started'
message = {
'status': status,
'result': {
'session': result
},
}
return json.dumps(message)

def gnss_stop(self, cmd={}):
status, result = self.send_at("AT+QGPSEND")
if status == "OK":
result = ""
elif status == "+CME ERROR: 505":
status = "OK"
else:
result = status
status = "ERROR"
message = {
'status': status,
'result': result,
}
return json.dumps(message)

def gnss_locate(self, cmd={}):
if 'format' in cmd and cmd['format']:
format = str(cmd['format'])
else:
format = '2'
status, result = self.send_at("AT+QGPSLOC=%s" % (format))
if status == "OK":
csv = result.split(':')[1].strip().split(',')
if len(csv) < 11:
message = {
'status': 'ERROR',
'result': 'Temporary I/O Error',
}
return json.dumps(message)
latitude = csv[1]
if format == '1':
latitude = '%s %s' % (latitude, csv[2])
del csv[2]
elif format == '0':
latitude = '%s %s' % (latitude[:-1], latitude[-1])
longitude = csv[2]
if format == '1':
longitude = '%s %s' % (longitude, csv[3])
del csv[3]
elif format == '0':
longitude = '%s %s' % (longitude[:-1], longitude[-1])
altitude = float(csv[4])
if format == '2':
latitude = float(latitude)
longitude = float(longitude)
result = {
'timestamp': '20%s-%s-%sT%s:%s:%s.000Z' %
(
csv[9][4:6], csv[9][2:4], csv[9][0:2],
csv[0][0:2], csv[0][2:4], csv[0][4:6]
),
'latitude': latitude,
'longitude': longitude,
'hdop': float(csv[3]),
'altitude': altitude,
'fix': '%sD' % csv[5],
'cog': float(csv[6]),
'spkm': float(csv[7]),
'spkn': float(csv[8]),
'nsat': int(csv[10])
}
else:
code = status.split(':')
if len(code) > 1:
code = code[1].strip()
status = "ERROR"
else:
code = code[0]
if code == "516":
result = "Not fixed yet"
elif code == "502":
result = "Invalid format"
elif code == "505":
result = "Session not started"
else:
result = code
message = {
'status': status,
'result': result,
}
return json.dumps(message)

Expand Down
10 changes: 8 additions & 2 deletions setup.py
View file
Expand Up @@ -19,7 +19,7 @@
from setuptools import setup, find_packages
from setuptools.command.test import test as TestCommand

version = "1.3.1"
version = "2.0.0"

try:
import pypandoc
Expand Down Expand Up @@ -72,7 +72,13 @@ def run_tests(self):
'Operating System :: POSIX :: Linux',
'Topic :: System :: Hardware',
],
keywords=('CANDY RED', 'CANDY EGG', 'CANDY LINE'),
keywords=(
'CANDY RED',
'CANDY EGG',
'CANDY LINE',
'CANDY Pi Lite',
'CANDY Pi Lite+'
),
tests_require=['pytest-cov>=2.2.0',
'pytest>=2.6.4',
'terminaltables>=1.2.1'],
Expand Down
49 changes: 48 additions & 1 deletion tests/emulator_serialport.py
View file
@@ -1,3 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-

# Copyright (c) 2018 CANDY LINE INC.
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -272,7 +275,51 @@ def __init__(self):
"",
"OK",
""
]
],
'AT+QGPSCFG=': [
"AT+QGPSCFG=",
"",
"",
"OK",
""
],
'AT+QGPS=': [
"AT+QGPS=",
"",
"",
"OK",
""
],
'AT+QGPS?': [
"AT+QGPS?",
"",
"",
"+QGPS: 1",
"",
"",
"",
"OK",
""
],
'AT+QGPSLOC=': [
"AT+QGPSLOC=",
"",
"",
"+QGPSLOC: 071217.0,35.68116,139.76486,"
"0.7,50.4,2,0.00,0.0,0.0,210518,09",
"",
"",
"",
"OK",
""
],
'AT+QGPSEND': [
"AT+QGPSEND",
"",
"",
"OK",
""
],
}
self.reset_res()

Expand Down
3 changes: 3 additions & 0 deletions tests/path_hack.py
View file
@@ -1,3 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-

# Copyright (c) 2018 CANDY LINE INC.
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down

0 comments on commit 94a43e8

Please sign in to comment.