You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2016/04/26 21:55:21 UTC

[01/14] incubator-mynewt-core git commit: Undef byte swapping macros that exist in some envs.

Repository: incubator-mynewt-core
Updated Branches:
  refs/heads/develop 546cf5e3c -> c12dbb96b


Undef byte swapping macros that exist in some envs.

This allows the nimble unit tests to compile in sim on my linux machine.


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/849ca1da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/849ca1da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/849ca1da

Branch: refs/heads/develop
Commit: 849ca1da91eadc739c845b00f329ce4ad8ab6e97
Parents: 963ff4d
Author: ccollins at iori.nightmare.heaven <cc...@iori.nightmare-heaven.no-ip.biz>
Authored: Wed Mar 9 09:57:25 2016 -0800
Committer: Christopher Collins <cc...@gmail.com>
Committed: Wed Mar 9 11:32:30 2016 -0800

----------------------------------------------------------------------
 net/nimble/include/nimble/ble.h | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/849ca1da/net/nimble/include/nimble/ble.h
----------------------------------------------------------------------
diff --git a/net/nimble/include/nimble/ble.h b/net/nimble/include/nimble/ble.h
index e9a1e93..babb3ac 100644
--- a/net/nimble/include/nimble/ble.h
+++ b/net/nimble/include/nimble/ble.h
@@ -109,6 +109,12 @@ struct ble_mbuf_hdr
 extern uint8_t g_dev_addr[BLE_DEV_ADDR_LEN];
 extern uint8_t g_random_addr[BLE_DEV_ADDR_LEN];
 
+#undef htole16
+#undef htole32
+#undef htole64
+#undef le16toh
+#undef le32toh
+#undef le64toh
 void htole16(void *buf, uint16_t x);
 void htole32(void *buf, uint32_t x);
 void htole64(void *buf, uint64_t x);


[05/14] incubator-mynewt-core git commit: Update core repo; point to mynewt_0_8_0_b2_tag tag

Posted by ma...@apache.org.
Update core repo; point to mynewt_0_8_0_b2_tag tag


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/feab469a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/feab469a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/feab469a

Branch: refs/heads/develop
Commit: feab469a07c24d32de36005a05f64a6966bf8c69
Parents: 3020b32
Author: Christopher Collins <cc...@apache.org>
Authored: Mon Mar 14 19:40:47 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Mon Mar 14 19:40:47 2016 -0700

----------------------------------------------------------------------
 repository.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/feab469a/repository.yml
----------------------------------------------------------------------
diff --git a/repository.yml b/repository.yml
index 348ca77..919593d 100644
--- a/repository.yml
+++ b/repository.yml
@@ -1,4 +1,5 @@
 repo.name: apache-mynewt-core
 repo.versions:
-    "0.0.0": "develop"
-    "0-latest": "0.0.0"
+    "0.7.9": "mynewt_0_8_0_b2_tag"
+    "0-latest": "0.7.9"
+    "0.8-latest": "0.7.9"


[06/14] incubator-mynewt-core git commit: Merge branch 'develop'

Posted by ma...@apache.org.
Merge branch 'develop'


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/345867d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/345867d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/345867d8

Branch: refs/heads/develop
Commit: 345867d88b34d87aa26768eb13bc9753395143dc
Parents: feab469 c8f8b9a
Author: Christopher Collins <cc...@apache.org>
Authored: Mon Mar 14 19:42:26 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Mon Mar 14 19:42:26 2016 -0700

----------------------------------------------------------------------
 hw/bsp/nrf51dk/boot-nrf51dk.ld     |  2 +-
 hw/bsp/nrf51dk/nrf51dk.ld          |  2 +-
 hw/bsp/nrf51dk/nrf51dk_download.sh |  2 +-
 hw/bsp/nrf51dk/src/os_bsp.c        | 10 +++++-----
 targets/unittest/pkg.yml           |  6 ++++++
 targets/unittest/target.yml        |  4 ++++
 6 files changed, 18 insertions(+), 8 deletions(-)
----------------------------------------------------------------------



[07/14] incubator-mynewt-core git commit: Merge branch 'develop'

Posted by ma...@apache.org.
Merge branch 'develop'


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/41f70c93
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/41f70c93
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/41f70c93

Branch: refs/heads/develop
Commit: 41f70c937339b27ff4f6257ccf3dd80163732b2d
Parents: 345867d 32040ac
Author: Christopher Collins <cc...@apache.org>
Authored: Mon Mar 14 22:03:22 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Mon Mar 14 22:03:22 2016 -0700

----------------------------------------------------------------------
 .rat-excludes                              |  5 +++++
 libs/os/src/arch/sim/os_arch_stack_frame.s | 19 +++++++++++++++++++
 targets/unittest/pkg.yml                   | 19 +++++++++++++++++++
 targets/unittest/target.yml                | 19 +++++++++++++++++++
 4 files changed, 62 insertions(+)
----------------------------------------------------------------------



[08/14] incubator-mynewt-core git commit: Merge branch 'develop' - prep for 0.8.0-b2 tagging.

Posted by ma...@apache.org.
Merge branch 'develop' - prep for 0.8.0-b2 tagging.


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/2acc09b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/2acc09b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/2acc09b2

