Commit graph

652 commits

Author SHA1 Message Date
Rohit Grover b37a42c347 version v2.0.7 2015-11-18 15:18:44 +00:00
Rohit Grover 8c491571ee Merge pull request #73 from LiyouZhou/extern_c
use Extern c around #include to use nordic sdk headers implemented in C
2015-11-18 15:16:51 +00:00
Liyou Zhou dfb6ac292f Remove magic hash defines which are used in nrf51-sdk
nrf51-sdk files are modified to include these defines.
2015-11-18 14:25:10 +00:00
Liyou Zhou 348c323d27 Take modification out of the nordic sdk files
and put them into ARM written files.
2015-11-18 14:25:10 +00:00
Vincent Coubard cc0cf3dfa7 Merge remote-tracking branch 'origin/develop' into characteristicDescriptorDiscovery 2015-11-18 12:50:22 +00:00
Vincent Coubard 8bd7bdfa88 Add ARM header into source/nRF5xGattClient.h.
Use const references for passing characteristic discovery callbacks
Fix a bug in btle_discovery.cpp, the discovered descriptors were captured
by value instead of reference.
2015-11-18 12:45:43 +00:00
Vincent Coubard dc2dfb0a95 Add status parameter in terminateCharacteristicDiscovery function.
Fix terminate discovery (the replacement of the discovery was done after
the call to terminate).
When searching for a running discovery, dismiss results where the
characteristic is equal to the default characteristic value
Add Discovery::operator!=
Add support of DiscoveredCharacteristic last handle in the characteristic
discovery process
2015-11-17 14:20:17 +00:00
Rohit Grover d95dc10b27 version v2.0.6 2015-11-17 13:32:58 +00:00
LIYOU ZHOU c83d9e9cfe Merge pull request #67 from rgrover/develop
add Nordic's softdevice license agreement.
2015-11-17 13:29:42 +00:00
Rohit Grover 9cbf98cb82 add Nordic's license agreement.
@note: we need the softdevice in this module because it is shared with mbed-classic. This is where the mbed-classic toolchain expects to find the SD.
2015-11-17 12:54:35 +00:00
Vincent Coubard cdd5b92193 Relaunch discovery operation when gatt event status is
BLE_GATT_STATUS_SUCCESS.
Report error in the Termination callback
2015-11-17 10:24:57 +00:00
Rohit Grover a091922f10 version v2.0.5 2015-11-16 09:42:30 +00:00
Rohit Grover 7de2b7162f minor rewording of the comment introduced by the previous pull request 2015-11-16 09:41:27 +00:00
Rohit Grover a80e037317 Merge pull request #65 from andresag01/develop
Post radio notification callback through minar
2015-11-16 09:12:06 +00:00
Vincent Coubard e15d59a758 Add Characteristic Descriptor Discovery implementation 2015-11-13 14:53:46 +00:00
Andres Amaya Garcia f8b3f1340f Post radio notification callback through minar
The ble-nrf51822 implementation of the BLE API generated callbacks for radio
notification events without using the minar scheduler and at very high
priority. This functionality is replaced by posting events through minar
when YOTTA_CFG_MBED_OS is defined. Note that minar could not be used directly
to post callbacks because radio notification events are handled at very high
priority, which caused a hard-fault when minar tries to enter a critical
section. Alternatively, a Timeout was used to post the callback in another
context with lower priority.
2015-11-13 14:51:36 +00:00
Rohit Grover d2640b326e version v2.0.4 2015-11-13 11:03:53 +00:00
Rohit Grover ba82462f19 Merge pull request #64 from andresag01/develop
Fix assembly sequence to start bootloader in GCC
2015-11-13 11:02:07 +00:00
Andres Amaya Garcia c8cb3aeee3 Change assembly sequence to avoid changing APSR
Change assembly sequence that starts the Nordic bootloader to remove
MOV instruction before cheks of IPSR. The MOV might be translated into a ADDS
that could change the APSR and cause a wrong branch to be taken.
2015-11-13 10:36:02 +00:00
Andres Amaya Garcia 90f6c9714f Fix assembly sequence to start bootloader in GCC
The assemble sequence within an mbedOS application that starts the nordic
bootloader was being modified by the compiler. The result is that DFU enabled
applications could never start the bootloader correctly. This is because the
GCC compiler was translating a MOV instruction into a ADDS, which sets the
conditional flags in APSR before a conditional branch was executed. The result
of the incorrect branch caused the program to believe that it was in interrupt
mode when this was not the case.
2015-11-13 10:35:46 +00:00
Rohit Grover 1b42c27110 version v2.0.3 2015-11-09 09:01:01 +00:00
Rohit Grover e71dc9504e Merge pull request #62 from marcuschangarm/watchdog
Added watchdog header file from Nordic SDK 8.1
2015-11-09 08:58:24 +00:00
Marcus Chang 55aef3bf24 Added watchdog header file from Nordic SDK 8.1 2015-11-07 12:27:34 +00:00
Rohit Grover 60a7c0c04b bring in the latest changes for BLE::init() where we allow <object, member> tuples for init callback. 2015-11-03 12:43:10 +00:00
Rohit Grover 63dcf9fa44 version v2.0.2 2015-11-03 12:41:56 +00:00
Rohit Grover 6b763c8709 bring in the latest changes for BLE::init() where we allow <object, member> tuples for init callback. 2015-11-03 12:41:08 +00:00
Rohit Grover 95706f05ed Merge branch 'master' into develop 2015-11-02 17:32:27 +00:00
Rohit Grover ba7ac12db5 version v2.0.1 2015-11-02 17:29:17 +00:00
Rohit Grover e7cc192834 Merge pull request #58 from pan-/fix-initialization
Ensure that the initialization flags is set to false if the BLE stack is shutdown properly.
2015-11-02 17:21:55 +00:00
Vincent Coubard f0d521f04c Ensure that the initialization flags is set to false if the BLE stack is
shutdown properly.
2015-11-02 17:04:47 +00:00
Rohit Grover 479bae5fcb Merge branch 'develop' 2015-11-02 08:58:14 +00:00
Rohit Grover 847c27cfe9 Version 2.0.0
=============

