Add long sms concat info for received sms

.gitignore

@@ -28,3 +28,5 @@ htmlcov
 
 # Working copy files
 *.swp
+
+.DS_Store

.travis.yml

@@ -1,14 +1,15 @@
 language: python
 python:
+  - "3.6"
+  - "3.5"
+  - "3.4"
   - "3.3"
-  - "3.2"
   - "2.7"
-  - "2.6"
 install:
   # Install unittest2 on Python 2.6
-  - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install --use-mirrors unittest2; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2; fi
   # Install coveralls (for coveralls.io integration)
   - pip install coveralls
-  - pip install -r requirements.txt --use-mirrors
+  - pip install -r requirements.txt
 script: python setup.py coverage
 after_success: coveralls

AUTHORS

@@ -8,4 +8,16 @@ the01 <https://github.com/the01>
 Frederico Rosmaninho
 David Beitey <https://github.com/davidjb>
 BOOMER74 <https://github.com/BOOMER74>
+Cyril-Roques <https://github.com/Cyril-Roques>
+PeteLawler <https://github.com/PeteLawler>
+alex-eri <https://github.com/alex-eri>
+tomchy <https://github.com/tomchy>
+bennyslbs <https://github.com/bennyslbs>
+epol <https://github.com/epol>
+rags22489664 <https://github.com/rags22489664>
+fataevalex <https://github.com/fataevalex>
+paolo-losi <https://github.com/paolo-losi>
+yuriykashin <https://github.com/yuriykashin>
+foXes68 <https://github.com/foXes68>
+babca <https://github.com/babca>
 

ChangeLog

@@ -1,3 +1,30 @@
+* Wed Mar 15 2017 babca - 0.12
+– stable release
+- unit tests fixed after rapid merging – credits to: tomchy
+- python3.6 support added
+– message concatenation fixes and more
+
+* Thu Nov 10 2016 babca - 0.11
+- added getter for SIM own number
+- added option for blocking incoming calls (GSMBUSY)
+- various python3 fixes
+
+* Thu Aug 18 2016 babca - 0.10
+– Probably a new code maintainer for 2016
+- All commits published for the last 3 years merged into a one branch
+– Compatibilty for python3 added, needs further testing!
+– experimental GPRS support
+– more:
+    – change AT_CNMI command if needed
+    – waitingForModemToStartInSeconds
+    – timeouts increased
+    – ability to check SMS encodings supported by modem - smsSupportedEncoding()
+    – better modem specific support (incl. simcom)
+    – TE SMS status reports handling support
+    – option to disable requesting delivery reports
+    – incoming DTMF support
+– todo: check AT+CMGD support for 1 or 2 params and use appropriate command format
+
 * Thu Jul 18 2013 Francois Aucamp <[email protected]> - 0.9
 - Added UDH support for SMS PDUs
 - Stored messages APIs made public

README.rst

@@ -1,5 +1,5 @@
-python-gsmmodem 
-===============
+python-gsmmodem-new v0.12
+=========================
 *GSM modem module for Python*
 
 python-gsmmodem is a module that allows easy control of a GSM modem attached
@@ -28,56 +28,71 @@ Bundled utilities:
 - **identify-modem.py**: simple utility to identify attached modem. Can also be
   used to provide debug information used for development of python-gsmmodem. 
 
+How to use this package
+-----------------------
+
+Go to `examples/` directory in this repo.
+
+
 Requirements
 ------------
 
-- Python 2.6 or later
+- Python 2.7 or later
+- Python 3.3 or later
 - pyserial
 
 
 How to install this package
 ---------------------------
 
-There are two ways to install ``python-gsmmodem``:
+There are multiple ways to install ``python-gsmmodem-new`` package:
 
-Automatic installation
-~~~~~~~~~~~~~~~~~~~~~~
+Automatic installation of the latest "stable" release from PyPI
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 ::
 
-    pip install python-gsmmodem
+    pip install python-gsmmodem-new
 
 `pip <http://www.pip-installer.org>`_ will automatically download and install
 all dependencies, as required. You can also utilise ``easy_install`` in the
 same manner as using ``pip`` above.  
 
