Merge pull request #6 from brentru/update-sms

Update for FONA3G, SMS

Author: ladyada

adafruit_fona/adafruit_fona.py

@@ -20,33 +20,38 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 """
-`adafruit_fona_gsm`
+`adafruit_fona_network`
 =================================================================================
 
-Interface for 2G GSM cellular modems such as the Adafruit FONA808.
+Interface for connecting to and interacting with GSM and CDMA cellular networks.
 
 * Author(s): Brent Rubell
 
 """
 
+# Network types
+NET_GSM = 0x01
+NET_CDMA = 0x02
 
-class GSM:
-    """Interface for interacting with FONA 2G GSM modems.
-    """
+
+class CELLULAR:
+    """Interface for connecting to and interacting with GSM and CDMA cellular networks."""
 
     def __init__(self, fona, apn):
-        """Initializes interface with 2G GSM modem.
+        """Initializes interface with cellular network.
         :param adafruit_fona fona: The Adafruit FONA module we are using.
         :param tuple apn: Tuple containing APN name, (optional) APN username,
                             and APN password.
 
         """
         self._iface = fona
         self._apn = apn
-        self._gsm_connected = False
+        self._network_connected = False
+        self._network_type = NET_CDMA
 
-        # Enable GPS module
-        self._iface.gps = True
+        if not self._iface.version == 0x4 or self._iface.version == 0x5:
+            self._network_type = NET_GSM
+            self._iface.gps = True
 
     def __enter__(self):
         return self
@@ -56,7 +61,7 @@ def __exit__(self, exception_type, exception_value, traceback):
 
     @property
     def imei(self):
-        """Returns the GSM modem's IEMI number, as a string."""
+        """Returns the modem's IEMI number, as a string."""
         return self._iface.iemi
 
     @property
@@ -66,31 +71,31 @@ def iccid(self):
 
     @property
     def is_attached(self):
-        """Returns if the modem is attached to the network
-        and the GPS has a fix."""
-        if self._iface.gps == 3 and self._iface.network_status == 1:
-            return True
+        """Returns if the modem is attached to the network."""
+        if self._network_type == NET_GSM:
+            if self._iface.gps == 3 and self._iface.network_status == 1:
+                return True
+        else:  # Attach CDMA network
+            if self._iface.ue_system_info == 1 and self._iface.network_status == 1:
+                return True
         return False
 
     @property
     def is_connected(self):
-        """Returns if attached to GSM
-        and an IP Addresss was obtained.
-
-        """
-        if not self._gsm_connected:
+        """Returns if attached to network and an IP Addresss was obtained."""
+        if not self._network_connected:
             return False
         return True
 
     def connect(self):
-        """Connect to GSM network."""
+        """Connect to cellular network."""
         if self._iface.set_gprs(self._apn, True):
-            self._gsm_connected = True
+            self._network_connected = True
         else:
             # reset context for next connection attempt
             self._iface.set_gprs(self._apn, False)
 
     def disconnect(self):
-        """Disconnect from GSM network."""
+        """Disconnect from cellular network."""
         self._iface.set_gprs(self._apn, False)
-        self._gsm_connected = False
+        self._network_connected = False

adafruit_fona/adafruit_fona_gsm.py adafruit_fona/adafruit_fona_network.pyadafruit_fona/adafruit_fona_gsm.py renamed to adafruit_fona/adafruit_fona_network.py

@@ -103,7 +103,10 @@ def __init__(
             raise RuntimeError("Only AF_INET family supported by cellular sockets.")
         self._sock_type = type
         self._buffer = b""
-        self._timeout = 0
+        if hasattr(_the_interface, "tx_timeout"):
+            self._timeout = _the_interface.tx_timeout
+        else:
+            self._timeout = 3000  # FONA800
 
         self._socknum = _the_interface.get_socket()
         SOCKETS.append(self._socknum)
@@ -157,7 +160,7 @@ def send(self, data):
         :param bytes data: Desired data to send to the socket.
 
         """
-        _the_interface.socket_write(self._socknum, data)
+        _the_interface.socket_write(self._socknum, data, self._timeout)
         gc.collect()
 
     def recv(self, bufsize=0):