Andrzej Puzdrowski
62543f1337
remove unrichable return statment
2016-07-15 13:16:01 +02:00
Andrzej Puzdrowski
d433b55763
changes from CR of IAR fixes for nRF5x port
2016-07-15 13:10:20 +02:00
Andrzej Puzdrowski
7eaef66ba2
rename scater file for nRF52 ARM_5
2016-07-14 17:09:30 +02:00
Andrzej Puzdrowski
5d7c5cf9c1
Corect nRF51 IAR scatre files in order to be compatible with softdevice 130 2.0.0
2016-07-14 17:03:06 +02:00
Andrzej Puzdrowski
7861cefb05
Fix: IAR build for NRF5x produce proper combined intel-hex file.
2016-07-14 16:37:02 +02:00
Andrzej Puzdrowski
f281ecd4be
Comand IAR toolchain to provide intel-hex as a build product.
2016-07-14 13:01:22 +02:00
Andrzej Puzdrowski
3c8c82b06c
make posible IAR compilation
...
IAR dosen't support "flexible array member" in c++ compilation
pm_peer_data_local_gatt_db_t::data[] -> pm_peer_data_local_gatt_db_t::data[1]
2016-07-13 13:16:36 +02:00
Andrzej Puzdrowski
17c72504ca
os_tick for iar
2016-07-07 12:16:11 +02:00
Andrzej Puzdrowski
bd8c335c07
add scater files forARM CC and IAR for nRF52
...
add the startup file for IAR
modyfi object.h for strict compiler
2016-07-06 09:53:53 +02:00
Andrzej Puzdrowski
a8c27bde69
startup file for nRF52 basing on nRF51 and nordic SDK v11.
2016-07-05 15:27:57 +02:00
Vincent Coubard
0d9dc1e079
Merge pull request #16 from ARMmbed/nordic_sdk_integration
...
Nordic sdk integration
2016-07-04 10:37:15 +01:00
Andrzej Głąbek
6a31d1abc1
Merge pull request #14 from anangl/hal_improvements
...
Enabled lp_ticker after adjusting its implementation to the new API.
2016-07-04 09:23:47 +02:00
Głąbek, Andrzej
75ba6b7623
Polished tickers implementation - moved interrupt clearing code.
2016-07-04 09:21:39 +02:00
Andrzej Puzdrowski
fb7b463244
Merge pull request #15 from nvlsianpu/nordic_sdk_integration
...
new nordic license clause
2016-07-01 17:24:29 +02:00
Andrzej Puzdrowski
f7d53d1291
New Nordic license clause
2016-07-01 17:20:37 +02:00
Andrzej Puzdrowski
7e62fc3f19
Merge branch 'nordic_sdk_integration' of https://github.com/ARMmbed/mbed-nordic into nordic_sdk_integration
2016-07-01 17:01:54 +02:00
Andrzej Puzdrowski
0249ee12e7
add missing dates in some nordic license disclamer
2016-07-01 17:01:37 +02:00
Głąbek, Andrzej
bf70d5a4dd
Enabled lp_ticker after adjusting its implementation to the new API.
2016-07-01 15:03:35 +02:00
Andrzej Głąbek
e5a2bfc4dd
Merge pull request #13 from anangl/hal_improvements
...
Added multi-instance and slave mode support to spi_api
2016-07-01 13:41:10 +02:00
Głąbek, Andrzej
fce8a300d1
Merge branch 'nordic_sdk_integration' of https://github.com/ARMmbed/mbed-nordic into hal_improvements
...
# Conflicts:
# hal/targets.json
2016-07-01 13:23:08 +02:00
Głąbek, Andrzej
f02d431b2d
Added multi-instance and slave mode support to spi_api.
2016-06-30 15:13:32 +02:00
Andrzej Puzdrowski
02bc98aecf
Merge branch 'nordic_sdk_integration' of https://github.com/ARMmbed/mbed-nordic into nordic_sdk_integration
...
# Conflicts:
# hal/targets.json
2016-06-30 10:39:38 +02:00
Andrzej Puzdrowski
adf15c8117
CR of AnalogIn
2016-06-30 09:32:48 +02:00
Andrzej Puzdrowski
9d137c834c
AnalogIn for nRF52 add u16 readout API realization. Polish rest of the code.
2016-06-29 15:23:11 +02:00
Andrzej Puzdrowski
f19efb6a43
AnalogIn for nRF51 Fixes
...
multiinstances was not suported for nrf51
made nrf_saadc SDK hal private for nRF52
2016-06-29 12:29:38 +02:00
Andrzej Puzdrowski
3bde75a74c
Merge pull request #11 from anangl/nordic_sdk_integration
2016-06-29 08:11:20 +02:00
Andrzej Puzdrowski
44bef4100e
AnalogIn api implenetation for nRF52 - supplement in target descriptor
2016-06-29 08:04:33 +02:00
Andrzej Puzdrowski
63bfe7dc1b
Merge branch 'nordic_sdk_integration' of https://github.com/nvlsianpu/mbed-nordic into nordic_sdk_integration
2016-06-28 17:35:55 +02:00
Andrzej Puzdrowski
eef471bee4
AnalogIn api implenetation for nRF52
2016-06-28 17:31:49 +02:00
Andrzej Głąbek
1688054af7
Merge pull request #4 from anangl/hal_improvements
...
Hal improvements
2016-06-28 12:15:58 +02:00
Głąbek, Andrzej
3ff34ef58d
Merge branch 'nordic_sdk_integration' into hal_improvements
...
# Conflicts:
# hal/targets.json
2016-06-28 12:13:50 +02:00
Andrzej Głąbek
79ee724d18
Merge pull request #3 from ARMmbed/nordic_sdk_integration
...
up merge from ARMmbed/nordic_sdk_integration
2016-06-28 12:08:38 +02:00
Andrzej Głąbek
8de419c1b7
Merge pull request #10 from nvlsianpu/nordic_sdk_integration
...
Analog Input for nRF51 rework + PWM fix
2016-06-28 12:00:50 +02:00
Andrzej Puzdrowski
1c262e3444
remove unwanted initialization of adc_value
2016-06-28 11:58:18 +02:00
Andrzej Puzdrowski
f21ca348f8
Merge pull request #9 from anangl/nordic_sdk_integration
...
Corrected 'serial_api' implementation.
2016-06-28 09:43:39 +02:00
Andrzej Puzdrowski
5ba9392280
Merge branch 'nordic_sdk_integration' of https://github.com/nvlsianpu/mbed-nordic into nordic_sdk_integration
...
# Conflicts:
# hal/targets.json
2016-06-27 12:42:13 +02:00
Andrzej Puzdrowski
a664be0347
Fix AnalogInput fo nRF51.
2016-06-27 12:28:17 +02:00
Głąbek, Andrzej
1357fb0ffc
Polished ticker related code.
2016-06-24 16:30:11 +02:00
Głąbek, Andrzej
ba863f4e3d
Enabled I2C_ASYNCH.
2016-06-24 09:02:29 +02:00
Głąbek, Andrzej
3bdbccb5c0
Corrected serial_api implementation, so 'serial_putc' no longer requires enabled interrupts.
2016-06-24 08:27:52 +02:00
Andrzej Puzdrowski
e259029e67
Merge pull request #6 from anangl/nordic_sdk_integration
...
Made some corrections needed to build successfully the tests for nRF51.
2016-06-23 14:13:59 +02:00
Głąbek, Andrzej
8249a7f2c5
Merge branch 'nordic_sdk_integration' of https://github.com/ARMmbed/mbed-nordic into nordic_sdk_integration
...
# Conflicts:
# tools/build_api.py
2016-06-23 09:03:18 +02:00
Andrzej Głąbek
bb2111a973
Merge pull request #8 from pan-/backport_tests_fix
...
Fixing test builds for devices with softdevices.
2016-06-23 08:56:52 +02:00
Głąbek, Andrzej
f880312477
Merge branch 'nordic_sdk_integration' of https://github.com/ARMmbed/mbed-nordic into nordic_sdk_integration
...
# Conflicts:
# hal/targets.json
# hal/targets/cmsis/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/system_nrf51.c
# hal/targets/cmsis/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/system_nrf52.c
2016-06-23 07:03:18 +02:00
Głąbek, Andrzej
601b96dde2
Restored alternative method of RTOS tick generation for NRF51, which was undesirably removed when the new us_ticker implementation was introduced.
2016-06-22 15:09:54 +02:00
Głąbek, Andrzej
6c7d15d381
Re-enabled SPI after adjusting HAL implementation to slightly different API.
2016-06-22 13:55:36 +02:00
Brian Daniels
22b5c78191
Fixing test builds for devices with softdevices.
...
Previously, .hex files were not copied when building source as a library.
This prevents builds that pre compile source as a library and then
includes the build directory as the only source (because there is no
softdevice present). This PR copies hex files when compiling source
as a library.
2016-06-22 09:30:02 +01:00
Andrzej Puzdrowski
089143e114
Merge pull request #7 from pan-/ble_integration
...
Ble integration
2016-06-21 09:14:30 +02:00
Andrzej Puzdrowski
05fea6e286
Corection in macros for NRF5x devices
...
Remove duplicated macro "BLE_STACK_SUPPORT_REQD" for MCU_NRF51
add macro "S132" for MCU_NRF52
2016-06-21 09:13:20 +02:00
Vincent Coubard
daf7ef352d
Import assert fix from mbed v3.
2016-06-17 11:26:48 +01:00