Skip to content

Commit 0a73db5

Browse files
committed
Merge remote-tracking branch 'origin/master' into quaternion-service
2 parents 5e81644 + 80fadef commit 0a73db5

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

libraries/Bluefruit52Lib/src/BLECharacteristic.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,12 @@ bool BLECharacteristic::notify(uint16_t conn_hdl, const void* data, uint16_t len
687687
};
688688

689689
LOG_LV2("CHR", "Notify %d bytes", packet_len);
690-
VERIFY_STATUS( sd_ble_gatts_hvx(conn_hdl, &hvx_params), false );
690+
uint32_t status = sd_ble_gatts_hvx(conn_hdl, &hvx_params);
691+
if(NRF_SUCCESS != status)
692+
{
693+
conn->releaseHvnPacket();
694+
}
695+
VERIFY_STATUS(status, false );
691696

692697
remaining -= packet_len;
693698
u8data += packet_len;

libraries/Bluefruit52Lib/src/BLEConnection.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,11 @@ bool BLEConnection::getHvnPacket (void)
210210
return xSemaphoreTake(_hvn_sem, ms2tick(BLE_GENERIC_TIMEOUT));
211211
}
212212

213+
bool BLEConnection::releaseHvnPacket(void)
214+
{
215+
return xSemaphoreGive(_hvn_sem);
216+
}
217+
213218
bool BLEConnection::getWriteCmdPacket (void)
214219
{
215220
return xSemaphoreTake(_wrcmd_sem, ms2tick(BLE_GENERIC_TIMEOUT));

libraries/Bluefruit52Lib/src/BLEConnection.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ class BLEConnection
100100
void stopRssi(void);
101101

102102
bool getHvnPacket(void);
103+
bool releaseHvnPacket(void);
103104
bool getWriteCmdPacket(void);
104105
bool waitForIndicateConfirm(void);
105106

0 commit comments

Comments
 (0)