complete file moving

hathach · hathach · commit 986a0f8b900b · 2019-11-18T20:57:56.000+07:00
diff --git a/libraries/BLEAdafruitService/src/BLEAdafruitService.h b/libraries/BLEAdafruitService/src/BLEAdafruitService.h
@@ -0,0 +1,42 @@
+/* 
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 Ha Thach (tinyusb.org) for Adafruit Industries
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef BLEADAFRUITSERVICE_H_
+#define BLEADAFRUITSERVICE_H_
+
+#include "bluefruit_common.h"
+#include "BLECharacteristic.h"
+#include "BLEService.h"
+
+#include "services/BLEAdafruitSensor.h"
+#include "services/BLEAdafruitTemperature.h"
+#include "services/BLEAdafruitTemperature.h"
+#include "services/BLEAdafruitRgbPixel.h"
+#include "services/BLEAdafruitAccel.h"
+#include "services/BLEAdafruitLightSensor.h"
+#include "services/BLEAdafruitButton.h"
+#include "services/BLEAdafruitTone.h"
+
+
+#endif /* BLEADAFRUITSERVICE_H_ */
diff --git a/libraries/BLEAdafruitService/src/services/BLEAdafruitAccel.cpp b/libraries/BLEAdafruitService/src/services/BLEAdafruitAccel.cpp
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include "bluefruit.h"
+#include "BLEAdafruitService.h"
 
 //--------------------------------------------------------------------+
 // MACRO TYPEDEF CONSTANT ENUM DECLARATION
diff --git a/libraries/BLEAdafruitService/src/services/BLEAdafruitAccel.h b/libraries/BLEAdafruitService/src/services/BLEAdafruitAccel.h
@@ -25,13 +25,6 @@
 #ifndef BLEADAFRUITACCEL_H_
 #define BLEADAFRUITACCEL_H_
 
