Moved PDP Action URC out of base class

Resolves #3

Author: sfe-SparkFro

src/sfe_sara_r5.cpp

@@ -1,5 +1,10 @@
 #include "sfe_sara_r5.h"
 
+SARA_R5::SARA_R5()
+{
+  addURCHandler(UBX_CELL_MESSAGE_PDP_ACTION_URC, [this](const char* event){return this->urcHandlerPDPAction(event);});
+}
+
 UBX_CELL_error_t SARA_R5::setUtimeMode(UBX_CELL_utime_mode_t mode, UBX_CELL_utime_sensor_t sensor)
 {
   UBX_CELL_error_t err;
@@ -358,3 +363,41 @@ UBX_CELL_error_t SARA_R5::getNetworkAssignedIPAddress(int profile, IPAddress *ad
 
   return err;
 }
+
+bool SARA_R5::urcHandlerPDPAction(const char* event)
+{
+  // URC: +UUPSDA (Packet Switched Data Action)
+  int result;
+  IPAddress remoteIP = {0, 0, 0, 0};
+  int scanNum;
+  int remoteIPstore[4];
+
+  char *searchPtr = strstr(event, UBX_CELL_MESSAGE_PDP_ACTION_URC);
+  if (searchPtr != nullptr)
+  {
+    searchPtr += strlen(UBX_CELL_MESSAGE_PDP_ACTION_URC); // Move searchPtr to first character - probably a space
+    while (*searchPtr == ' ') searchPtr++; // skip spaces
+    scanNum = sscanf(searchPtr, "%d,\"%d.%d.%d.%d\"",
+                      &result, &remoteIPstore[0], &remoteIPstore[1], &remoteIPstore[2], &remoteIPstore[3]);
+
+    if (scanNum == 5)
+    {
+      if (_printDebug == true)
+        _debugPort->println(F("processReadEvent: packet switched data action"));
+
+      for (int i = 0; i <= 3; i++)
+      {
+        remoteIP[i] = (uint8_t)remoteIPstore[i];
+      }
+
+      if (_psdActionRequestCallback != nullptr)
+      {
+        _psdActionRequestCallback(result, remoteIP);
+      }
+
+      return true;
+    }
+  }
+
+  return false;
+}

src/sfe_sara_r5.h

@@ -10,10 +10,14 @@ const char* const UBX_CELL_GNSS_REQUEST_TIME = "+UTIME";          // Ask for tim
 const char* const UBX_CELL_GNSS_TIME_INDICATION = "+UTIMEIND";    // Time information request status unsolicited indication
 const char* const UBX_CELL_GNSS_TIME_CONFIGURATION = "+UTIMECFG"; // Sets time configuration
 
+const char* const UBX_CELL_MESSAGE_PDP_ACTION_URC = "+UUPSDA:";
+
 // Base SARA-R5 class
 class SARA_R5: public UBX_CELL
 {
 public:
+  SARA_R5();
+  
   UBX_CELL_error_t setUtimeMode(UBX_CELL_utime_mode_t mode = UBX_CELL_UTIME_MODE_PPS, UBX_CELL_utime_sensor_t sensor = UBX_CELL_UTIME_SENSOR_GNSS_LTE); // Time mode, source etc. (+UTIME)
   UBX_CELL_error_t getUtimeMode(UBX_CELL_utime_mode_t *mode, UBX_CELL_utime_sensor_t *sensor);
   UBX_CELL_error_t setUtimeIndication(UBX_CELL_utime_urc_configuration_t config = UBX_CELL_UTIME_URC_CONFIGURATION_ENABLED); // +UTIMEIND
@@ -29,6 +33,9 @@ class SARA_R5: public UBX_CELL
   UBX_CELL_error_t setPDPconfiguration(int profile, UBX_CELL_pdp_configuration_parameter_t parameter, IPAddress value);                   // Set parameters in the chosen PSD profile
   UBX_CELL_error_t performPDPaction(int profile, UBX_CELL_pdp_actions_t action);  // Performs the requested action for the specified PSD profile: reset, store, load, activate, deactivate
   UBX_CELL_error_t getNetworkAssignedIPAddress(int profile, IPAddress *address); // Get the dynamic IP address assigned during PDP context activation
+
+protected:
+  bool urcHandlerPDPAction(const char* event);
 };
 
 class SARA_R500S: public SARA_R5

src/sfe_ublox_cellular.cpp

@@ -61,7 +61,6 @@ UBX_CELL::UBX_CELL(int powerPin, int resetPin, uint8_t maxInitTries)
   addURCHandler(UBX_CELL_CLOSE_SOCKET_URC,           [this](const char* event){return this->urcHandlerCloseSocket(event);});
   addURCHandler(UBX_CELL_GNSS_REQUEST_LOCATION_URC,  [this](const char* event){return this->urcHandlerGNSSRequestLocation(event);});
   addURCHandler(UBX_CELL_SIM_STATE_URC,              [this](const char* event){return this->urcHandlerSIMState(event);});
-  addURCHandler(UBX_CELL_MESSAGE_PDP_ACTION_URC,     [this](const char* event){return this->urcHandlerPDPAction(event);});
   addURCHandler(UBX_CELL_HTTP_COMMAND_URC,           [this](const char* event){return this->urcHandlerHTTPCommand(event);});
   addURCHandler(UBX_CELL_MQTT_COMMAND_URC,           [this](const char* event){return this->urcHandlerMQTTCommand(event);});
   addURCHandler(UBX_CELL_PING_COMMAND_URC,           [this](const char* event){return this->urcHandlerPingCommand(event);});
@@ -572,44 +571,6 @@ bool UBX_CELL::urcHandlerSIMState(const char* event)
   return false;
 }
 
