Fix indication deadlock

dsanders11 · dsanders11 · commit e6117755e841 · 2017-09-10T06:54:00.000-06:00
diff --git a/src/nRF51822.cpp b/src/nRF51822.cpp
@@ -1081,15 +1081,9 @@ bool nRF51822::updateCharacteristicValue(BLECharacteristic& characteristic) {
       }
 
       if (localCharacteristicInfo->indicateSubscribed) {
-        if (this->_txBufferCount > 0) {
-          this->_txBufferCount--;
+        hvxParams.type = BLE_GATT_HVX_INDICATION;
 
-          hvxParams.type = BLE_GATT_HVX_INDICATION;
-
-          sd_ble_gatts_hvx(this->_connectionHandle, &hvxParams);
-        } else {
-          success = false;
-        }
+        success = sd_ble_gatts_hvx(this->_connectionHandle, &hvxParams) == NRF_SUCCESS;
       }
     }
   }
@@ -1140,7 +1134,7 @@ bool nRF51822::canNotifyCharacteristic(BLECharacteristic& /*characteristic*/) {
 }
 
 bool nRF51822::canIndicateCharacteristic(BLECharacteristic& /*characteristic*/) {
-  return (this->_txBufferCount > 0);
+  return true;
 }
 
 bool nRF51822::canReadRemoteCharacteristic(BLERemoteCharacteristic& characteristic) {

Original file line number	Diff line number	Diff line change
`@@ -1081,15 +1081,9 @@ bool nRF51822::updateCharacteristicValue(BLECharacteristic& characteristic) {`
`1081`	`1081`	`}`
`1082`	`1082`
`1083`	`1083`	`if (localCharacteristicInfo->indicateSubscribed) {`
`1084`		`- if (this->_txBufferCount > 0) {`
`1085`		`- this->_txBufferCount--;`
	`1084`	`+ hvxParams.type = BLE_GATT_HVX_INDICATION;`
`1086`	`1085`
`1087`		`- hvxParams.type = BLE_GATT_HVX_INDICATION;`
`1088`		`-`
`1089`		`- sd_ble_gatts_hvx(this->_connectionHandle, &hvxParams);`
`1090`		`- } else {`
`1091`		`- success = false;`
`1092`		`- }`
	`1086`	`+ success = sd_ble_gatts_hvx(this->_connectionHandle, &hvxParams) == NRF_SUCCESS;`
`1093`	`1087`	`}`
`1094`	`1088`	`}`
`1095`	`1089`	`}`
`@@ -1140,7 +1134,7 @@ bool nRF51822::canNotifyCharacteristic(BLECharacteristic& /characteristic/) {`
`1140`	`1134`	`}`
`1141`	`1135`
`1142`	`1136`	`bool nRF51822::canIndicateCharacteristic(BLECharacteristic& /characteristic/) {`
`1143`		`- return (this->_txBufferCount > 0);`
	`1137`	`+ return true;`
`1144`	`1138`	`}`
`1145`	`1139`
`1146`	`1140`	`bool nRF51822::canReadRemoteCharacteristic(BLERemoteCharacteristic& characteristic) {`