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

Support SIM800L #76

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

Support SIM800L #76

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
46 changes: 42 additions & 4 deletions gsmmodem/modem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ class GsmModem(SerialComms):
CUSD_REGEX = re.compile(r'\+CUSD:\s*(\d),"(.*?)",(\d+)', re.DOTALL)
# Used for parsing SMS status reports
CDSI_REGEX = re.compile(r'\+CDSI:\s*"([^"]+)",(\d+)$')
CDS_REGEX = re.compile(r'\+CDS:\s*([0-9]+)"$')

def __init__(self, port, baudrate=115200, incomingCallCallbackFunc=None, smsReceivedCallbackFunc=None, smsStatusReportCallback=None):
super(GsmModem, self).__init__(port, baudrate, notifyCallbackFunc=self._handleModemNotification)
Expand Down Expand Up @@ -340,9 +341,12 @@ def connect(self, pin=None):
try:
self.write('AT+CNMI=2,1,0,2') # Set message notifications
except CommandError:
# Message notifications not supported
self._smsReadSupported = False
self.log.warning('Incoming SMS notifications not supported by modem. SMS receiving unavailable.')
try:
self.write('AT+CNMI=2,1,0,1,0') # Set message notifications, using TE for delivery reports <ds>
except CommandError:
# Message notifications not supported
self._smsReadSupported = False
self.log.warning('Incoming SMS notifications not supported by modem. SMS receiving unavailable.')

# Incoming call notification setup
try:
Expand Down Expand Up @@ -859,6 +863,7 @@ def __threadedHandleModemNotification(self, lines):

:param lines The lines that were read
"""
next_line_is_te_statusreport = False
for line in lines:
if 'RING' in line:
# Incoming call (or existing call is ringing)
Expand All @@ -876,6 +881,17 @@ def __threadedHandleModemNotification(self, lines):
# SMS status report
self._handleSmsStatusReport(line)
return
elif line.startswith('+CDS'):
# SMS status report at next line
next_line_is_te_statusreport = True
cdsMatch = self.CDS_REGEX.match(line)
if cdsMatch:
next_line_is_te_statusreport_length = int(cdsMatch.group(1))
else:
next_line_is_te_statusreport_length = -1
elif next_line_is_te_statusreport:
self._handleSmsStatusReportTe(next_line_is_te_statusreport_length, line)
return
else:
# Check for call status updates
for updateRegex, handlerFunc in self._callStatusUpdates:
Expand Down Expand Up @@ -1017,7 +1033,29 @@ def _handleSmsStatusReport(self, notificationLine):
else:
# Nothing is waiting for this report directly - use callback
self.smsStatusReportCallback(report)


def _handleSmsStatusReportTe(self, length, notificationLine):
""" Handler for TE SMS status reports """
self.log.debug('TE SMS status report received')
try:
smsDict = decodeSmsPdu(notificationLine)
except EncodingError:
self.log.debug('Discarding notification line from +CDS response: %s', notificationLine)
else:
if smsDict['type'] == 'SMS-STATUS-REPORT':
report = StatusReport(self, int(smsDict['status']), smsDict['reference'], smsDict['number'], smsDict['time'], smsDict['discharge'], smsDict['status'])
else:
raise CommandError('Invalid PDU type for readStoredSms(): {0}'.format(smsDict['type']))
# Update sent SMS status if possible
if report.reference in self.sentSms:
self.sentSms[report.reference].report = report
if self._smsStatusReportEvent:
# A sendSms() call is waiting for this response - notify waiting thread
self._smsStatusReportEvent.set()
else:
# Nothing is waiting for this report directly - use callback
self.smsStatusReportCallback(report)

def readStoredSms(self, index, memory=None):
""" Reads and returns the SMS message at the specified index

Expand Down