-bool UBX_CELL::urcHandlerPDPAction(const char* event)
-{
-  // URC: +UUPSDA (Packet Switched Data Action)
-  int result;
-  IPAddress remoteIP = {0, 0, 0, 0};
-  int scanNum;
-  int remoteIPstore[4];
-
-  char *searchPtr = strstr(event, UBX_CELL_MESSAGE_PDP_ACTION_URC);
-  if (searchPtr != nullptr)
-  {
-    searchPtr += strlen(UBX_CELL_MESSAGE_PDP_ACTION_URC); // Move searchPtr to first character - probably a space
-    while (*searchPtr == ' ') searchPtr++; // skip spaces
-    scanNum = sscanf(searchPtr, "%d,\"%d.%d.%d.%d\"",
-                      &result, &remoteIPstore[0], &remoteIPstore[1], &remoteIPstore[2], &remoteIPstore[3]);
-
-    if (scanNum == 5)
-    {
-      if (_printDebug == true)
-        _debugPort->println(F("processReadEvent: packet switched data action"));
-
-      for (int i = 0; i <= 3; i++)
-      {
-        remoteIP[i] = (uint8_t)remoteIPstore[i];
-      }
-
-      if (_psdActionRequestCallback != nullptr)
-      {
-        _psdActionRequestCallback(result, remoteIP);
-      }
-
-      return true;
-    }
-  }
-
-  return false;
-}
-
 bool UBX_CELL::urcHandlerHTTPCommand(const char* event)
 {
   // URC: +UUHTTPCR (HTTP Command Result)

src/sfe_ublox_cellular.h

@@ -193,7 +193,6 @@ const char* const UBX_CELL_LISTEN_SOCKET_URC = "+UUSOLI:";
 const char* const UBX_CELL_CLOSE_SOCKET_URC = "+UUSOCL:";
 const char* const UBX_CELL_GNSS_REQUEST_LOCATION_URC = "+UULOC:";
 const char* const UBX_CELL_SIM_STATE_URC = "+UUSIMSTAT:";
-const char* const UBX_CELL_MESSAGE_PDP_ACTION_URC = "+UUPSDA:";
 const char* const UBX_CELL_HTTP_COMMAND_URC = "+UUHTTPCR:";
 const char* const UBX_CELL_MQTT_COMMAND_URC = "+UUMQTTC:";
 const char* const UBX_CELL_PING_COMMAND_URC = "+UUPING:";
@@ -1116,7 +1115,6 @@ class UBX_CELL : public Print
   bool urcHandlerCloseSocket(const char* event);
   bool urcHandlerGNSSRequestLocation(const char* event);
   bool urcHandlerSIMState(const char* event);
-  bool urcHandlerPDPAction(const char* event);
   bool urcHandlerHTTPCommand(const char* event);
   bool urcHandlerMQTTCommand(const char* event);
   bool urcHandlerPingCommand(const char* event);