-#include "bluefruit_common.h"
-
-#include "BLECharacteristic.h"
-#include "BLEService.h"
-
-#include "BLEAdafruitSensor.h"
-
 class BLEAdafruitAccel : public BLEAdafruitSensor
 {
   public:
diff --git a/libraries/BLEAdafruitService/src/services/BLEAdafruitButton.cpp b/libraries/BLEAdafruitService/src/services/BLEAdafruitButton.cpp
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include "bluefruit.h"
+#include "BLEAdafruitService.h"
 
 //--------------------------------------------------------------------+
 // MACRO TYPEDEF CONSTANT ENUM DECLARATION
diff --git a/libraries/BLEAdafruitService/src/services/BLEAdafruitButton.h b/libraries/BLEAdafruitService/src/services/BLEAdafruitButton.h
@@ -25,12 +25,6 @@
 #ifndef BLE_ADAFRUIT_BUTTON_H_
 #define BLE_ADAFRUIT_BUTTON_H_
 
-#include "bluefruit_common.h"
-
-#include "BLECharacteristic.h"
-#include "BLEService.h"
-#include "BLEAdafruitSensor.h"
-
 class BLEAdafruitButton : public BLEAdafruitSensor
 {
   public:
diff --git a/libraries/BLEAdafruitService/src/services/BLEAdafruitLightSensor.cpp b/libraries/BLEAdafruitService/src/services/BLEAdafruitLightSensor.cpp
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include "bluefruit.h"
+#include "BLEAdafruitService.h"
 
 //--------------------------------------------------------------------+
 // MACRO TYPEDEF CONSTANT ENUM DECLARATION
diff --git a/libraries/BLEAdafruitService/src/services/BLEAdafruitLightSensor.h b/libraries/BLEAdafruitService/src/services/BLEAdafruitLightSensor.h
@@ -25,13 +25,6 @@
 #ifndef BLE_ADAFRUIT_LIGHT_SENSOR_H_
 #define BLE_ADAFRUIT_LIGHT_SENSOR_H_
 
-#include "bluefruit_common.h"
-
-#include "BLECharacteristic.h"
-#include "BLEService.h"
-
-#include "BLEAdafruitSensor.h"
-
 class BLEAdafruitLightSensor : public BLEAdafruitSensor
 {
   public:
diff --git a/libraries/BLEAdafruitService/src/services/BLEAdafruitRgbPixel.cpp b/libraries/BLEAdafruitService/src/services/BLEAdafruitRgbPixel.cpp
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include "bluefruit.h"
+#include "BLEAdafruitService.h"
 
 //--------------------------------------------------------------------+
 // MACRO TYPEDEF CONSTANT ENUM DECLARATION
@@ -69,7 +69,7 @@ BLEAdafruitRgbPixel::BLEAdafruitRgbPixel(void)
 
 }
 
-err_t BLEAdafruitRgbPixel::begin (Adafruit_NeoPixel* neo_pixel)
+err_t BLEAdafruitRgbPixel::begin (/*Adafruit_NeoPixel* neo_pixel*/)
 {
   // Invoke base class begin()
   VERIFY_STATUS( BLEService::begin() );
diff --git a/libraries/BLEAdafruitService/src/services/BLEAdafruitRgbPixel.h b/libraries/BLEAdafruitService/src/services/BLEAdafruitRgbPixel.h
@@ -25,11 +25,6 @@
 #ifndef BLEADAFRUITRGBPIXEL_H_
 #define BLEADAFRUITRGBPIXEL_H_
 
-#include "bluefruit_common.h"
-
-#include "BLECharacteristic.h"
-#include "BLEService.h"
-
 class BLEAdafruitRgbPixel : public BLEService
 {
   public:
diff --git a/libraries/BLEAdafruitService/src/services/BLEAdafruitSensor.cpp b/libraries/BLEAdafruitService/src/services/BLEAdafruitSensor.cpp
@@ -22,8 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include "bluefruit.h"
-#include "BLEAdafruitSensor.h"
+#include "BLEAdafruitService.h"
 
 //--------------------------------------------------------------------+
 // MACRO TYPEDEF CONSTANT ENUM DECLARATION
diff --git a/libraries/BLEAdafruitService/src/services/BLEAdafruitSensor.h b/libraries/BLEAdafruitService/src/services/BLEAdafruitSensor.h
@@ -25,11 +25,6 @@
 #ifndef BLE_ADAFRUIT_SENSOR_H_
 #define BLE_ADAFRUIT_SENSOR_H_
 
-#include "bluefruit_common.h"
-
-#include "BLECharacteristic.h"
-#include "BLEService.h"
-
 class BLEAdafruitSensor : public BLEService
 {
   public:
diff --git a/libraries/BLEAdafruitService/src/services/BLEAdafruitTemperature.cpp b/libraries/BLEAdafruitService/src/services/BLEAdafruitTemperature.cpp
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include "bluefruit.h"
+#include "BLEAdafruitService.h"
 
 //--------------------------------------------------------------------+
 // MACRO TYPEDEF CONSTANT ENUM DECLARATION
diff --git a/libraries/BLEAdafruitService/src/services/BLEAdafruitTemperature.h b/libraries/BLEAdafruitService/src/services/BLEAdafruitTemperature.h
@@ -25,13 +25,6 @@
 #ifndef BLEADAFRUITTEMPERATURE_H_
 #define BLEADAFRUITTEMPERATURE_H_
 
-#include "bluefruit_common.h"
-
-#include "BLECharacteristic.h"
-#include "BLEService.h"
-
-#include "BLEAdafruitSensor.h"
-
 class BLEAdafruitTemperature : public BLEAdafruitSensor
 {
   public:
diff --git a/libraries/BLEAdafruitService/src/services/BLEAdafruitTone.cpp b/libraries/BLEAdafruitService/src/services/BLEAdafruitTone.cpp
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 
-#include "bluefruit.h"
+#include "BLEAdafruitService.h"
 
 //--------------------------------------------------------------------+
 // MACRO TYPEDEF CONSTANT ENUM DECLARATION
diff --git a/libraries/BLEAdafruitService/src/services/BLEAdafruitTone.h b/libraries/BLEAdafruitService/src/services/BLEAdafruitTone.h
@@ -25,11 +25,6 @@
 #ifndef BLEADAFRUITTONE_H_
 #define BLEADAFRUITTONE_H_
 
-#include "bluefruit_common.h"
-
-#include "BLECharacteristic.h"
-#include "BLEService.h"
-
 class BLEAdafruitTone : public BLEService
 {
   public:
diff --git a/libraries/Bluefruit52Lib/examples/Peripheral/cplay_ble/cplay_ble.ino b/libraries/Bluefruit52Lib/examples/Peripheral/cplay_ble/cplay_ble.ino
@@ -14,6 +14,7 @@
 #include <bluefruit.h>
 #include <Adafruit_LittleFS.h>
 #include <InternalFileSystem.h>
+#include <BLEAdafruitService.h>
 #include <Adafruit_CircuitPlayground.h>
 
 // BLE Service
@@ -71,7 +72,7 @@ uint16_t measure_accel(uint8_t* buf, uint16_t bufsize)
 void setup()
 {
   Serial.begin(115200);
-  while ( !Serial ) delay(10);   // for nrf52840 with native usb
+  //while ( !Serial ) delay(10);   // for nrf52840 with native usb
   
   Serial.println("Bluefruit52 BLEUART Example");
   Serial.println("---------------------------\n");
diff --git a/libraries/Bluefruit52Lib/src/BLECharacteristic.h b/libraries/Bluefruit52Lib/src/BLECharacteristic.h
@@ -143,6 +143,7 @@ class BLECharacteristic
     bool notifyEnabled(uint16_t conn_hdl);
 
     /*------------- Notify -------------*/
+//    bool notify   (void);
     bool notify   (const void* data, uint16_t len);
     bool notify   (const char* str);
 
@@ -152,6 +153,7 @@ class BLECharacteristic
     bool notify32 (int      num);
 
     /*------------- Notify multiple connections -------------*/
+//    bool notify   (uint16_t conn_hdl);
     bool notify   (uint16_t conn_hdl, const void* data, uint16_t len);
     bool notify   (uint16_t conn_hdl, const char* str);
 
diff --git a/libraries/Bluefruit52Lib/src/bluefruit.h b/libraries/Bluefruit52Lib/src/bluefruit.h
@@ -62,13 +62,6 @@
 #include "services/BLEMidi.h"
 #include "services/EddyStone.h"
 
-#include "services/BLEAdafruitTemperature.h"
-#include "services/BLEAdafruitRgbPixel.h"
-#include "services/BLEAdafruitAccel.h"
-#include "services/BLEAdafruitLightSensor.h"
-#include "services/BLEAdafruitButton.h"
-#include "services/BLEAdafruitTone.h"
-
 #include "clients/BLEAncs.h"
 #include "clients/BLEClientUart.h"
 #include "clients/BLEClientDis.h"

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`* THE SOFTWARE.`
`23`	`23`	`*/`
`24`	`24`
`25`		`-#include "bluefruit.h"`
	`25`	`+#include "BLEAdafruitService.h"`
`26`	`26`
`27`	`27`	`//--------------------------------------------------------------------+`
`28`	`28`	`// MACRO TYPEDEF CONSTANT ENUM DECLARATION`
`@@ -69,7 +69,7 @@ BLEAdafruitRgbPixel::BLEAdafruitRgbPixel(void)`
`69`	`69`
`70`	`70`	`}`
`71`	`71`
`72`		`-err_t BLEAdafruitRgbPixel::begin (Adafruit_NeoPixel* neo_pixel)`
	`72`	`+err_t BLEAdafruitRgbPixel::begin (/Adafruit_NeoPixel neo_pixel*/)`
`73`	`73`	`{`
`74`	`74`	`// Invoke base class begin()`
`75`	`75`	`VERIFY_STATUS( BLEService::begin() );`