update to poll within user code instead of gsm module

Author: brentru

adafruit_fona/adafruit_fona_gsm.py

@@ -46,24 +46,8 @@ def __init__(self, fona, apn, debug=True):
         self._apn = apn
         self._gsm_connected = False
 
-        # Attempt to enable GPS module and obtain GPS fix
-        attempts = 10
+        # Enable GPS module
         self._iface.gps = True
-        while not self._iface.gps == 3:
-            if attempts < 0:
-                raise RuntimeError("Unable to establish GPS fix.")
-            attempts -= 1
-            time.sleep(0.5)
-
-        # Check if FONA is registered to GSM network
-        attempts = 30
-        while self._iface.network_status != 1:
-            if attempts == 0:
-                raise TimeoutError("Not registered with GSM network.")
-            if self._debug:
-                print("* Not registered with network, retrying, ", attempts)
-            attempts -= 1
-            time.sleep(1)
 
     def __enter__(self):
         return self
@@ -81,6 +65,16 @@ def iccid(self):
         """Returns the SIM card's ICCID, as a string."""
         return self._iface.iccid
 
+    @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:
+            if self._iface.network_status == 1:
+                return True
+        return False
+
+
     @property
     def is_connected(self):
         """Returns if attached to GSM

examples/fona_cheerlights.py

@@ -3,12 +3,14 @@
 import busio
 import digitalio
 from adafruit_fona.adafruit_fona import FONA
+from adafruit_fona.adafruit_fona_gsm import GSM
 import adafruit_fona.adafruit_fona_socket as cellular_socket
 import adafruit_requests as requests
 
 import neopixel
 import adafruit_fancyled.adafruit_fancyled as fancy
 
+
 # Get GPRS details and more from a secrets.py file
 try:
     from secrets import secrets
@@ -23,18 +25,18 @@
 rst = digitalio.DigitalInOut(board.D4)
 
 # Initialize FONA module (this may take a few seconds)
-print("Initializing FONA")
 fona = FONA(uart, rst)
 
-# Enable GPS
-fona.gps = True
+# Enable FONA debugging
+fona._debug = True
 
-# Bring up cellular connection
-fona.configure_gprs((secrets["apn"], secrets["apn_username"], secrets["apn_password"]))
+# initialize gsm
+gsm = GSM(fona, (secrets["apn"], secrets["apn_username"], secrets["apn_password"]))
 
-# Bring up GPRS
-fona.gprs = True
-print("FONA initialized")
+while not gsm.is_connected:
+    print("Connecting to network...")
+    gsm.connect()
+    time.sleep(5)
 
 # Initialize a requests object with a socket and cellular interface
 requests.set_socket(cellular_socket, fona)

examples/fona_simpletest.py

@@ -34,6 +34,10 @@
 # initialize gsm
 gsm = GSM(fona, (secrets["apn"], secrets["apn_username"], secrets["apn_password"]))
 
+while not gsm.is_attached:
+    print("Attaching to network...")
+    time.sleep(0.5)
+
 while not gsm.is_connected:
     print("Connecting to network...")
     gsm.connect()