Branch: refs/heads/develop
Commit: 2acc09b23f0f72ad9823eca8e00a5ad3bd42d1ea
Parents: 41f70c9 f23b563
Author: Christopher Collins <cc...@apache.org>
Authored: Wed Mar 16 22:29:12 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Wed Mar 16 22:29:12 2016 -0700

----------------------------------------------------------------------
 LICENSE          |  2 +-
 README.md        | 16 +++++++++++++---
 RELEASE_NOTES.md | 25 ++++++++++++-------------
 3 files changed, 26 insertions(+), 17 deletions(-)
----------------------------------------------------------------------



[12/14] incubator-mynewt-core git commit: update readme

Posted by ma...@apache.org.
update readme


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/9ae1d4fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/9ae1d4fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/9ae1d4fc

Branch: refs/heads/develop
Commit: 9ae1d4fc7495b5e5b46c955ce93812f9b37c3dcb
Parents: cd728c0
Author: Sterling Hughes <st...@apache.org>
Authored: Tue Mar 29 18:23:14 2016 -0700
Committer: Sterling Hughes <st...@apache.org>
Committed: Tue Mar 29 18:23:14 2016 -0700

----------------------------------------------------------------------
 README.md | 64 ++++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 49 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/9ae1d4fc/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 02b6b3b..5315c48 100644
--- a/README.md
+++ b/README.md
@@ -19,24 +19,58 @@
 #
 -->
 
-# Apache Mynewt Core 
+<img src="http://mynewt.apache.org/img/logo.svg" width="250" alt="Apache Mynewt">
 
 ## Overview
 