* Update init() to match the changes around initializationCompleteCallback.
  Also implemented hasInitialized().
  Refer to https://github.com/ARMmbed/ble/pull/91 and https://github.com/ARMmbed/ble/issues/90.

* Some changes for memory savings. Certain singletons are now allocated
  dynamically; so some memory may not be needed if the application exercises
  limited functionality. Also reduced the size of some global tables for
  memory savings; affected tables/constants: UUID_TABLE_MAX_ENTRIES (down to 4),
  DEVICE_MANAGER_MAX_BONDS (down to 2).
2015-10-30 14:32:12 +00:00
Rohit Grover c5dc7e52a6 add init guards for some top level APIs 2015-10-30 10:27:18 +00:00
Rohit Grover 20b07e38bc update init() to match the chagnes around initializationCompleteCallback.
refer to https://github.com/ARMmbed/ble/pull/91 and https://github.com/ARMmbed/ble/issues/90
2015-10-30 10:26:37 +00:00
Rohit Grover aba22463c8 Merge branch 'master' into develop 2015-10-30 10:21:17 +00:00
Rohit Grover 2fc324f01b Merge pull request #55 from andresag01/develop
Introduced changes for memory savings
2015-10-29 13:03:37 +00:00
Andres Amaya Garcia 97a65815ed Introduced changes for memory savings
Moved GattSecurityManager and GattClient to be allocated dynamically and
reduced the size of some arrays to increase memory savings.
2015-10-29 11:39:00 +00:00
Rohit Grover 18050e7068 Merge pull request #53 from marcuschangarm/defaultScanParams
When connecting, if no scanning parameters are passed, use values from Gap parent.
2015-10-20 12:48:28 +01:00
Bogdan Marinescu 63df68b147 version v1.0.0 2015-10-19 16:17:00 +03:00
Bogdan Marinescu a9f33e16dc Updated dependencies 2015-10-19 16:17:00 +03:00
Marcus Chang 6082c76ab5 When connecting, if no scanning parameters are passed, use values from Gap parent. 2015-10-16 11:44:03 +01:00
Rohit Grover 804e7f8bb9 Merge #48 into develop 2015-10-13 12:55:29 +01:00
Rohit Grover 816f4559f1 white space diffs; convert tabs to spaces 2015-10-13 12:54:46 +01:00
Rohit Grover 031ae20002 Merge branch 'patch-1' of https://github.com/Timmmm/ble-nrf51822 into Timmmm-patch-1 2015-10-13 12:51:08 +01:00
Rohit Grover 9d51dfe4a6 Merge pull request #49 from jpbrucker/s110_compat
Update S110 detection macros, again
2015-10-13 12:45:09 +01:00
Jean-Philippe Brucker eab6631cb6 Update S110 detection macros again
The mbed SDK actually prefixes all labels from targets.py with "TARGET_".
Update our detection macros accordingly.
2015-10-05 18:05:55 +01:00
Tim 4af5d03cd5 Error check number of characteristics
Currently it just blindly writes beyond the end of the array, leading to impossible-to-find bugs.

It doesn't help that the limit on the number of characteristics doesn't seem to be documented anywhere.
2015-09-29 15:04:59 +01:00
Rohit Grover ad59bf4701 Merge branch 'develop' 2015-09-25 15:24:03 +01:00
Rohit Grover d18b39efc4 Release 0.4.8
=============

* Relocate the FOTA bootloader image to this repository. The bootloader
  image(s) was previously stored in the mbed SDK, but it was decided that
  putting it inside the nRF module would make more sense. This allows users to
  replace the bootloader with something other than the default.

  The new search algorithm is:
   - search for any file named nrf51822_bootloader.hex *ELSE*
   - search for any file named (depending on the choice of S130/S110 softdevice)
       s130_nrf51_1.0.0_bootloader.hex
       s110_nrf51822_8.0.0_bootloader.hex
  The exact location of the bootloader image isn't too important, since mbed
  SDK looks for file names in all scanned resource files.

* Initialize the member `authorizationReply` when posting read-write
  authorization callbacks to the application.

* Minor rework for error handling in nRF5xGattServer::write()--including
  remove of the un-necessary variable `gapConnectionHandle`.

* Update yotta CMake files to suppress warnings for unused parameters and
  missing initializers (especially when building with gcc).
2015-09-25 15:21:19 +01:00
Rohit Grover ee2b3dfe4a nRF5xGattServer::write()L remember to setup returnValue to BLE_STACK_BUSY in the case of an unforseen error. 2015-09-25 14:19:49 +01:00