@@ -154,7 +154,7 @@ static uint8_t _spp_tx_buffer[SPP_TX_MAX];
154
154
static uint16_t _spp_tx_buffer_len = 0 ;
155
155
156
156
static bool _spp_send_buffer (){
157
- if ((xEventGroupWaitBits (_spp_event_group, SPP_CONGESTED, pdFALSE, pdTRUE, portMAX_DELAY) & SPP_CONGESTED)){
157
+ if ((xEventGroupWaitBits (_spp_event_group, SPP_CONGESTED, pdFALSE, pdTRUE, portMAX_DELAY) & SPP_CONGESTED) != 0 ){
158
158
esp_err_t err = esp_spp_write (_spp_client, _spp_tx_buffer_len, _spp_tx_buffer);
159
159
if (err != ESP_OK){
160
160
log_e (" SPP Write Failed! [0x%X]" , err);
@@ -365,11 +365,11 @@ static void esp_bt_gap_cb(esp_bt_gap_cb_event_t event, esp_bt_gap_cb_param_t *pa
365
365
break ;
366
366
367
367
case ESP_BT_GAP_DEV_PROP_COD:
368
- // log_i ("ESP_BT_GAP_DEV_PROP_COD");
368
+ log_d (" ESP_BT_GAP_DEV_PROP_COD" );
369
369
break ;
370
370
371
371
case ESP_BT_GAP_DEV_PROP_RSSI:
372
- // log_i ("ESP_BT_GAP_DEV_PROP_RSSI");
372
+ log_d (" ESP_BT_GAP_DEV_PROP_RSSI" );
373
373
break ;
374
374
375
375
default :
@@ -578,7 +578,7 @@ static bool _stop_bt()
578
578
579
579
static bool waitForConnect (int timeout) {
580
580
TickType_t xTicksToWait = timeout / portTICK_PERIOD_MS;
581
- return (xEventGroupWaitBits (_spp_event_group, SPP_CONNECTED, pdFALSE, pdTRUE, xTicksToWait) != 0 ) ;
581
+ return (xEventGroupWaitBits (_spp_event_group, SPP_CONNECTED, pdFALSE, pdTRUE, xTicksToWait) & SPP_CONNECTED) != 0 ;
582
582
}
583
583
584
584
/*
@@ -761,7 +761,7 @@ bool BluetoothSerial::disconnect() {
761
761
log_i (" disconnecting" );
762
762
if (esp_spp_disconnect (_spp_client) == ESP_OK) {
763
763
TickType_t xTicksToWait = READY_TIMEOUT / portTICK_PERIOD_MS;
764
- return (xEventGroupWaitBits (_spp_event_group, SPP_DISCONNECTED, pdFALSE, pdTRUE, xTicksToWait) != 0 ) ;
764
+ return (xEventGroupWaitBits (_spp_event_group, SPP_DISCONNECTED, pdFALSE, pdTRUE, xTicksToWait) & SPP_DISCONNECTED) != 0 ;
765
765
}
766
766
}
767
767
return false ;
@@ -789,6 +789,6 @@ bool BluetoothSerial::isReady(bool checkMaster, int timeout) {
789
789
return false ;
790
790
}
791
791
TickType_t xTicksToWait = timeout / portTICK_PERIOD_MS;
792
- return (xEventGroupWaitBits (_spp_event_group, SPP_RUNNING, pdFALSE, pdTRUE, xTicksToWait) != 0 ) ;
792
+ return (xEventGroupWaitBits (_spp_event_group, SPP_RUNNING, pdFALSE, pdTRUE, xTicksToWait) & SPP_RUNNING) != 0 ;
793
793
}
794
794
#endif
0 commit comments