enhance BLECharacteristic

add read8(), read16(), read32(),
add write8(), write16(), write32()
add notify8(), notify16(), notify32()

Author: hathach

libraries/Bluefruit52Lib/keywords.txt

@@ -152,8 +152,14 @@ setWriteAuthorizeCallbak	KEYWORD2
 handles	KEYWORD2
 
 write	KEYWORD2
+
 notifyEnabled	KEYWORD2
+
 notify	KEYWORD2
+notify8	KEYWORD2
+notify16	KEYWORD2
+notify32	KEYWORD2
+
 
 #######################################
 # BLEClientService Methods (KEYWORD2)

libraries/Bluefruit52Lib/src/BLECharacteristic.cpp

@@ -441,6 +441,28 @@ uint16_t BLECharacteristic::write(uint8_t  num)
   return write( (uint8_t*) &num, sizeof(num));
 }
 
+
+
+uint16_t BLECharacteristic::write8(uint8_t num)
+{
+  return write( (uint8_t*) &num, sizeof(num));
+}
+
+uint16_t BLECharacteristic::write16(uint16_t num)
+{
+  return write( (uint8_t*) &num, sizeof(num));
+}
+
+uint16_t BLECharacteristic::write32(uint32_t num)
+{
+  return write( (uint8_t*) &num, sizeof(num));
+}
+
+uint16_t BLECharacteristic::write32(int num)
+{
+  return write32( (uint32_t) num );
+}
+
 /*------------------------------------------------------------------*/
 /* READ
  *------------------------------------------------------------------*/
@@ -481,6 +503,24 @@ uint16_t BLECharacteristic::read(uint8_t*  num)
   return read(num, 1);
 }
 
+uint8_t BLECharacteristic::read8(void)
+{
+  uint8_t num;
+  return read(&num, sizeof(num)) ? num : 0;
+}
+
+uint16_t BLECharacteristic::read16(void)
+{
+  uint16_t num;
+  return read(&num, sizeof(num)) ? num : 0;
+}
+
+uint32_t BLECharacteristic::read32(void)
+{
+  uint16_t num;
+  return read(&num, sizeof(num)) ? num : 0;
+}
+
 /*------------------------------------------------------------------*/
 /* NOTIFY
  *------------------------------------------------------------------*/
@@ -559,6 +599,27 @@ bool BLECharacteristic::notify(const char * str)
   return notify( (const uint8_t*) str, strlen(str) );
 }
 
+bool BLECharacteristic::notify8(uint8_t num)
+{
+  return notify( (uint8_t*) &num, sizeof(num));
+}
+
+bool BLECharacteristic::notify16(uint16_t num)
+{
+  return notify( (uint8_t*) &num, sizeof(num));
+}
+
+bool BLECharacteristic::notify32(uint32_t num)
+{
+  return notify( (uint8_t*) &num, sizeof(num));
+}
+
+bool BLECharacteristic::notify32(int num)
+{
+  return notify32( (uint32_t) num);
+}
+
+
 bool BLECharacteristic::notify(int num)
 {
   return notify( (uint8_t*) &num, sizeof(num));

libraries/Bluefruit52Lib/src/BLECharacteristic.h

@@ -126,18 +126,33 @@ class BLECharacteristic
     uint16_t write(uint16_t num);
     uint16_t write(uint8_t  num);
 
+    uint16_t write8    (uint8_t  num);
+    uint16_t write16   (uint16_t num);
+    uint16_t write32   (uint32_t num);
+    uint16_t write32   (int      num);
+
+
     /*------------- Read -------------*/
     uint16_t read(void* buffer, uint16_t bufsize);
     uint16_t read(uint32_t* num);
     uint16_t read(uint16_t* num);
     uint16_t read(uint8_t*  num);
 
+    uint8_t  read8 (void);
+    uint16_t read16(void);
+    uint32_t read32(void);
+
     /*------------- Notify -------------*/
     bool notifyEnabled(void);
 
     bool notify(const void* data, uint16_t len);
     bool notify(const char* str);
 
+    bool notify8    (uint8_t  num);
+    bool notify16   (uint16_t num);
+    bool notify32   (uint32_t num);
+    bool notify32   (int      num);
+
     bool notify(int      num);
     bool notify(uint32_t num);
     bool notify(uint16_t num);

libraries/Bluefruit52Lib/src/BLEClientCharacteristic.cpp

@@ -270,6 +270,11 @@ uint16_t BLEClientCharacteristic::write32_resp(uint32_t value)
   return write_resp(&value, sizeof(value));
 }
 
+uint16_t BLEClientCharacteristic::write32_resp(int value)
+{
+  return write32_resp((uint32_t) value);
+}
+
 uint16_t BLEClientCharacteristic::write(const void* data, uint16_t len)
 {
 //  VERIFY( _chr.char_props.write_wo_resp, 0 );
@@ -320,6 +325,11 @@ uint16_t BLEClientCharacteristic::write32(uint32_t value)
   return write(&value, sizeof(value));
 }
 
+uint16_t BLEClientCharacteristic::write32(int value)
+{
+  return write32( (uint32_t) value);
+}
+
 
 void BLEClientCharacteristic::setNotifyCallback(notify_cb_t fp)
 {

libraries/Bluefruit52Lib/src/BLEClientCharacteristic.h

@@ -81,12 +81,14 @@ class BLEClientCharacteristic
     uint16_t write8    (uint8_t value);
     uint16_t write16   (uint16_t value);
     uint16_t write32   (uint32_t value);
+    uint16_t write32   (int      value);
 
     /*------------- Write with Response-------------*/
     uint16_t write_resp(const void* data, uint16_t len);
     uint16_t write8_resp    (uint8_t value);
     uint16_t write16_resp   (uint16_t value);
     uint16_t write32_resp   (uint32_t value);
+    uint16_t write32_resp   (int      value);
 
     /*------------- Notify -------------*/
     bool     writeCCCD       (uint16_t value);