Skip to content

Commit 3445c16

Browse files
HumanHuman
committed
Merge branch 'replace_BLE_iBeacon' of github.com:Human/arduino-esp32 into replace_BLE_iBeacon
2 parents 25d89a7 + 3037a66 commit 3445c16

File tree

6 files changed

+77
-33
lines changed

6 files changed

+77
-33
lines changed

‎libraries/BLE/src/BLEAdvertisedDevice.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,17 @@ std::string BLEAdvertisedDevice::toString() {
560560
res += ", txPower: ";
561561
res += val;
562562
}
563+
if (haveRSSI()) {
564+
char val[4];
565+
snprintf(val, sizeof(val), "%i", getRSSI());
566+
res += ", rssi: ";
567+
res += val;
568+
}
569+
if (haveServiceData()) {
570+
for (int i=0; i <getServiceDataCount(); i++) {
571+
res += ", serviceData: " + getServiceData(i);
572+
}
573+
}
563574
return res;
564575
} // toString
565576

‎libraries/BluetoothSerial/src/BluetoothSerial.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,8 @@ static void esp_spp_cb(esp_spp_cb_event_t event, esp_spp_cb_param_t *param)
301301
xEventGroupSetBits(_spp_event_group, SPP_DISCONNECTED);
302302
xEventGroupSetBits(_spp_event_group, SPP_CONGESTED);
303303
xEventGroupSetBits(_spp_event_group, SPP_CLOSED);
304+
xEventGroupClearBits(_spp_event_group, SPP_CONNECTED);
304305
}
305-
xEventGroupClearBits(_spp_event_group, SPP_CONNECTED);
306306
} else {
307307
log_e("ESP_SPP_CLOSE_EVT failed!, status:%d", param->close.status);
308308
}

