Correct | to &, and swap order of write vs write without response

sandeepmistry · SidLeung · commit d72f2bd191c3 · 2017-03-22T18:16:55.000-07:00
diff --git a/libraries/CurieBLE/src/internal/BLECharacteristicImp.cpp b/libraries/CurieBLE/src/internal/BLECharacteristicImp.cpp
@@ -697,15 +697,7 @@ bool BLECharacteristicImp::write(const unsigned char value[],
     }
     
     // Send write request
-    if (_gatt_chrc.properties | BT_GATT_CHRC_WRITE_WITHOUT_RESP)
-    {
-        retval = bt_gatt_write_without_response(conn, 
-                                                _value_handle,
-                                                value, 
-                                                length, 
-                                                false);
-    }
-    else if (_gatt_chrc.properties | BT_GATT_CHRC_WRITE)
+    if (_gatt_chrc.properties & BT_GATT_CHRC_WRITE)
     {
         _gattc_writing = true;
         retval = bt_gatt_write(conn, 
@@ -718,6 +710,13 @@ bool BLECharacteristicImp::write(const unsigned char value[],
         {
             delay(2);
         }
+    } else if (_gatt_chrc.properties & BT_GATT_CHRC_WRITE_WITHOUT_RESP)
+    {
+        retval = bt_gatt_write_without_response(conn, 
+                                                _value_handle,
+                                                value, 
+                                                length, 
+                                                false);
     }
     bt_conn_unref(conn);
     return (0 == retval);

Original file line number	Diff line number	Diff line change
`@@ -697,15 +697,7 @@ bool BLECharacteristicImp::write(const unsigned char value[],`
`697`	`697`	`}`
`698`	`698`
`699`	`699`	`// Send write request`
`700`		`- if (_gatt_chrc.properties \| BT_GATT_CHRC_WRITE_WITHOUT_RESP)`
`701`		`- {`
`702`		`- retval = bt_gatt_write_without_response(conn,`
`703`		`- _value_handle,`
`704`		`- value,`
`705`		`- length,`
`706`		`- false);`
`707`		`- }`
`708`		`- else if (_gatt_chrc.properties \| BT_GATT_CHRC_WRITE)`
	`700`	`+ if (_gatt_chrc.properties & BT_GATT_CHRC_WRITE)`
`709`	`701`	`{`
`710`	`702`	`_gattc_writing = true;`
`711`	`703`	`retval = bt_gatt_write(conn,`
`@@ -718,6 +710,13 @@ bool BLECharacteristicImp::write(const unsigned char value[],`
`718`	`710`	`{`
`719`	`711`	`delay(2);`
`720`	`712`	`}`
	`713`	`+ } else if (_gatt_chrc.properties & BT_GATT_CHRC_WRITE_WITHOUT_RESP)`
	`714`	`+ {`
	`715`	`+ retval = bt_gatt_write_without_response(conn,`
	`716`	`+ _value_handle,`
	`717`	`+ value,`
	`718`	`+ length,`
	`719`	`+ false);`
`721`	`720`	`}`
`722`	`721`	`bt_conn_unref(conn);`
`723`	`722`	`return (0 == retval);`