Update Cellular Examples for Adafruit FONA (3G/GSM)

examples/requests_advanced_cellular.py

@@ -1,9 +1,11 @@
+# pylint: disable=unused-import
 import time
 import board
 import busio
 import digitalio
 from adafruit_fona.adafruit_fona import FONA
-from adafruit_fona.adafruit_fona_gsm import GSM
+from adafruit_fona.fona_3g import FONA3G
+import adafruit_fona.adafruit_fona_network as network
 import adafruit_fona.adafruit_fona_socket as cellular_socket
 import adafruit_requests as requests
 
@@ -14,26 +16,31 @@
     print("GPRS secrets are kept in secrets.py, please add them there!")
     raise
 
-# Create a serial connection for the FONA connection using 4800 baud.
-# These are the defaults you should use for the FONA Shield.
-# For other boards set RX = GPS module TX, and TX = GPS module RX pins.
-uart = busio.UART(board.TX, board.RX, baudrate=4800)
-rst = digitalio.DigitalInOut(board.D4)
+# Create a serial connection for the FONA connection
+uart = busio.UART(board.TX, board.RX)
+rst = digitalio.DigitalInOut(board.D9)
 
-# Initialize FONA module (this may take a few seconds)
-fona = FONA(uart, rst)
+# Use this for FONA800 and FONA808
+# fona = FONA(uart, rst)
 
-# initialize gsm
-gsm = GSM(fona, (secrets["apn"], secrets["apn_username"], secrets["apn_password"]))
+# Use this for FONA3G
+fona = FONA3G(uart, rst)
 
-while not gsm.is_attached:
+# Initialize cellular data network
+network = network.CELLULAR(
+    fona, (secrets["apn"], secrets["apn_username"], secrets["apn_password"])
+)
+
+while not network.is_attached:
     print("Attaching to network...")
     time.sleep(0.5)
+print("Attached!")
 
-while not gsm.is_connected:
+while not network.is_connected:
     print("Connecting to network...")
-    gsm.connect()
-    time.sleep(5)
+    network.connect()
+    time.sleep(0.5)
+print("Network Connected!")
 
 # Initialize a requests object with a socket and cellular interface
 requests.set_socket(cellular_socket, fona)

examples/requests_simpletest_cellular.py

@@ -1,9 +1,11 @@
+# pylint: disable=unused-import
 import time
 import board
 import busio
 import digitalio
 from adafruit_fona.adafruit_fona import FONA
-from adafruit_fona.adafruit_fona_gsm import GSM
+from adafruit_fona.fona_3g import FONA3G
+import adafruit_fona.adafruit_fona_network as network
 import adafruit_fona.adafruit_fona_socket as cellular_socket
 import adafruit_requests as requests
 
@@ -14,26 +16,31 @@
     print("GPRS secrets are kept in secrets.py, please add them there!")
     raise
 
-# Create a serial connection for the FONA connection using 4800 baud.
-# These are the defaults you should use for the FONA Shield.
-# For other boards set RX = GPS module TX, and TX = GPS module RX pins.
-uart = busio.UART(board.TX, board.RX, baudrate=4800)
+# Create a serial connection for the FONA connection
+uart = busio.UART(board.TX, board.RX)
 rst = digitalio.DigitalInOut(board.D4)
 
-# Initialize FONA module (this may take a few seconds)
+# Use this for FONA800 and FONA808
 fona = FONA(uart, rst)
 
-# initialize gsm
-gsm = GSM(fona, (secrets["apn"], secrets["apn_username"], secrets["apn_password"]))
+# Use this for FONA3G
+# fona = FONA3G(uart, rst)
 
-while not gsm.is_attached:
+# Initialize cellular data network
+network = network.CELLULAR(
+    fona, (secrets["apn"], secrets["apn_username"], secrets["apn_password"])
+)
+
+while not network.is_attached:
     print("Attaching to network...")
     time.sleep(0.5)
+print("Attached!")
 
-while not gsm.is_connected:
+while not network.is_connected:
     print("Connecting to network...")
-    gsm.connect()
-    time.sleep(5)
+    network.connect()
+    time.sleep(0.5)
+print("Network Connected!")
 
 # Initialize a requests object with a socket and cellular interface
 requests.set_socket(cellular_socket, fona)