‎libraries/EEPROM/src/EEPROM.cpp

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -183,20 +183,21 @@ void EEPROMClass::write(int address, uint8_t value) {
183183
bool EEPROMClass::commit() {
184184
bool ret = false;
185185
if (!_size) {
186-
return false;
186+
return false;
187187
}
188188
if (!_data) {
189-
return false;
189+
return false;
190190
}
191191
if (!_dirty) {
192-
return true;
192+
return true;
193193
}
194194

195-
if (ESP_OK != nvs_set_blob(_handle, _name, _data, _size)) {
196-
log_e( "error in write");
195+
esp_err_t err = nvs_set_blob(_handle, _name, _data, _size);
196+
if (err != ESP_OK) {
197+
log_e("error in write: %s", esp_err_to_name(err));
197198
} else {
198-
_dirty = false;
199-
ret = true;
199+
_dirty = false;
200+
ret = true;
200201
}
201202

202203
return ret;

‎libraries/Ethernet/src/ETH.cpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,6 @@ ETHClass::ETHClass()
220220
,eth_handle(NULL)
221221
#endif
222222
,started(false)
223-
#if ESP_IDF_VERSION_MAJOR > 3
224-
,eth_link(ETH_LINK_DOWN)
225-
#endif
226223
{
227224
}
228225

@@ -534,25 +531,27 @@ bool ETHClass::setHostname(const char * hostname)
534531

535532
bool ETHClass::fullDuplex()
536533
{
537-
#ifdef ESP_IDF_VERSION_MAJOR
538-
return true;//todo: do not see an API for this
534+
#if ESP_IDF_VERSION_MAJOR > 3
535+
eth_duplex_t link_duplex;
536+
esp_eth_ioctl(eth_handle, ETH_CMD_G_DUPLEX_MODE, &link_duplex);
537+
return (link_duplex == ETH_DUPLEX_FULL);
539538
#else
540539
return eth_config.phy_get_duplex_mode();
541540
#endif
542541
}
543542

544543
bool ETHClass::linkUp()
545544
{
546-
#ifdef ESP_IDF_VERSION_MAJOR
547-
return eth_link == ETH_LINK_UP;
545+
#if ESP_IDF_VERSION_MAJOR > 3
546+
return WiFiGenericClass::getStatusBits() & ETH_CONNECTED_BIT;
548547
#else
549548
return eth_config.phy_check_link();
550549
#endif
551550
}
552551

553552
uint8_t ETHClass::linkSpeed()
554553
{
555-
#ifdef ESP_IDF_VERSION_MAJOR
554+
#if ESP_IDF_VERSION_MAJOR > 3
556555
eth_speed_t link_speed;
557556
esp_eth_ioctl(eth_handle, ETH_CMD_G_SPEED, &link_speed);
558557
return (link_speed == ETH_SPEED_10M)?10:100;

‎libraries/Ethernet/src/ETH.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ class ETHClass {
6565

6666
protected:
6767
bool started;
68-
eth_link_t eth_link;
6968
static void eth_event_handler(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data);
7069
#else
7170
bool started;

‎libraries/FS/src/vfs_api.cpp

Lines changed: 50 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ FileImplPtr VFSImpl::open(const char* fpath, const char* mode, const bool create
3636
return FileImplPtr();
3737
}
3838

39-
sprintf(temp,"%s%s", _mountpoint, fpath);
39+
strcpy(temp, _mountpoint);
40+
strcat(temp, fpath);
4041

4142
struct stat st;
4243
//file found
@@ -136,19 +137,25 @@ bool VFSImpl::rename(const char* pathFrom, const char* pathTo)
136137
log_e("%s does not exists", pathFrom);
137138
return false;
138139
}
139-
char * temp1 = (char *)malloc(strlen(pathFrom)+strlen(_mountpoint)+1);
140+
size_t mountpointLen = strlen(_mountpoint);
141+
char * temp1 = (char *)malloc(strlen(pathFrom)+mountpointLen+1);
140142
if(!temp1) {
141143
log_e("malloc failed");
142144
return false;
143145
}
144-
char * temp2 = (char *)malloc(strlen(pathTo)+strlen(_mountpoint)+1);
146+
char * temp2 = (char *)malloc(strlen(pathTo)+mountpointLen+1);
145147
if(!temp2) {
146148
free(temp1);
147149
log_e("malloc failed");
148150
return false;
149151
}
150-
sprintf(temp1,"%s%s", _mountpoint, pathFrom);
151-
sprintf(temp2,"%s%s", _mountpoint, pathTo);
152+
153+
strcpy(temp1, _mountpoint);
154+
strcat(temp1, pathFrom);
155+
156+
strcpy(temp2, _mountpoint);
157+
strcat(temp2, pathTo);
158+
152159
auto rc = ::rename(temp1, temp2);
153160
free(temp1);
154161
free(temp2);
@@ -182,7 +189,10 @@ bool VFSImpl::remove(const char* fpath)
182189
log_e("malloc failed");
183190
return false;
184191
}
185-
sprintf(temp,"%s%s", _mountpoint, fpath);
192+
193+
strcpy(temp, _mountpoint);
194+
strcat(temp, fpath);
195+
186196
auto rc = unlink(temp);
187197
free(temp);
188198
return rc == 0;
@@ -211,7 +221,10 @@ bool VFSImpl::mkdir(const char *fpath)
211221
log_e("malloc failed");
212222
return false;
213223
}
214-
sprintf(temp,"%s%s", _mountpoint, fpath);
224+
225+
strcpy(temp, _mountpoint);
226+
strcat(temp, fpath);
227+
215228
auto rc = ::mkdir(temp, ACCESSPERMS);
216229
free(temp);
217230
return rc == 0;
@@ -244,7 +257,10 @@ bool VFSImpl::rmdir(const char *fpath)
244257
log_e("malloc failed");
245258
return false;
246259
}
247-
sprintf(temp,"%s%s", _mountpoint, fpath);
260+
261+
strcpy(temp, _mountpoint);
262+
strcat(temp, fpath);
263+
248264
auto rc = ::rmdir(temp);
249265
free(temp);
250266
return rc == 0;
@@ -265,7 +281,9 @@ VFSFileImpl::VFSFileImpl(VFSImpl* fs, const char* fpath, const char* mode)
265281
if(!temp) {
266282
return;
267283
}
268-
sprintf(temp,"%s%s", _fs->_mountpoint, fpath);
284+
285+
strcpy(temp, _fs->_mountpoint);
286+
strcat(temp, fpath);
269287

270288
_path = strdup(fpath);
271289
if(!_path) {
@@ -362,7 +380,10 @@ void VFSFileImpl::_getStat() const
362380
if(!temp) {
363381
return;
364382
}
365-
sprintf(temp,"%s%s", _fs->_mountpoint, _path);
383+
384+
strcpy(temp, _fs->_mountpoint);
385+
strcat(temp, _path);
386+
366387
if(!stat(temp, &_stat)) {
367388
_written = false;
368389
}
@@ -466,14 +487,27 @@ FileImplPtr VFSFileImpl::openNextFile(const char* mode)
466487
if(file->d_type != DT_REG && file->d_type != DT_DIR) {
467488
return openNextFile(mode);
468489
}
469-
String fname = String(file->d_name);
470-
String name = String(_path);
471-
if(!fname.startsWith("/") && !name.endsWith("/")) {
472-
name += "/";
490+
491+
size_t pathLen = strlen(_path);
492+
size_t fileNameLen = strlen(file->d_name);
493+
char * name = (char *)malloc(pathLen+fileNameLen+2);
494+
495+
if(name == NULL) {
496+
return FileImplPtr();
473497
}
474-
name += fname;
475498

476-
return std::make_shared<VFSFileImpl>(_fs, name.c_str(), mode);
499+
strcpy(name, _path);
500+
501+
if ((file->d_name[0] != '/') && (_path[pathLen - 1] != '/'))
502+
{
503+
strcat(name, "/");
504+
}
505+
506+
strcat(name, file->d_name);
507+
508+
FileImplPtr fileImplPtr = std::make_shared<VFSFileImpl>(_fs, name, mode);
509+
free(name);
510+
return fileImplPtr;
477511
}
478512

479513
boolean VFSFileImpl::seekDir(long position){

0 commit comments

Comments
 (0)