Merge pull request #87 in SA/ble_examples from feature/fix_SSS_client_not_reconnecting_after_termination to simplelink_cc2640r2_sdk-2.20

Squashed commit of the following:

commit 94b26cac7840dd13ead27d50305963e5193fa8fc
Author: Wennerfeldt <[email protected]>
Date:   Thu Oct 18 13:16:59 2018 +0200

    Fix so that client now starts discovery again following a termination.
    Fixed internal state in discovery support functions not being properly
    reset.

Author: Sean Lyons

examples/rtos/CC2640R2_LAUNCHXL/bleapps/simple_serial_socket_client/src/app/simple_serial_socket_client.c

@@ -843,8 +843,16 @@ static void SimpleSerialSocketClient_processRoleEvent(gapCentralRoleEvent_t *pEv
         PIN_setOutputValue(ledPinHandle, Board_RLED, 0);
         PIN_setOutputValue(ledPinHandle, Board_GLED, 0);
 
+        // Prepare for going back to discovery
         streamServiceHandle.startHandle = GATT_INVALID_HANDLE;
         streamServiceHandle.endHandle   = GATT_INVALID_HANDLE;
+        scanningStarted = TRUE;
+        discoveryDone = FALSE;
+
+        // Start discovery
+        GAPCentralRole_StartDiscovery(DEFAULT_DISCOVERY_MODE,
+                                      DEFAULT_DISCOVERY_ACTIVE_SCAN,
+                                      DEFAULT_DISCOVERY_WHITE_LIST);
       }
       break;
 

examples/rtos/CC2640R2_LAUNCHXL/bleapps/simple_serial_socket_client/src/app/simple_service_discovery.c

@@ -155,6 +155,7 @@ uint32_t SimpleServiceDiscovery_discoverService(uint16_t connHandle, ICall_Entit
           }
           else
           {
+            discoveryState = BLE_DISC_STATE_IDLE;
             retVal = SIMPLE_DISCOVERY_UNSUCCESSFUL;
           }
         }
@@ -173,6 +174,7 @@ uint32_t SimpleServiceDiscovery_discoverService(uint16_t connHandle, ICall_Entit
 
             if (pMsg->hdr.status == bleProcedureComplete)
             {
+                discoveryState = BLE_DISC_STATE_IDLE;
                 retVal = SIMPLE_DISCOVERY_SUCCESSFUL;
             }
         }