You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by we...@apache.org on 2016/10/13 21:18:06 UTC
[1/3] incubator-mynewt-core git commit: MYNEWT-431: fix
os_cputime_timer_relative bug.
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop 256064bac -> 0b0f1eb64
MYNEWT-431: fix os_cputime_timer_relative bug.
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/0b0f1eb6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/0b0f1eb6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/0b0f1eb6
Branch: refs/heads/develop
Commit: 0b0f1eb6469cb9066a9772f4015fe602dad19afc
Parents: f418985
Author: William San Filippo <wi...@runtime.io>
Authored: Thu Oct 13 14:17:08 2016 -0700
Committer: William San Filippo <wi...@runtime.io>
Committed: Thu Oct 13 14:17:56 2016 -0700
----------------------------------------------------------------------
kernel/os/src/os_cputime.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0b0f1eb6/kernel/os/src/os_cputime.c
----------------------------------------------------------------------
diff --git a/kernel/os/src/os_cputime.c b/kernel/os/src/os_cputime.c
index ccf0f2c..c21763c 100644
--- a/kernel/os/src/os_cputime.c
+++ b/kernel/os/src/os_cputime.c
@@ -234,7 +234,7 @@ os_cputime_timer_relative(struct hal_timer *timer, uint32_t usecs)
assert(timer != NULL);
cputime = os_cputime_get32() + os_cputime_usecs_to_ticks(usecs);
- hal_timer_start(timer, cputime);
+ hal_timer_start_at(timer, cputime);
}
/**
[2/3] incubator-mynewt-core git commit: Fixes to address nrf52 hal
i2c driver.
Posted by we...@apache.org.
Fixes to address nrf52 hal i2c driver.
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/f4189852
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/f4189852
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/f4189852
Branch: refs/heads/develop
Commit: f41898528413b7a80374f071a48d815f798f404e
Parents: cd0bcc4
Author: William San Filippo <wi...@runtime.io>
Authored: Thu Oct 13 13:47:24 2016 -0700
Committer: William San Filippo <wi...@runtime.io>
Committed: Thu Oct 13 14:17:56 2016 -0700
----------------------------------------------------------------------
hw/mcu/nordic/nrf52xxx/src/hal_i2c.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/f4189852/hw/mcu/nordic/nrf52xxx/src/hal_i2c.c
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/nrf52xxx/src/hal_i2c.c b/hw/mcu/nordic/nrf52xxx/src/hal_i2c.c
index 8648b4d..3b7b670 100644
--- a/hw/mcu/nordic/nrf52xxx/src/hal_i2c.c
+++ b/hw/mcu/nordic/nrf52xxx/src/hal_i2c.c
@@ -36,10 +36,10 @@ struct nrf52_hal_i2c {
#define NRF52_HAL_I2C_MAX (2)
#if TWI0_ENABLED
-struct nrf52_hal_i2c hal_twi_i2c0;
+struct nrf52_hal_i2c hal_twi_i2c0 = {NRF_DRV_TWI_INSTANCE(0)};
#endif
#if TWI1_ENABLED
-struct nrf52_hal_i2c hal_twi_i2c1;
+struct nrf52_hal_i2c hal_twi_i2c1 = {NRF_DRV_TWI_INSTANCE(1)};
#endif
static const struct nrf52_hal_i2c *nrf52_hal_i2cs[NRF52_HAL_I2C_MAX] = {
@@ -171,6 +171,7 @@ hal_i2c_master_end(uint8_t i2c_num)
* private, however, seems like it will be reasonably easy to spot.
* Famous last words.
*/
+ nrf_twi_task_trigger(i2c->nhi_nrf_master.reg.p_twi, NRF_TWI_TASK_RESUME);
nrf_twi_task_trigger(i2c->nhi_nrf_master.reg.p_twi, NRF_TWI_TASK_STOP);
return (0);
[3/3] incubator-mynewt-core git commit: Dont disable timer 0 by
default for timtest application.
Posted by we...@apache.org.
Dont disable timer 0 by default for timtest application.
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/cd0bcc47
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/cd0bcc47
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/cd0bcc47
Branch: refs/heads/develop
Commit: cd0bcc47ae7efe9c450f6f769d0c125e70319b83
Parents: 256064b
Author: William San Filippo <wi...@runtime.io>
Authored: Thu Oct 13 13:11:22 2016 -0700
Committer: William San Filippo <wi...@runtime.io>
Committed: Thu Oct 13 14:17:56 2016 -0700
----------------------------------------------------------------------
apps/timtest/syscfg.yml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/cd0bcc47/apps/timtest/syscfg.yml
----------------------------------------------------------------------
diff --git a/apps/timtest/syscfg.yml b/apps/timtest/syscfg.yml
index 3f2f1e8..619b4ec 100644
--- a/apps/timtest/syscfg.yml
+++ b/apps/timtest/syscfg.yml
@@ -2,6 +2,5 @@
syscfg.vals:
SHELL_TASK: 0
- TIMER_0: 0
TIMER_1: 1
TIMER_2: 1