You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by GitBox <gi...@apache.org> on 2018/07/15 05:09:42 UTC
[GitHub] jacobrosenthal closed pull request #1271: nrf51 bsps: defunct old
i2c flags
jacobrosenthal closed pull request #1271: nrf51 bsps: defunct old i2c flags
URL: https://github.com/apache/mynewt-core/pull/1271
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/hw/bsp/calliope_mini/syscfg.yml b/hw/bsp/calliope_mini/syscfg.yml
index 29f09de9ef..34077c9c44 100644
--- a/hw/bsp/calliope_mini/syscfg.yml
+++ b/hw/bsp/calliope_mini/syscfg.yml
@@ -68,7 +68,8 @@ syscfg.defs:
value: 100
I2C_0_FREQ:
description: 'Use I2C_0_FREQ_KHZ instead'
- deprecated: 1
+ defunct: 1
+ value: 100
I2C_1_PIN_SCL:
description: 'SCL pin for I2C_1'
diff --git a/hw/bsp/nrf51-blenano/syscfg.yml b/hw/bsp/nrf51-blenano/syscfg.yml
index 873ba914e1..59a70cbd4a 100644
--- a/hw/bsp/nrf51-blenano/syscfg.yml
+++ b/hw/bsp/nrf51-blenano/syscfg.yml
@@ -51,13 +51,16 @@ syscfg.defs:
value: 100
I2C_0_FREQUENCY:
description: 'Use I2C_0_FREQ_KHZ instead'
- deprecated: 1
+ defunct: 1
+ value: 100
I2C_0_SDA_PIN:
description: 'Use I2C_0_PIN_SDA instead'
- deprecated: 1
+ defunct: 1
+ value: 6
I2C_0_SCL_PIN:
description: 'Use I2C_0_PIN_SCL instead'
- deprecated: 1
+ defunct: 1
+ value: 7
I2C_1_PIN_SCL:
description: 'SCL pin for I2C_1'
@@ -70,13 +73,16 @@ syscfg.defs:
value: 100
I2C_1_FREQUENCY:
description: 'Use I2C_1_FREQ_KHZ instead'
- deprecated: 1
+ defunct: 1
+ value: 100
I2C_1_SDA_PIN:
description: 'Use I2C_1_PIN_SDA instead'
- deprecated: 1
+ defunct: 1
+ value: 28
I2C_1_SCL_PIN:
description: 'Use I2C_1_PIN_SCL instead'
- deprecated: 1
+ defunct: 1
+ value: 29
TIMER_0:
diff --git a/hw/bsp/nrf51dk-16kbram/syscfg.yml b/hw/bsp/nrf51dk-16kbram/syscfg.yml
index 0849aee547..50a8738f4f 100644
--- a/hw/bsp/nrf51dk-16kbram/syscfg.yml
+++ b/hw/bsp/nrf51dk-16kbram/syscfg.yml
@@ -74,13 +74,16 @@ syscfg.defs:
value: 100
I2C_0_FREQUENCY:
description: 'Use I2C_0_FREQ_KHZ instead'
- deprecated: 1
+ defunct: 1
+ value: 100
I2C_0_SDA_PIN:
description: 'Use I2C_0_PIN_SDA instead'
- deprecated: 1
+ defunct: 1
+ value: 30
I2C_0_SCL_PIN:
description: 'Use I2C_0_PIN_SCL instead'
- deprecated: 1
+ defunct: 1
+ value: 7
I2C_1_PIN_SCL:
description: 'SCL pin for I2C_1'
diff --git a/hw/bsp/nrf51dk/syscfg.yml b/hw/bsp/nrf51dk/syscfg.yml
index f468f7abc2..6ef52fc777 100644
--- a/hw/bsp/nrf51dk/syscfg.yml
+++ b/hw/bsp/nrf51dk/syscfg.yml
@@ -74,13 +74,16 @@ syscfg.defs:
value: 100
I2C_0_FREQUENCY:
description: 'Use I2C_0_FREQ_KHZ instead'
- deprecated: 1
+ defunct: 1
+ value: 100
I2C_0_SDA_PIN:
description: 'Use I2C_0_PIN_SDA instead'
- deprecated: 1
+ defunct: 1
+ value: 30
I2C_0_SCL_PIN:
description: 'Use I2C_0_PIN_SCL instead'
- deprecated: 1
+ defunct: 1
+ value: 7
I2C_1_PIN_SCL:
description: 'SCL pin for I2C_1'
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services