-This repository represents the core of the Apache Mynewt repository.
-It contains the major packages that make up the Apache Mynewt Operating 
-System.  For instructions on getting Apache Mynewt up & running, please 
-see our [Getting Started Guide](https://mynewt.apache.org/os/get_started/introduction/).
-
-Apache Mynewt Core is not a standalone application, and it is not intended to
-be built by itself.  To run the unit tests for all the packages contained in
-Apache Mynewt Core, install the Apache Newt tool as documented in the [Getting
-Started Guide](https://mynewt.apache.org/os/get_started/introduction/#newt) and
-run the following command from the core directory:
-
-```no-highlight
-    $ newt test all
-```
+Apache Mynewt is an open-source operating system for tiny embedded devices.  
+It's goal is to make it easy to develop applications for microcontroller 
+environments, where power and cost are driving factors.
+
+It currently supports the following hardware platforms: 
+    
+* Arduino Zero and Zero Pro
+* Nordic NRF51 and NRF52
+* Rigado BMD-300
+* STM32F3 and STMF32F4 
+* Native (simulated)
+
+Mynewt uses the [Newt](https://www.github.com/apache/incubator-mynewt-newt) 
+build and package management system, which allows you to compose your OS, and 
+only choose the components you need.  
+
+This repository contains the core packages of the Apache Mynewt OS, including:
+
+* A Pre-emptive, Real Time OS Kernel
+* A open-source Bluetooth 4.2 stack (both Host & Controller), that completely replaces
+the proprietary SoftDevice on Nordic chipsets.
+    - Support for 251 byte packet size
+    - Support for all 4 roles concurrently - Broadcaster, Observer, Peripheral and Central
+    - Support for up to 32 simultaeneous connections. 
+* A flash filesystem, NFFS, which is designed for tiny (128KB->16MB) flashes.
+* Bootloader support
+* Remote Software Upgrade
+* HAL and BSP infrastructure designed to abstract microcontroller specifics
+* Shell and Console support
+* Statistics and Logging Infrastructure 
+
+For more information on the Mynewt OS, please visit our website [here](https://mynewt.apache.org/).  
+If you'd like to get started, visit the [Getting Started Guide](https://mynewt.apache.org/os/get_started/introduction/).
+
+## Roadmap
+
+Mynewt is being actively developed.  Some of the features we're currently working on:
+
+* Deep sleep: Mynewt OS will coordinate peripherals and processor to put the processor 
+  to sleep when all tasks are idle.
+* Support for different boards and microcontroller architectures, we're working on:
+    - ESP8266 
+    - Arduino Uno
+    - Arduino Mega
+* Enhancements to BLE 4.2 support:
+    - Security Manager Protocol
+    - LE Secure Connections
+    - Random addresses for link-layer security
 
 ## Browsing 
 


[03/14] incubator-mynewt-core git commit: now with the right format

Posted by ma...@apache.org.
now with the right format


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/3104b495
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/3104b495
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/3104b495

Branch: refs/heads/develop
Commit: 3104b4952a832ef3e2ec1ed29519c5b206ff2ab3
Parents: 9f9d6af
Author: Sterling Hughes <st...@apache.org>
Authored: Thu Mar 10 01:09:13 2016 -0800
Committer: Sterling Hughes <st...@apache.org>
Committed: Thu Mar 10 01:09:13 2016 -0800

----------------------------------------------------------------------
 repository.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/3104b495/repository.yml
----------------------------------------------------------------------
diff --git a/repository.yml b/repository.yml
index 06c195e..348ca77 100644
--- a/repository.yml
+++ b/repository.yml
@@ -1,3 +1,4 @@
 repo.name: apache-mynewt-core
 repo.versions:
-    "0-latest": "develop"
+    "0.0.0": "develop"
+    "0-latest": "0.0.0"


[04/14] incubator-mynewt-core git commit: Merge branch 'develop' for 0.8.0 B2

Posted by ma...@apache.org.
Merge branch 'develop' for 0.8.0 B2


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/3020b32d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/3020b32d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/3020b32d

Branch: refs/heads/develop
Commit: 3020b32d67ff2c04da69bed9d76df43bf9bbed70
Parents: 3104b49 c4d8d39
Author: Christopher Collins <cc...@apache.org>
Authored: Mon Mar 14 17:27:00 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Mon Mar 14 17:27:00 2016 -0700

----------------------------------------------------------------------
 README.md                                       |  152 +-
 RELEASE_NOTES.md                                |   36 +
 app.yml                                         |   20 -
 apps/bleprph/src/bleprph.h                      |   43 +
 apps/bleprph/src/gatt_svr.c                     |  342 ++++
 apps/bleprph/src/main.c                         |  300 ++++
 apps/bletest/pkg.yml                            |   39 +
 apps/bletest/src/main.c                         |  982 ++++++++++++
 apps/bletiny/pkg.yml                            |   32 +
 apps/bletiny/src/bletiny_priv.h                 |  169 ++
 apps/bletiny/src/cmd.c                          | 1479 ++++++++++++++++++
 apps/bletiny/src/main.c                         | 1469 +++++++++++++++++
 apps/bletiny/src/parse.c                        |  435 ++++++
 apps/bletiny/src/periph.c                       |  344 ++++
 apps/blinky/pkg.yml                             |   34 +
 apps/blinky/src/main.c                          |  200 +++
 apps/boot/pkg.yml                               |   36 +
 apps/boot/src/boot.c                            |  110 ++
 apps/ffs2native/pkg.yml                         |   31 +
 apps/ffs2native/src/main.c                      |  366 +++++
 apps/luatest/pkg.yml                            |   31 +
 apps/luatest/src/main.c                         |  115 ++
 apps/slinky/pkg.yml                             |   39 +
 apps/slinky/src/main.c                          |  296 ++++
 apps/test/pkg.yml                               |   38 +
 apps/test/src/test.c                            |   44 +
 compiler/arm-none-eabi-m0/compiler.yml          |   33 +
 compiler/arm-none-eabi-m0/pkg.yml               |   22 +-
 compiler/arm-none-eabi-m4/compiler.yml          |   33 +
 compiler/arm-none-eabi-m4/pkg.yml               |   22 +-
 compiler/sim/compiler.yml                       |   48 +
 compiler/sim/linux-compiler.yml                 |   46 -
 compiler/sim/osx-compiler.yml                   |   43 -
 compiler/sim/pkg.yml                            |   21 +-
 fs/fs/pkg.yml                                   |   10 +-
 fs/nffs/README.md                               |   22 -
 fs/nffs/pkg.yml                                 |    8 +-
 fs/nffs/src/test/arch/sim/nffs_test.c           |    2 +-
 hw/bsp/native/README.md                         |   22 -
 hw/bsp/native/native_debug.sh                   |    7 +-
 hw/bsp/native/pkg.yml                           |    9 +-
 hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram_debug.sh |   11 +-
 .../nrf51dk-16kbram/nrf51dk-16kbram_download.sh |   12 +-
 hw/bsp/nrf51dk-16kbram/pkg.yml                  |    9 +-
 hw/bsp/nrf51dk/nrf51dk_debug.sh                 |   11 +-
 hw/bsp/nrf51dk/nrf51dk_download.sh              |   14 +-
 hw/bsp/nrf51dk/pkg.yml                          |    9 +-
 hw/bsp/nrf52pdk/nrf52pdk_debug.sh               |    9 +-
 hw/bsp/nrf52pdk/nrf52pdk_download.sh            |   11 +-
 hw/bsp/nrf52pdk/pkg.yml                         |    9 +-
 .../olimex_stm32-e407_devboard_debug.sh         |   11 +-
 .../olimex_stm32-e407_devboard_download.sh      |   17 +-
 hw/bsp/olimex_stm32-e407_devboard/pkg.yml       |    9 +-
 hw/hal/README.MD                                |   22 -
 hw/hal/pkg.yml                                  |    6 +-
 hw/hal/src/test/flash_map_test.c                |    2 +-
 hw/mcu/README.md                                |   22 -
 hw/mcu/native/pkg.yml                           |    6 +-
 hw/mcu/native/src/hal_uart.c                    |    4 +-
 hw/mcu/nordic/nrf51xxx/pkg.yml                  |    6 +-
 hw/mcu/nordic/nrf52xxx/pkg.yml                  |    6 +-
 hw/mcu/stm/stm32f4xx/pkg.yml                    |    6 +-
 libs/baselibc/pkg.yml                           |   10 +-
 .../baselibc_test/printf_tests.c.donotcompile   |   22 +
 .../src/baselibc_test/tests_glue.c.donotcompile |   33 +
 libs/baselibc/src/baselibc_test/unittests.h     |   14 +
 libs/baselibc/src/test/printf_tests.c           |   22 -
 libs/baselibc/src/test/tests_glue.c             |   33 -
 libs/baselibc/src/test/unittests.h              |   14 -
 libs/bootutil/README.md                         |   22 -
 libs/bootutil/pkg.yml                           |    6 +-
 libs/bootutil/src/test/boot_test.c              |    2 +-
 libs/cmsis-core/pkg.yml                         |    6 +-
 libs/console/README.md                          |   24 +-
 libs/console/full/pkg.yml                       |    8 +-
 libs/console/stub/pkg.yml                       |    8 +-
 libs/elua/elua_base/pkg.yml                     |   12 +-
 libs/flash_test/pkg.yml                         |    9 +-
 libs/imgmgr/pkg.yml                             |    6 +-
 libs/json/pkg.yml                               |    6 +-
 libs/mbedtls/pkg.yml                            |    8 +-
 libs/mbedtls/src/test/mbedtls_test.c            |    2 +-
 libs/newtmgr/pkg.yml                            |    8 +-
 libs/os/README.md                               |   24 -
 libs/os/include/os/arch/sim/os/os_arch.h        |   14 +-
 libs/os/pkg.yml                                 |   12 +-
 libs/os/src/arch/sim/os_arch_sim.c              |   32 +-
 libs/os/src/arch/sim/os_arch_stack_frame.s      |   17 +-
 libs/os/src/os_priv.h                           |    1 +
 libs/os/src/test/os_test.c                      |    2 +-
 libs/shell/pkg.yml                              |   10 +-
 libs/testreport/pkg.yml                         |    6 +-
 libs/testutil/README.md                         |   22 -
 libs/testutil/include/testutil/testutil.h       |    2 +-
 libs/testutil/pkg.yml                           |    8 +-
 libs/testutil/src/case.c                        |    2 +
 libs/testutil/src/testutil.c                    |    3 +
 libs/util/pkg.yml                               |    6 +-
 libs/util/src/test/util_test.c                  |    2 +-
 net/nimble/README.md                            |   22 -
 .../controller/include/controller/ble_ll.h      |   29 +-
 .../controller/include/controller/ble_ll_conn.h |    1 +
 .../controller/include/controller/ble_ll_hci.h  |   11 -
 .../controller/include/controller/ble_ll_scan.h |   18 -
 .../include/controller/ble_ll_sched.h           |   19 +
 .../include/controller/ble_ll_whitelist.h       |    2 -
 net/nimble/controller/pkg.yml                   |    8 +-
 net/nimble/controller/src/ble_ll.c              |   18 +-
 net/nimble/controller/src/ble_ll_adv.c          |   12 +-
 net/nimble/controller/src/ble_ll_conn.c         |  227 ++-
 net/nimble/controller/src/ble_ll_conn_hci.c     |   10 +-
 net/nimble/controller/src/ble_ll_ctrl.c         |    6 +-
 net/nimble/controller/src/ble_ll_hci.c          |   11 +-
 net/nimble/controller/src/ble_ll_scan.c         |   32 +-
 net/nimble/controller/src/ble_ll_sched.c        |   53 +-
 net/nimble/controller/src/ble_ll_whitelist.c    |   12 +-
 net/nimble/drivers/native/pkg.yml               |    8 +-
 net/nimble/drivers/nrf51/pkg.yml                |    8 +-
 net/nimble/drivers/nrf52/pkg.yml                |    8 +-
 net/nimble/drivers/nrf52/src/ble_phy.c          |    4 +-
 net/nimble/host/pkg.yml                         |   14 +-
 net/nimble/host/src/test/ble_hs_test.c          |    2 +-
 net/nimble/host/src/test/ble_hs_test_util.c     |    2 +
 net/nimble/host/src/test/ble_os_test.c          |    6 -
 net/nimble/include/nimble/nimble_opt.h          |   90 ++
 net/nimble/pkg.yml                              |    6 +-
 project.yml                                     |   20 +
 project/bleprph/src/bleprph.h                   |   43 -
 project/bleprph/src/gatt_svr.c                  |  342 ----
 project/bleprph/src/main.c                      |  299 ----
 project/bletest/pkg.yml                         |   40 -
 project/bletest/src/main.c                      |  969 ------------
 project/bletiny/pkg.yml                         |   33 -
 project/bletiny/src/bletiny_priv.h              |  169 --
 project/bletiny/src/cmd.c                       | 1479 ------------------
 project/bletiny/src/main.c                      | 1467 -----------------
 project/bletiny/src/parse.c                     |  435 ------
 project/bletiny/src/periph.c                    |  344 ----
 project/blinky/pkg.yml                          |   35 -
 project/blinky/src/main.c                       |  200 ---
 project/boot/pkg.yml                            |   37 -
 project/boot/src/boot.c                         |  110 --
 project/ffs2native/pkg.yml                      |   32 -
 project/ffs2native/src/main.c                   |  366 -----
 project/luatest/pkg.yml                         |   32 -
 project/luatest/src/main.c                      |  115 --
 project/slinky/pkg.yml                          |   40 -
 project/slinky/src/main.c                       |  296 ----
 project/test/pkg.yml                            |   40 -
 project/test/src/test.c                         |   44 -
 sys/config/pkg.yml                              |    8 +-
 sys/config/src/test/conf_test.c                 |    2 +-
 sys/log/pkg.yml                                 |    8 +-
 sys/stats/pkg.yml                               |    8 +-
 154 files changed, 7969 insertions(+), 7863 deletions(-)
----------------------------------------------------------------------



[09/14] incubator-mynewt-core git commit: Merge branch 'develop' - prep for 0.8.0-b2 tagging.

Posted by ma...@apache.org.
Merge branch 'develop' - prep for 0.8.0-b2 tagging.


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/62df74fa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/62df74fa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/62df74fa

Branch: refs/heads/develop
Commit: 62df74fab22302d70a12caff0082d1adb6b5b3b3
Parents: 2acc09b 7e1731a
Author: Christopher Collins <cc...@apache.org>
Authored: Wed Mar 16 22:56:34 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Wed Mar 16 22:56:34 2016 -0700

----------------------------------------------------------------------
 LICENSE | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------



[13/14] incubator-mynewt-core git commit: add develop pointer

Posted by ma...@apache.org.
add develop pointer


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/bf35f3a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/bf35f3a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/bf35f3a7

Branch: refs/heads/develop
Commit: bf35f3a7cc4a5c73bbf48d14e100f431054554f3
Parents: 9ae1d4f
Author: Sterling Hughes <st...@apache.org>
Authored: Thu Mar 31 12:12:44 2016 -0700
Committer: Sterling Hughes <st...@apache.org>
Committed: Thu Mar 31 12:12:44 2016 -0700

----------------------------------------------------------------------
 repository.yml | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/bf35f3a7/repository.yml
----------------------------------------------------------------------
diff --git a/repository.yml b/repository.yml
index 6c5da80..b659cd3 100644
--- a/repository.yml
+++ b/repository.yml
@@ -19,6 +19,8 @@
 
 repo.name: apache-mynewt-core
 repo.versions:
+    "0.0.0": "develop"
     "0.7.9": "mynewt_0_8_0_b2_tag"
     "0-latest": "0.7.9"
+    "0-dev": "0.0.0"
     "0.8-latest": "0.7.9"


[10/14] incubator-mynewt-core git commit: Merge branch 'develop'

Posted by ma...@apache.org.
Merge branch 'develop'


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/2bec33d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/2bec33d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/2bec33d4

Branch: refs/heads/develop
Commit: 2bec33d4dba12094f32ca560410b8671c0ce1d22
Parents: 62df74f 59a095b
Author: Christopher Collins <cc...@apache.org>
Authored: Fri Mar 18 18:02:04 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Fri Mar 18 18:02:04 2016 -0700

----------------------------------------------------------------------
 apps/bletiny/src/cmd.c                          |   2 +-
 apps/bletiny/src/main.c                         |   5 +-
 hw/bsp/nrf51dk-16kbram/boot-nrf51dk-16kbram.ld  |   2 +-
 hw/bsp/nrf51dk-16kbram/nrf51dk-16kbram.ld       |   2 +-
 .../nrf51dk-16kbram/nrf51dk-16kbram_download.sh |   2 +-
 hw/bsp/nrf51dk-16kbram/src/os_bsp.c             |  10 +-
 hw/mcu/native/src/hal_gpio.c                    |   4 +-
 libs/json/include/json/json.h                   |   6 +
 libs/json/pkg.yml                               |   2 +
 libs/json/src/test/test_json.c                  |  41 ++++
 libs/json/src/test/test_json.h                  |  27 +++
 libs/json/src/test/test_json_simple.c           | 205 +++++++++++++++++++
 libs/os/src/arch/sim/os_arch_sim.c              |   2 -
 libs/testutil/include/testutil/testutil.h       |   4 +
 .../controller/include/controller/ble_ll.h      |   2 +-
 net/nimble/host/src/ble_hs.c                    |   2 +-
 16 files changed, 301 insertions(+), 17 deletions(-)
----------------------------------------------------------------------



[02/14] incubator-mynewt-core git commit: remove package list, add instead repository.yml

Posted by ma...@apache.org.
remove package list, add instead repository.yml


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/9f9d6afd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/9f9d6afd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/9f9d6afd

Branch: refs/heads/develop
Commit: 9f9d6afd19f68b2a8754a53e10c80002c210394d
Parents: 849ca1d
Author: Sterling Hughes <st...@apache.org>
Authored: Thu Mar 10 01:08:11 2016 -0800
Committer: Sterling Hughes <st...@apache.org>
Committed: Thu Mar 10 01:08:11 2016 -0800

----------------------------------------------------------------------
 pkg-list.yml   | 384 ----------------------------------------------------
 repository.yml |   3 +
 2 files changed, 3 insertions(+), 384 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/9f9d6afd/pkg-list.yml
----------------------------------------------------------------------
diff --git a/pkg-list.yml b/pkg-list.yml
deleted file mode 100644
index 3edb569..0000000
--- a/pkg-list.yml
+++ /dev/null
@@ -1,384 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-name: larva
-url: https://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva
-pkgs:
-    bletest:
-        vers: 0.8.0
-        hash: 325d6ff98eb71341c4f3e47bce3c37a74ea819b4
-        deps:
-            - net/nimble/controller@none#stable
-            - net/nimble/host@none#stable
-            - libs/os@none#stable
-            - libs/console/full@none#stable
-            - libs/baselibc@none#stable
-            - libs/shell@none#stable
-            - libs/imgmgr@none#stable
-            - libs/newtmgr@none#stable
-            - sys/config@none#stable
-            - sys/log@none#stable
-            - sys/stats@none#stable
-    libs/console/stub:
-        vers: 0.8.0
-        hash: d41aedc5941495ca9320cc013f68ee73d4e349ab
-        caps:
-            - console@none#stable
-    libs/os:
-        vers: 0.8.0
-        hash: 999a3419d9959d3c39b11dcc67d79c7888b4b765
-        deps:
-            - libs/testutil@none#stable
-        req_caps:
-            - console@none#stable
-    project/blinky:
-        vers: 0.8.0
-        hash: 8be3527ec83fad088e4d9bf87eb0ecaf35842900
-        deps:
-            - libs/console/full@none#stable
-            - libs/newtmgr@none#stable
-            - libs/os@none#stable
-            - libs/shell@none#stable
-            - sys/config@none#stable
-            - sys/log@none#stable
-            - sys/stats@none#stable
-    project/boot:
-        vers: 0.8.0
-        hash: 3a38b2fcb865c466060cd3354b1b8b10b68b24c2
-        deps:
-            - fs/nffs@none#stable
-            - libs/baselibc@none#stable
-            - libs/bootutil@none#stable
-            - libs/console/stub@none#stable
-            - libs/mbedtls@none#stable
-            - libs/os@none#stable
-            - libs/util@none#stable
-    net/nimble/drivers/native:
-        vers: 0.8.0
-        hash: 513cc71e129320e3e2d80a9cdfc748db6c83fbb4
-        deps:
-            - net/nimble/controller@none#stable
-        caps:
-            - ble_driver@none#stable
-    fs/fs:
-        vers: 0.8.0
-        hash: 6eb8e611b9b7da5be034502b53183c779a115e91
-    compiler/arm-none-eabi-m0:
-        vers: 0.8.0
-        hash: f01309d64a6e2672c1128ee5f62f33dccf483773
-    hw/bsp/native:
-        vers: 0.0.0
-        hash: 5fcbfe71744ff13621e4d126919bd7ab3fd68f0f
-        deps:
-            - hw/mcu/native@none#stable
-    libs/elua/elua_base:
-        vers: 0.8.0
-        hash: 0f4bff75e83236ad27c49ba9a161d50b76c648fb
-        deps:
-            - fs/fs@none#stable
-        req_caps:
-            - console@none#stable
-    libs/util:
-        vers: 0.8.0
-        hash: 090ddff6afe551379588ed9afe813bf10f45d271
-        deps:
-            - hw/hal@none#stable
-            - libs/os@none#stable
-            - libs/testutil@none#stable
-    libs/testreport:
-        vers: 0.8.0
-        hash: 8911630551f233ec26203e1ab230a76d184d5d3a
-        deps:
-            - fs/nffs@none#stable
-            - libs/testutil@none#stable
-    libs/cmsis-core:
-        vers: 0.8.0
-        hash: c6aad09920627ca3300992b53d666fc34771d575
-    sys/stats:
-        vers: 0.8.0
-        hash: cba5a8bb1ddcdff13c3a61bcff2539e1c0271d73
-        deps:
-            - libs/os@none#stable
-            - libs/util@none#stable
-            - libs/testutil@none#stable
-    hw/mcu/nordic/nrf52xxx:
-        vers: 0.0.0
-        hash: 68beecaad8f55ddbb340e80e53ba316e346c11dc
-        deps:
-            - hw/hal@none#stable
-            - libs/cmsis-core@none#stable
-            - compiler/arm-none-eabi-m4@none#stable
-    bletiny:
-        vers: 0.8.0
-        hash: 246c029f74244a70ce3037c598aaa481af45ad36
-        deps:
-            - libs/os@none#stable
-            - sys/log@none#stable
-            - net/nimble/controller@none#stable
-            - net/nimble/host@none#stable
-            - libs/console/full@none#stable
-            - libs/shell@none#stable
-            - libs/baselibc@none#stable
-    hw/mcu/stm/stm32f3xx:
-        vers: 0.0.0
-        hash: ca97cded47b4b4d4a3aa76dd6c8969e874f3e673
-        deps:
-            - hw/hal@none#stable
-            - libs/cmsis-core@none#stable
-            - compiler/arm-none-eabi-m4@none#stable
-    project/slinky:
-        vers: 0.8.0
-        hash: 5dbdf0f12815ad722ea8f747d298d25bf7065062
-        deps:
-            - libs/console/full@none#stable
-            - libs/imgmgr@none#stable
-            - libs/newtmgr@none#stable
-            - libs/os@none#stable
-            - libs/shell@none#stable
-            - libs/util@none#stable
-            - sys/config@none#stable
-            - sys/log@none#stable
-            - sys/stats@none#stable
-            - libs/baselibc@none#stable
-            - libs/flash_test@none#stable
-    hw/hal:
-        vers: 0.8.0
-        hash: bb85a7cd2c561bf80a87b613353a4446cb487431
-        deps:
-            - libs/os@none#stable
-    net/nimble:
-        vers: 0.8.0
-        hash: 8977b8da604d9779d51baf4aacabef5af2771bf7
-        deps:
-            - libs/os@none#stable
-    project/ffs2native:
-        vers: 0.8.0
-        hash: 8a53de11192076317745eea6b67f9b45a3a0738e
-        deps:
-            - fs/nffs@none#stable
-            - hw/hal@none#stable
-            - libs/console/full@none#stable
-            - libs/os@none#stable
-    compiler/sim:
-        vers: 0.8.0
-        hash: 06c06f86b544cffd78c54bfdc0cd0695490ba493
-    libs/mbedtls:
-        vers: 0.8.0
-        hash: 60433696c8affac24e8cfa7f5cde129d9dda4df5
-        deps:
-            - libs/testutil@none#stable
-    libs/shell:
-        vers: 0.8.0
-        hash: c8e4058dfccc96afa85553d789b0595761d32de1
-        deps:
-            - libs/os@none#stable
-            - libs/util@none#stable
-    hw/bsp/stm32f3discovery:
-        vers: 0.0.0
-        hash: c0a5233355d5ec1f7146d9e886628c43f54b9c22
-        deps:
-            - hw/mcu/stm/stm32f3xx@none#stable
-    hw/bsp/arduino_zero:
-        vers: 0.0.0
-        hash: b18682812929391068160a104728d6fb491ae218
-        deps:
-            - hw/mcu/atmel/samd21xx@none#stable
-            - libs/cmsis-core@none#stable
-    sys/config:
-        vers: 0.8.0
-        hash: b0791ff2f0785815f2c80d63ab249d8e541ce2a2
-        deps:
-            - libs/util@none#stable
-            - libs/testutil@none#stable
-    hw/bsp/olimex_stm32-e407_devboard:
-        vers: 0.0.0
-        hash: 143ede450dede56c43a0071c7e4b06f716fbbb93
-        deps:
-            - hw/mcu/stm/stm32f4xx@none#stable
-    libs/json:
-        vers: 0.8.0
-        hash: 18ab42710fad7a8434ba96b127e2976881506d1c
-    net/nimble/drivers/nrf51:
-        vers: 0.8.0
-        hash: 97739c2be0d90766414a382de6f51090563e9cad
-        deps:
-            - net/nimble@none#stable
-            - net/nimble/controller@none#stable
-        caps:
-            - ble_driver@none#stable
-    compiler/arm-none-eabi-m4:
-        vers: 0.8.0
-        hash: 8655fa5d74093f3f80db45fcb82bde7b0c7fa0e8
-    libs/console/full:
-        vers: 0.8.0
-        hash: 274362e34db9347764078c80c528037212b4f496
-        deps:
-            - hw/hal@none#stable
-            - libs/os@none#stable
-        caps:
-            - console@none#stable
-    hw/mcu/stm/stm32f4xx:
-        vers: 0.0.0
-        hash: b7a31f8eff452f6ef9bb653a0ad7622370aaeaad
-        deps:
-            - hw/hal@none#stable
-            - libs/cmsis-core@none#stable
-            - compiler/arm-none-eabi-m4@none#stable
-    sys/log:
-        vers: 0.8.0
-        hash: 85e3c7bb087f518b20cca97599c84f4c7fdafa58
-        deps:
-            - libs/os@none#stable
-            - libs/util@none#stable
-            - libs/testutil@none#stable
-    hw/bsp/nrf52pdk:
-        vers: 0.0.0
-        hash: befbe4e4ae4c5c370af7664139f658fb08292bf1
-        deps:
-            - hw/mcu/nordic/nrf52xxx@none#stable
-    libs/newtmgr:
-        vers: 0.8.0
-        hash: 03a11f10ea9e4e5b21acbd0c034d2024c7dea22b
-        deps:
-            - libs/os@none#stable
-            - libs/json@none#stable
-            - libs/util@none#stable
-            - libs/testutil@none#stable
-            - libs/shell@none#stable
-    luatest:
-        vers: 0.8.0
-        hash: 342cf211141bee0337d2f7da2b8b1eb46f6ab4b8
-        deps:
-            - fs/nffs@none#stable
-            - libs/os@none#stable
-            - libs/elua/elua_base@none#stable
-            - libs/console/full@none#stable
-            - libs/shell@none#stable
-    fs/nffs:
-        vers: 0.8.0
-        hash: 8af35aa4fcb4830294bc90c287c697953fa329c5
-        deps:
-            - sys/log@none#stable
-            - fs/fs@none#stable
-            - libs/os@none#stable
-            - libs/testutil@none#stable
-            - hw/hal@none#stable
-    net/nimble/controller:
-        vers: 0.8.0
-        hash: 9cc5ce3af39ecf51fec6a5329d369e64c0b17ebc
-        deps:
-            - libs/os@none#stable
-            - sys/stats@none#stable
-            - net/nimble@none#stable
-    net/nimble/host:
-        vers: 0.8.0
-        hash: 1b0650626ba590df2631327ed9722d70e7cd27ee
-        deps:
-            - sys/log@none#stable
-            - sys/stats@none#stable
-            - libs/os@none#stable
-            - libs/util@none#stable
-            - net/nimble@none#stable
-        req_caps:
-            - console@none#stable
-    libs/imgmgr:
-        vers: 0.8.0
-        hash: ce0f94539cefa2ac5f18c56f0d24ce1169fe1cd5
-        deps:
-            - libs/newtmgr@none#stable
-            - libs/bootutil@none#stable
-    hw/mcu/native:
-        vers: 0.0.0
-        hash: 37ee2b63f3226f70e3e748d8e6ce56b54b745122
-        deps:
-            - hw/hal@none#stable
-            - compiler/sim@none#stable
-    hw/mcu/atmel/samd21xx:
-        vers: 0.0.0
-        hash: 46d1c78c23346555847b91d13a32ebd821d5b8bb
-        deps:
-            - hw/hal@none#stable
-            - libs/cmsis-core@none#stable
-            - compiler/arm-none-eabi-m4@none#stable
-    libs/baselibc:
-        vers: 0.8.0
-        hash: bb46b003c472b16309bd9fbed81f5c4c62bd4aa5
-        req_caps:
-            - console@none#stable
-    net/nimble/drivers/nrf52:
-        vers: 0.8.0
-        hash: 30701b65eedf693670a3f56367d6728fdac26f6f
-        deps:
-            - net/nimble@none#stable
-            - net/nimble/controller@none#stable
-        caps:
-            - ble_driver@none#stable
-    hw/mcu/nordic/nrf51xxx:
-        vers: 0.0.0
-        hash: 6681e65a49a2e393e9e168534fc4134ee8d33dce
-        deps:
-            - hw/hal@none#stable
-            - libs/cmsis-core@none#stable
-            - compiler/arm-none-eabi-m0@none#stable
-    hw/bsp/nrf51dk:
-        vers: 0.0.0
-        hash: 6a83e0c206b3f9bc644701f477508f8130e69631
-        deps:
-            - hw/mcu/nordic/nrf51xxx@none#stable
-    project/test:
-        vers: 0.8.0
-        hash: 61f2e0b5226af06d94263324966c34b174db615d
-        deps:
-            - fs/nffs@none#stable
-            - libs/bootutil@none#stable
-            - libs/console/full@none#stable
-            - libs/mbedtls@none#stable
-            - libs/os@none#stable
-            - libs/testreport@none#stable
-            - libs/testutil@none#stable
-            - libs/util@none#stable
-            - sys/config@none#stable
-    hw/bsp/nrf51dk-16kbram:
-        vers: 0.0.0
-        hash: 06994cccca7723cc62552345db2554bd3aa733ee
-        deps:
-            - hw/mcu/nordic/nrf51xxx@none#stable
-    libs/flash_test:
-        vers: 0.1.0
-        hash: fb60fc85b335de1b4585e0799af9680d6acce698
-        deps:
-            - libs/os@none#stable
-            - libs/util@none#stable
-            - hw/hal@none#stable
-            - libs/baselibc@none#stable
-    libs/testutil:
-        vers: 0.8.0
-        hash: b8185d12fe46b4e153e693f79c23338c98d37757
-        deps:
-            - hw/hal@none#stable
-            - libs/os@none#stable
-    libs/bootutil:
-        vers: 0.8.0
-        hash: cf63c7b6e78fb1b7ff97f491aa7839d87ffa1f10
-        deps:
-            - fs/nffs@none#stable
-            - libs/os@none#stable
-            - libs/testutil@none#stable
-            - libs/mbedtls@none#stable
-            - hw/hal@none#stable

http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/9f9d6afd/repository.yml
----------------------------------------------------------------------
diff --git a/repository.yml b/repository.yml
new file mode 100644
index 0000000..06c195e
--- /dev/null
+++ b/repository.yml
@@ -0,0 +1,3 @@
+repo.name: apache-mynewt-core
+repo.versions:
+    "0-latest": "develop"


[11/14] incubator-mynewt-core git commit: Add apache license header to repository.yml

Posted by ma...@apache.org.
Add apache license header to repository.yml


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/cd728c00
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/cd728c00
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/cd728c00

Branch: refs/heads/develop
Commit: cd728c00d6c26b85c4f4a6563cec4200a8e53fbb
Parents: 2bec33d
Author: Christopher Collins <cc...@apache.org>
Authored: Mon Mar 21 11:58:43 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Mon Mar 21 11:58:43 2016 -0700

----------------------------------------------------------------------
 repository.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/cd728c00/repository.yml
----------------------------------------------------------------------
diff --git a/repository.yml b/repository.yml
index 919593d..6c5da80 100644
--- a/repository.yml
+++ b/repository.yml
@@ -1,3 +1,22 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
 repo.name: apache-mynewt-core
 repo.versions:
     "0.7.9": "mynewt_0_8_0_b2_tag"


[14/14] incubator-mynewt-core git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-mynewt-core into develop

Posted by ma...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-mynewt-core into develop


Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/c12dbb96
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/c12dbb96
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/c12dbb96

Branch: refs/heads/develop
Commit: c12dbb96baa8026cd43082ac6c4f3dfa8a9f9e17
Parents: 546cf5e bf35f3a
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Tue Apr 26 12:54:00 2016 -0700
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Tue Apr 26 12:54:00 2016 -0700

----------------------------------------------------------------------
 README.md | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------