Skip to content

Commit 3c6c2b7

Browse files
committed
remove BLECharateristic write(int32_t)
fix #520
1 parent 1f0a587 commit 3c6c2b7

File tree

5 files changed

+9
-164
lines changed

5 files changed

+9
-164
lines changed

libraries/BLEAdafruitService/src/services/BLEAdafruitSensor.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ BLEAdafruitSensor::BLEAdafruitSensor(BLEUuid service_uuid, BLEUuid data_uuid)
3636
_notify_cb = NULL;
3737
}
3838

39-
err_t BLEAdafruitSensor::_begin(int32_t ms)
39+
err_t BLEAdafruitSensor::_begin(int ms)
4040
{
4141
// Invoke base class begin()
4242
VERIFY_STATUS( BLEService::begin() );
@@ -59,19 +59,19 @@ err_t BLEAdafruitSensor::_begin(int32_t ms)
5959
return ERROR_NONE;
6060
}
6161

62-
err_t BLEAdafruitSensor::begin(measure_callback_t fp, int32_t ms)
62+
err_t BLEAdafruitSensor::begin(measure_callback_t fp, int ms)
6363
{
6464
_measure_cb = fp;
6565
return _begin(ms);
6666
}
6767

68-
err_t BLEAdafruitSensor::begin(Adafruit_Sensor* sensor, int32_t ms)
68+
err_t BLEAdafruitSensor::begin(Adafruit_Sensor* sensor, int ms)
6969
{
7070
_sensor = sensor;
7171
return _begin(ms);
7272
}
7373

74-
void BLEAdafruitSensor::setPeriod(int32_t period_ms)
74+
void BLEAdafruitSensor::setPeriod(int period_ms)
7575
{
7676
_period.write32(period_ms);
7777
_update_timer(period_ms);

libraries/BLEAdafruitService/src/services/BLEAdafruitSensor.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@
3030
class BLEAdafruitSensor : public BLEService
3131
{
3232
public:
33-
static const int32_t DEFAULT_PERIOD = 1000;
33+
static const int DEFAULT_PERIOD = 1000;
3434

3535
typedef void (*notify_callback_t)(uint16_t conn_hdl, bool enabled);
3636
typedef uint16_t (*measure_callback_t )(uint8_t* buf, uint16_t bufsize);
3737

3838
BLEAdafruitSensor(BLEUuid service_uuid, BLEUuid data_uuid);
3939

40-
virtual err_t begin(measure_callback_t fp, int32_t ms = DEFAULT_PERIOD);
41-
virtual err_t begin(Adafruit_Sensor* sensor, int32_t ms = DEFAULT_PERIOD);
40+
virtual err_t begin(measure_callback_t fp, int ms = DEFAULT_PERIOD);
41+
virtual err_t begin(Adafruit_Sensor* sensor, int ms = DEFAULT_PERIOD);
4242

43-
void setPeriod(int32_t period_ms);
43+
void setPeriod(int period_ms);
4444
void setNotifyCallback(notify_callback_t fp);
4545

4646
protected:
@@ -54,7 +54,7 @@ class BLEAdafruitSensor : public BLEService
5454

5555
SoftwareTimer _timer;
5656

57-
err_t _begin(int32_t ms);
57+
err_t _begin(int ms);
5858

5959
virtual void _update_timer(int32_t ms);
6060
virtual void _measure_handler(void);

libraries/Bluefruit52Lib/src/BLECharacteristic.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -564,11 +564,6 @@ uint16_t BLECharacteristic::write32(int num)
564564
return write32( (uint32_t) num );
565565
}
566566

567-
uint16_t BLECharacteristic::write32(int32_t num)
568-
{
569-
return write32( (uint32_t) num );
570-
}
571-
572567
/*------------------------------------------------------------------*/
573568
/* READ
574569
*------------------------------------------------------------------*/

libraries/Bluefruit52Lib/src/BLECharacteristic.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@ class BLECharacteristic
129129
uint16_t write16 (uint16_t num);
130130
uint16_t write32 (uint32_t num);
131131
uint16_t write32 (int num);
132-
uint16_t write32 (int32_t num);
133132

134133
/*------------- Read -------------*/
135134
uint16_t read (void* buffer, uint16_t bufsize, uint16_t offset = 0);

tools/build_all_travis.py

Lines changed: 0 additions & 149 deletions
This file was deleted.

0 commit comments

Comments
 (0)