-If you are utilising ``python-gsmmodem`` as part of another project,
+If you are utilising ``python-gsmmodem-new`` as part of another project,
 add it to your ``install_requires`` section of your ``setup.py`` file and
 upon your project's installation, it will be pulled in automatically.
 
-Manual installation
-~~~~~~~~~~~~~~~~~~~
+Manual installation of the latest "stable" release from PyPI
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Download and extract the ``python-gsmmodem`` archive from `PyPI
-<https://pypi.python.org/pypi/python-gsmmodem>`_ for the current release
-version, or clone from `GitHub <https://github.com/faucamp/python-gsmmodem>`_.
-Next, do this::
+Download a ``python-gsmmodem-new`` archive from `PyPI
+<https://pypi.python.org/pypi/python-gsmmodem-new>`_, extract it and install the package with command::
 
     python setup.py install
 
-Note that ``python-gsmmodem`` relies on ``pyserial`` for serial communications: 
-http://pyserial.sourceforge.net
+Note that ``python-gsmmodem-new`` package relies on ``pyserial`` for serial communications: 
+https://github.com/pyserial/pyserial
+
+Installation of the latest commit from GitHub
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+Clone from GitHub::
+
+    git clone https://github.com/babca/python-gsmmodem.git
+    cd python-gsmmodem/
+    python setup.py install
+
+Note that ``python-gsmmodem-new`` package relies on ``pyserial`` for serial communications: 
+https://github.com/pyserial/pyserial
 
 Testing the package
 -------------------
 
-.. |Build Status| image::  https://travis-ci.org/faucamp/python-gsmmodem.png?branch=master
-.. _Build Status: https://travis-ci.org/faucamp/python-gsmmodem
-
+.. |Build Status| image::  https://travis-ci.org/babca/python-gsmmodem.svg?branch=master
+.. _Build Status: https://travis-ci.org/babca/python-gsmmodem
 
-.. |Coverage Status| image::  https://coveralls.io/repos/faucamp/python-gsmmodem/badge.png?branch=master
-.. _Coverage Status: https://coveralls.io/r/faucamp/python-gsmmodem
+.. |Coverage Status| image:: https://coveralls.io/repos/github/babca/python-gsmmodem/badge.svg?branch=master
+.. _Coverage Status: https://coveralls.io/github/babca/python-gsmmodem?branch=master
 
 |Build Status|_ |Coverage Status|_
 
@@ -100,7 +115,7 @@ Building documentation
 This package contains `Sphinx <http://sphinx-doc.org>`_-based documentation.
 To manually build or test the documentation locally, do the following::
 
-   git clone https://github.com/faucamp/python-gsmmodem.git
+   git clone https://github.com/babca/python-gsmmodem.git
    cd python-gsmmodem
    pip install .[doc]
    cd doc
@@ -110,6 +125,7 @@ For true isolation, you may wish to run the above commands within a
 `virtualenv <http://www.virtualenv.org/>`_, which will help you manage
 this development installation.
 
+
 License information
 -------------------
 
@@ -118,3 +134,19 @@ See AUTHORS for all authors and contact information.
 
 License: GNU Lesser General Public License, version 3 or later; see COPYING
          included in this archive for details.
+
+FAQ
+---
+
+List all modem ports
+~~~~~~~~~~~~~~~~~~~~
+
+You can simply list all ttyUSB devices before and after pluging the modem in.
+
+  ls /dev/ttyUSB*
+
+
+Device or resource busy error
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Check running processes. The device could be occupied by another program or another instance of gsmmodem which is still running in the background. Run ``sudo lsof | grep tty``, try to locate the problematic process and ``sudo kill <PID>``.

examples/incoming_call_demo.py

@@ -4,7 +4,7 @@
 Demo: handle incoming calls
 
 Simple demo app that listens for incoming calls, displays the caller ID,
