Shuta Nakamae / nRF51822

Fork of nRF51822 by Nordic Semiconductor

Files at this revision

API Documentation at this revision

Comitter:
rgrover1
Date:
Fri Jun 19 15:55:22 2015 +0100
Parent:
246:1098730d84de
Child:
248:71ef03789dd3
Commit message:
Synchronized with git rev 75938af2
Author: Rohit Grover
remove btle_gattc.h

Changed in this revision

btle/btle.cpp Show annotated file Show diff for this revision Revisions of this file
btle/btle_discovery.cpp Show annotated file Show diff for this revision Revisions of this file
btle/btle_discovery.h Show annotated file Show diff for this revision Revisions of this file
btle/btle_gattc.h Show diff for this revision Revisions of this file
--- a/btle/btle.cpp	Fri Jun 19 15:55:22 2015 +0100
+++ b/btle/btle.cpp	Fri Jun 19 15:55:22 2015 +0100
@@ -24,7 +24,6 @@
 #include "ble_conn_params.h"
 
 #include "btle_gap.h"
-#include "btle_gattc.h"
 #include "btle_advertising.h"
 #include "custom/custom_helper.h"
 
@@ -37,6 +36,7 @@
 #include "device_manager.h"
 
 #include "ble_hci.h"
+#include "btle_discovery.h"
 
 extern "C" void assert_nrf_callback(uint16_t line_num, const uint8_t *p_file_name);
 void            app_error_handler(uint32_t error_code, uint32_t line_num, const uint8_t *p_file_name);
--- a/btle/btle_discovery.cpp	Fri Jun 19 15:55:22 2015 +0100
+++ b/btle/btle_discovery.cpp	Fri Jun 19 15:55:22 2015 +0100
@@ -20,7 +20,6 @@
 #include "nrf_error.h"
 #include "btle_discovery.h"
 #include "ble_err.h"
-#include "btle_gattc.h"
 
 static NordicServiceDiscovery discoverySingleton;
 ServiceDiscovery *ServiceDiscovery::getSingleton(void) {
--- a/btle/btle_discovery.h	Fri Jun 19 15:55:22 2015 +0100
+++ b/btle/btle_discovery.h	Fri Jun 19 15:55:22 2015 +0100
@@ -17,11 +17,12 @@
 #ifndef _BTLE_DISCOVERY_H_
 #define _BTLE_DISCOVERY_H_
 
-#include "blecommon.h"
+#include <stdio.h>
+#include "ble.h"
 #include "UUID.h"
 #include "Gap.h"
-#include "ble_gattc.h"
-#include <stdio.h>
+
+void bleGattcEventHandler(const ble_evt_t *p_ble_evt);
 
 /**@brief Structure for holding information about the service and the characteristics found during
  *        the discovery process.
--- a/btle/btle_gattc.h	Fri Jun 19 15:55:22 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-/* mbed Microcontroller Library
- * Copyright (c) 2006-2013 ARM Limited
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef _BTLE_GATTC_H_
-#define _BTLE_GATTC_H_
-
-#include "btle.h"
-#include "Gap.h"
-
-void bleGattcEventHandler(const ble_evt_t *p_ble_evt);
-
-#endif // ifndef _BTLE_GATTC_H_
\ No newline at end of file