Skip to content

Commit d6f81a2

Browse files
committed
clean up code
1 parent b8912a4 commit d6f81a2

File tree

3 files changed

+6
-72
lines changed

3 files changed

+6
-72
lines changed

changelog.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,17 @@
2727
- Added Slow interval callback support via setSlowCallback()
2828
- Added setPresentationFormatDescriptor() support
2929
- Added addDescriptor() for BLECharacteritsic
30-
- Added set/get apperance
30+
- Added set/get appearance
3131
- Added experimental (work in progress) BLE Homekit
3232
- Enhanced bleuart to work with larger MTU
3333
- Partially support data length extension
3434
- Added BLECLientCharacteristic isValid() and read 8,16, 32 bit
3535
- Added cental_custom_hrm example for how to use client service and characteristic
36+
- BLECharacteristic
37+
- Added read8(), read16(), read32(), write8(), write16(), write32(), notify8(), notify16(), notify32()
38+
- Remove read(), write(), notify() with different uint8_t, uint16_t, uint32_t, int variant to prevent confusion
39+
- Added discover(), discovered() to BLEClientCharacteristic
40+
- Added getHandleRange() to BLEClientService
3641

3742
## Bug Fixs
3843

libraries/Bluefruit52Lib/src/BLECharacteristic.cpp

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -421,28 +421,6 @@ uint16_t BLECharacteristic::write(const void* data, uint16_t len)
421421
return value.len;
422422
}
423423

424-
uint16_t BLECharacteristic::write(int num)
425-
{
426-
return write( (uint8_t*) &num, sizeof(num));
427-
}
428-
429-
uint16_t BLECharacteristic::write(uint32_t num)
430-
{
431-
return write( (uint8_t*) &num, sizeof(num));
432-
}
433-
434-
uint16_t BLECharacteristic::write(uint16_t num)
435-
{
436-
return write( (uint8_t*) &num, sizeof(num));
437-
}
438-
439-
uint16_t BLECharacteristic::write(uint8_t num)
440-
{
441-
return write( (uint8_t*) &num, sizeof(num));
442-
}
443-
444-
445-
446424
uint16_t BLECharacteristic::write8(uint8_t num)
447425
{
448426
return write( (uint8_t*) &num, sizeof(num));
@@ -488,21 +466,6 @@ uint16_t BLECharacteristic::read(void* buffer, uint16_t bufsize)
488466
return value.len;
489467
}
490468

491-
uint16_t BLECharacteristic::read(uint32_t* num)
492-
{
493-
return read(num, 4);
494-
}
495-
496-
uint16_t BLECharacteristic::read(uint16_t* num)
497-
{
498-
return read(num, 2);
499-
}
500-
501-
uint16_t BLECharacteristic::read(uint8_t* num)
502-
{
503-
return read(num, 1);
504-
}
505-
506469
uint8_t BLECharacteristic::read8(void)
507470
{
508471
uint8_t num;
@@ -618,24 +581,3 @@ bool BLECharacteristic::notify32(int num)
618581
{
619582
return notify32( (uint32_t) num);
620583
}
621-
622-
623-
bool BLECharacteristic::notify(int num)
624-
{
625-
return notify( (uint8_t*) &num, sizeof(num));
626-
}
627-
628-
bool BLECharacteristic::notify(uint32_t num)
629-
{
630-
return notify( (uint8_t*) &num, sizeof(num));
631-
}
632-
633-
bool BLECharacteristic::notify(uint16_t num)
634-
{
635-
return notify( (uint8_t*) &num, sizeof(num));
636-
}
637-
638-
bool BLECharacteristic::notify(uint8_t num)
639-
{
640-
return notify( (uint8_t*) &num, sizeof(num));
641-
}

libraries/Bluefruit52Lib/src/BLECharacteristic.h

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,6 @@ class BLECharacteristic
121121
uint16_t write(const void* data, uint16_t len);
122122
uint16_t write(const char* str);
123123

124-
uint16_t write(int num);
125-
uint16_t write(uint32_t num);
126-
uint16_t write(uint16_t num);
127-
uint16_t write(uint8_t num);
128-
129124
uint16_t write8 (uint8_t num);
130125
uint16_t write16 (uint16_t num);
131126
uint16_t write32 (uint32_t num);
@@ -134,9 +129,6 @@ class BLECharacteristic
134129

135130
/*------------- Read -------------*/
136131
uint16_t read(void* buffer, uint16_t bufsize);
137-
uint16_t read(uint32_t* num);
138-
uint16_t read(uint16_t* num);
139-
uint16_t read(uint8_t* num);
140132

141133
uint8_t read8 (void);
142134
uint16_t read16(void);
@@ -153,11 +145,6 @@ class BLECharacteristic
153145
bool notify32 (uint32_t num);
154146
bool notify32 (int num);
155147

156-
bool notify(int num);
157-
bool notify(uint32_t num);
158-
bool notify(uint16_t num);
159-
bool notify(uint8_t num);
160-
161148
/*------------- Internal Functions -------------*/
162149
virtual void _eventHandler(ble_evt_t* event);
163150

0 commit comments

Comments
 (0)