-optionally answers the call and plays sone DTMF tones (if supported by modem), 
+optionally answers the call and plays sone DTMF tones (if supported by modem),
 and hangs up the call.
 """
 
@@ -27,29 +27,29 @@ def handleIncomingCall(call):
             print('Answering call and playing some DTMF tones...')
             call.answer()
             # Wait for a bit - some older modems struggle to send DTMF tone immediately after answering a call
-            time.sleep(2.0) 
+            time.sleep(2.0)
             try:
                 call.sendDtmfTone('9515999955951')
             except InterruptedException as e:
                 # Call was ended during playback
-                print('DTMF playback interrupted: {0} ({1} Error {2})'.format(e, e.cause.type, e.cause.code))                
+                print('DTMF playback interrupted: {0} ({1} Error {2})'.format(e, e.cause.type, e.cause.code))
             finally:
                 if call.answered:
                     print('Hanging up call.')
                     call.hangup()
-        else:            
+        else:
             print('Modem has no DTMF support - hanging up call.')
             call.hangup()
     else:
         print(' Call from {0} is still ringing...'.format(call.number))
-    
+
 def main():
     print('Initializing modem...')
     #logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.DEBUG)
     modem = GsmModem(PORT, BAUDRATE, incomingCallCallbackFunc=handleIncomingCall)
     modem.connect(PIN)
     print('Waiting for incoming calls...')
-    try:    
+    try:
         modem.rxThread.join(2**31) # Specify a (huge) timeout so that it essentially blocks indefinitely, but still receives CTRL+C interrupt signal
     finally:
         modem.close()

examples/own_number_demo.py

@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+
+"""\
+Demo: read own phone number
+"""
+
+from __future__ import print_function
+
+import logging
+
+PORT = '/dev/vmodem0'
+BAUDRATE = 115200
+PIN = None # SIM card PIN (if any)
+
+from gsmmodem.modem import GsmModem
+
+def main():
+    print('Initializing modem...')
+    # Uncomment the following line to see what the modem is doing:
+    logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.DEBUG)
+    modem = GsmModem(PORT, BAUDRATE)
+    modem.connect(PIN)
+
+    number = modem.ownNumber
+    print("The SIM card phone number is:")
+    print(number)
+
+    # Uncomment the following block to change your own number.
+    # modem.ownNumber = "+000123456789" # lease empty for removing the phone entry altogether
+
+    # number = modem.ownNumber
+    # print("A new phone number is:")
+    # print(number)
+
+    # modem.close();
+
+if __name__ == '__main__':
+    main()

examples/sms_handler_demo.py

@@ -18,23 +18,25 @@
 from gsmmodem.modem import GsmModem
 
 def handleSms(sms):
-    print(u'== SMS message received ==\nFrom: {0}\nTime: {1}\nMessage:\n{2}\n'.format(sms.number, sms.time, sms.text))
+    # long sms Concatenation support: reference, parts, number
+    concat = sms.concat.__dict__ if sms.concat else {}
+    print(u'== SMS message received ==\nFrom: {0}\nTime: {1}\nconcat: {2}\nMessage:\n{3}\n'.format(sms.number, sms.time, concat, sms.text))
     print('Replying to SMS...')
     sms.reply(u'SMS received: "{0}{1}"'.format(sms.text[:20], '...' if len(sms.text) > 20 else ''))
     print('SMS sent.\n')
-    
+
 def main():
     print('Initializing modem...')
     # Uncomment the following line to see what the modem is doing:
     logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.DEBUG)
     modem = GsmModem(PORT, BAUDRATE, smsReceivedCallbackFunc=handleSms)
-    modem.smsTextMode = False 
+    modem.smsTextMode = False
     modem.connect(PIN)
-    print('Waiting for SMS message...')    
-    try:    
+    print('Waiting for SMS message...')
+    try:
         modem.rxThread.join(2**31) # Specify a (huge) timeout so that it essentially blocks indefinitely, but still receives CTRL+C interrupt signal
     finally:
-        modem.close();
+        modem.close()
 
 if __name__ == '__main__':
     main()