[mynewt-core] 01/01: Revert "Trying to add NRF52811 support"
This is an automated email from the ASF dual-hosted git repository.
mlaz pushed a commit to branch revert-1855-nrf52811_support
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit f5aee6f27e52d5d66b540139d8104814746d9e4b
Author: Miguel Azevedo
AuthorDate: Sat Jun 1 18:14:17 2019 +0100
Revert "Trying to add NRF52811 support"
---
hw/mcu/nordic/nrf52xxx/include/mcu/nrf52_hal.h| 14 -
hw/mcu/nordic/nrf52xxx/include/nrfx52810_config.h | 196 -
hw/mcu/nordic/nrf52xxx/include/nrfx52811_config.h | 196 -
hw/mcu/nordic/nrf52xxx/include/nrfx_config.h | 4 -
hw/mcu/nordic/nrf52xxx/pkg.yml| 5 +
hw/mcu/nordic/nrf52xxx/src/hal_flash.c| 9 -
hw/mcu/nordic/nrf52xxx/src/hal_gpio.c | 2 +-
hw/mcu/nordic/nrf52xxx/src/hal_i2c.c | 5 -
hw/mcu/nordic/nrf52xxx/src/system_nrf52.c | 327 --
hw/mcu/nordic/nrf52xxx/syscfg.yml | 6 -
hw/mcu/nordic/pkg.yml | 4 -
11 files changed, 6 insertions(+), 762 deletions(-)
diff --git a/hw/mcu/nordic/nrf52xxx/include/mcu/nrf52_hal.h
b/hw/mcu/nordic/nrf52xxx/include/mcu/nrf52_hal.h
index f566024..2e5f3ab 100644
--- a/hw/mcu/nordic/nrf52xxx/include/mcu/nrf52_hal.h
+++ b/hw/mcu/nordic/nrf52xxx/include/mcu/nrf52_hal.h
@@ -85,20 +85,6 @@ struct nrf52_hal_spi_cfg {
#define HAL_GPIOTE_PIN_MASK GPIOTE_CONFIG_PSEL_Msk
#endif
-#ifdef NRF52810_XXAA
-#define HAL_GPIO_INDEX(pin) (pin)
-#define HAL_GPIO_PORT(pin) (NRF_P0)
-#define HAL_GPIO_MASK(pin) (1 << pin)
-#define HAL_GPIOTE_PIN_MASK GPIOTE_CONFIG_PSEL_Msk
-#endif
-
-#ifdef NRF52811_XXAA
-#define HAL_GPIO_INDEX(pin) (pin)
-#define HAL_GPIO_PORT(pin) (NRF_P0)
-#define HAL_GPIO_MASK(pin) (1 << pin)
-#define HAL_GPIOTE_PIN_MASK GPIOTE_CONFIG_PSEL_Msk
-#endif
-
#ifdef NRF52840_XXAA
#define HAL_GPIO_INDEX(pin) ((pin) & 0x1F)
#define HAL_GPIO_PORT(pin) ((pin) > 31 ? NRF_P1 : NRF_P0)
diff --git a/hw/mcu/nordic/nrf52xxx/include/nrfx52810_config.h
b/hw/mcu/nordic/nrf52xxx/include/nrfx52810_config.h
deleted file mode 100644
index 349e5a2..000
--- a/hw/mcu/nordic/nrf52xxx/include/nrfx52810_config.h
+++ /dev/null
@@ -1,196 +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.
- */
-
-#ifndef NRFX52810_CONFIG_H__
-#define NRFX52810_CONFIG_H__
-
-#include "syscfg/syscfg.h"
-
-#ifndef NRFX_CLOCK_ENABLED
-#define NRFX_CLOCK_ENABLED 0
-#endif
-
-#ifndef NRFX_COMP_ENABLED
-#define NRFX_COMP_ENABLED 0
-#endif
-
-#ifndef NRFX_GPIOTE_ENABLED
-#define NRFX_GPIOTE_ENABLED 0
-#endif
-
-#ifndef NRFX_I2S_ENABLED
-#define NRFX_I2S_ENABLED 0
-#endif
-
-// #ifndef NRFX_LPCOMP_ENABLED
-// #define NRFX_LPCOMP_ENABLED 0
-// #endif
-
-#ifndef NRFX_PDM_ENABLED
-#define NRFX_PDM_ENABLED 0
-#endif
-
-#ifndef NRFX_POWER_ENABLED
-#define NRFX_POWER_ENABLED 0
-#endif
-
-#ifndef NRFX_PPI_ENABLED
-#define NRFX_PPI_ENABLED 0
-#endif
-
-#ifndef NRFX_PRS_ENABLED
-#define NRFX_PRS_ENABLED 0
-#endif
-
-#ifndef NRFX_QDEC_ENABLED
-#define NRFX_QDEC_ENABLED 0
-#endif
-
-#ifndef NRFX_RNG_ENABLED
-#define NRFX_RNG_ENABLED 0
-#endif
-
-#ifndef NRFX_RTC_ENABLED
-#define NRFX_RTC_ENABLED 0
-#endif
-
-#ifndef NRFX_SPIM_ENABLED
-#define NRFX_SPIM_ENABLED 0
-#endif
-
-#ifndef NRFX_SPIS_ENABLED
-#define NRFX_SPIS_ENABLED 0
-#endif
-
-#ifndef NRFX_SPI_ENABLED
-#define NRFX_SPI_ENABLED 0
-#endif
-
-#ifndef NRFX_SWI_ENABLED
-#define NRFX_SWI_ENABLED 0
-#endif
-
-#ifndef NRFX_SYSTICK_ENABLED
-#define NRFX_SYSTICK_ENABLED 0
-#endif
-
-#ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
-#endif
-
-#ifndef NRFX_TWIM_ENABLED
-#define NRFX_TWIM_ENABLED 0
-#endif
-
-#ifndef NRFX_TWIS_ENABLED
-#define NRFX_TWIS_ENABLED 0
-#endif
-
-#ifndef NRFX_TWI_ENABLED
-#define NRFX_TWI_ENABLED 0
-#endif
-
-#ifndef NRFX_UARTE_ENABLED
-#define NRFX_UARTE_ENABLED 0
-#endif
-
-#ifndef NRFX_UART_ENABLED
-#define NRFX_UART_ENABLED 0
-#endif
-
-#ifndef NRFX_WDT_ENABLED
-#define NRFX_WDT_ENABLED 0
-#endif
-
-#if MYNEWT_VAL(ADC_0)
-#ifndef NRFX_SAADC_ENABLED
-#define NRFX_SAADC_ENABLED 1
-#endif
-
-#ifndef NRFX_SAADC_CONFIG_RESOLUTION
-#define NRFX_SAADC_CONFIG_RESOLUTION 1
-#endif
-
-#ifndef
[GitHub] [mynewt-core] andrzej-kaczmarek merged pull request #1852: hw/sensor/creator: Fix line endings
andrzej-kaczmarek merged pull request #1852: hw/sensor/creator: Fix line endings URL: https://github.com/apache/mynewt-core/pull/1852 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[mynewt-core] branch master updated: hw/sensor/creator: Fix line endings
This is an automated email from the ASF dual-hosted git repository. andk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mynewt-core.git The following commit(s) were added to refs/heads/master by this push: new bba0e6e hw/sensor/creator: Fix line endings bba0e6e is described below commit bba0e6e335471af3ad68927b5005b708ee06f2d8 Author: Andrzej Kaczmarek AuthorDate: Fri May 31 10:29:10 2019 +0200 hw/sensor/creator: Fix line endings This was broken by 957c52693. --- hw/sensor/creator/pkg.yml | 144 +- hw/sensor/creator/src/sensor_creator.c | 3234 hw/sensor/creator/syscfg.yml | 208 +- 3 files changed, 1793 insertions(+), 1793 deletions(-) diff --git a/hw/sensor/creator/pkg.yml b/hw/sensor/creator/pkg.yml index 37fd8c6..781380b 100644 --- a/hw/sensor/creator/pkg.yml +++ b/hw/sensor/creator/pkg.yml @@ -1,72 +1,72 @@ -# -# 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. -# - -pkg.name: hw/sensor/creator -pkg.description: Device creation for the sensor -pkg.author: "Apache Mynewt " -pkg.homepage: "http://mynewt.apache.org/; -pkg.keywords: -- sensors - -pkg.deps.BME280_OFB: -- "@apache-mynewt-core/hw/drivers/sensors/bme280" -pkg.deps.DRV2605_OFB: -- "@apache-mynewt-core/hw/drivers/drv2605" -pkg.deps.LSM303DLHC_OFB: -- "@apache-mynewt-core/hw/drivers/sensors/lsm303dlhc" -pkg.deps.MPU6050_OFB: -- "@apache-mynewt-core/hw/drivers/sensors/mpu6050" -pkg.deps.TSL2561_OFB: -- "@apache-mynewt-core/hw/drivers/sensors/tsl2561" -pkg.deps.TSL2591_OFB: -- "@apache-mynewt-core/hw/drivers/sensors/tsl2591" -pkg.deps.BNO055_OFB: -- "@apache-mynewt-core/hw/drivers/sensors/bno055" -pkg.deps.TCS34725_OFB: -- "@apache-mynewt-core/hw/drivers/sensors/tcs34725" -pkg.deps.MS5837_OFB: -- "@apache-mynewt-core/hw/drivers/sensors/ms5837" -pkg.deps.MS5840_OFB: -- "@apache-mynewt-core/hw/drivers/sensors/ms5840" -pkg.deps.MCU_NATIVE: -- "@apache-mynewt-core/hw/drivers/sensors/sim" -pkg.deps.BMP280_OFB: -- "@apache-mynewt-core/hw/drivers/sensors/bmp280" -pkg.deps.BMA253_OFB: -- "@apache-mynewt-core/hw/drivers/sensors/bma253" -pkg.deps.BMA2XX_OFB: -- "@apache-mynewt-core/hw/drivers/sensors/bma2xx" -pkg.deps.BMP388_OFB: -- "@apache-mynewt-core/hw/drivers/sensors/bmp388" -pkg.deps.LIS2DW12_OFB: -- "@apache-mynewt-core/hw/drivers/sensors/lis2dw12" -pkg.deps.LPS33HW_OFB: -- "@apache-mynewt-core/hw/drivers/sensors/lps33hw" -pkg.deps.LPS33THW_OFB: -- "@apache-mynewt-core/hw/drivers/sensors/lps33thw" -pkg.deps.KXTJ3_OFB: -- "@apache-mynewt-core/hw/drivers/sensors/kxtj3" -pkg.deps.DPS368_OFB: -- "@apache-mynewt-core/hw/drivers/sensors/dps368" -pkg.deps.ICP101XX_OFB: -- "@apache-mynewt-core/hw/drivers/sensors/icp101xx" -pkg.deps.ICP10114_OFB: -- "@apache-mynewt-core/hw/drivers/sensors/icp101xx" -pkg.init: -sensor_dev_create: 'MYNEWT_VAL(SENSOR_CREATOR_SYSINIT_STAGE)' +# +# 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. +# + +pkg.name: hw/sensor/creator +pkg.description: Device creation for the sensor +pkg.author: "Apache Mynewt " +pkg.homepage: "http://mynewt.apache.org/; +pkg.keywords: +- sensors + +pkg.deps.BME280_OFB: +- "@apache-mynewt-core/hw/drivers/sensors/bme280" +pkg.deps.DRV2605_OFB: +- "@apache-mynewt-core/hw/drivers/drv2605" +pkg.deps.LSM303DLHC_OFB: +- "@apache-mynewt-core/hw/drivers/sensors/lsm303dlhc" +pkg.deps.MPU6050_OFB: +-
[GitHub] [mynewt-core] andrzej-kaczmarek commented on a change in pull request #1855: Trying to add NRF52811 support
andrzej-kaczmarek commented on a change in pull request #1855: Trying to add NRF52811 support URL: https://github.com/apache/mynewt-core/pull/1855#discussion_r289612320 ## File path: hw/mcu/nordic/nrf52xxx/syscfg.yml ## @@ -449,6 +451,10 @@ syscfg.defs: - "!XTAL_RC" deprecated: 1 +syscfg.vals.MCU_NRF52810: +MCU_TARGET: nRF52810 +syscfg.vals.MCU_NRF52811: +MCU_TARGET: nRF52811 Review comment: vals below are for backwards compatibility with already existing syscfg definitions so this has no effect since there are no `MCU_NRF52810`/`MCU_NRF52811` defined This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[mynewt-core] branch master updated: Trying to add NRF52811 support
This is an automated email from the ASF dual-hosted git repository.
mlaz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
The following commit(s) were added to refs/heads/master by this push:
new 9fe0f2b Trying to add NRF52811 support
new da4049c Merge pull request #1855 from alvarop/nrf52811_support
9fe0f2b is described below
commit 9fe0f2b96322a48824418bc005db42f1c52d0a22
Author: Alvaro Prieto
AuthorDate: Fri May 31 16:58:10 2019 -0700
Trying to add NRF52811 support
---
hw/mcu/nordic/nrf52xxx/include/mcu/nrf52_hal.h| 14 +
hw/mcu/nordic/nrf52xxx/include/nrfx52810_config.h | 196 +
hw/mcu/nordic/nrf52xxx/include/nrfx52811_config.h | 196 +
hw/mcu/nordic/nrf52xxx/include/nrfx_config.h | 4 +
hw/mcu/nordic/nrf52xxx/pkg.yml| 5 -
hw/mcu/nordic/nrf52xxx/src/hal_flash.c| 9 +
hw/mcu/nordic/nrf52xxx/src/hal_gpio.c | 2 +-
hw/mcu/nordic/nrf52xxx/src/hal_i2c.c | 5 +
hw/mcu/nordic/nrf52xxx/src/system_nrf52.c | 327 ++
hw/mcu/nordic/nrf52xxx/syscfg.yml | 6 +
hw/mcu/nordic/pkg.yml | 4 +
11 files changed, 762 insertions(+), 6 deletions(-)
diff --git a/hw/mcu/nordic/nrf52xxx/include/mcu/nrf52_hal.h
b/hw/mcu/nordic/nrf52xxx/include/mcu/nrf52_hal.h
index 2e5f3ab..f566024 100644
--- a/hw/mcu/nordic/nrf52xxx/include/mcu/nrf52_hal.h
+++ b/hw/mcu/nordic/nrf52xxx/include/mcu/nrf52_hal.h
@@ -85,6 +85,20 @@ struct nrf52_hal_spi_cfg {
#define HAL_GPIOTE_PIN_MASK GPIOTE_CONFIG_PSEL_Msk
#endif
+#ifdef NRF52810_XXAA
+#define HAL_GPIO_INDEX(pin) (pin)
+#define HAL_GPIO_PORT(pin) (NRF_P0)
+#define HAL_GPIO_MASK(pin) (1 << pin)
+#define HAL_GPIOTE_PIN_MASK GPIOTE_CONFIG_PSEL_Msk
+#endif
+
+#ifdef NRF52811_XXAA
+#define HAL_GPIO_INDEX(pin) (pin)
+#define HAL_GPIO_PORT(pin) (NRF_P0)
+#define HAL_GPIO_MASK(pin) (1 << pin)
+#define HAL_GPIOTE_PIN_MASK GPIOTE_CONFIG_PSEL_Msk
+#endif
+
#ifdef NRF52840_XXAA
#define HAL_GPIO_INDEX(pin) ((pin) & 0x1F)
#define HAL_GPIO_PORT(pin) ((pin) > 31 ? NRF_P1 : NRF_P0)
diff --git a/hw/mcu/nordic/nrf52xxx/include/nrfx52810_config.h
b/hw/mcu/nordic/nrf52xxx/include/nrfx52810_config.h
new file mode 100644
index 000..349e5a2
--- /dev/null
+++ b/hw/mcu/nordic/nrf52xxx/include/nrfx52810_config.h
@@ -0,0 +1,196 @@
+/*
+ * 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.
+ */
+
+#ifndef NRFX52810_CONFIG_H__
+#define NRFX52810_CONFIG_H__
+
+#include "syscfg/syscfg.h"
+
+#ifndef NRFX_CLOCK_ENABLED
+#define NRFX_CLOCK_ENABLED 0
+#endif
+
+#ifndef NRFX_COMP_ENABLED
+#define NRFX_COMP_ENABLED 0
+#endif
+
+#ifndef NRFX_GPIOTE_ENABLED
+#define NRFX_GPIOTE_ENABLED 0
+#endif
+
+#ifndef NRFX_I2S_ENABLED
+#define NRFX_I2S_ENABLED 0
+#endif
+
+// #ifndef NRFX_LPCOMP_ENABLED
+// #define NRFX_LPCOMP_ENABLED 0
+// #endif
+
+#ifndef NRFX_PDM_ENABLED
+#define NRFX_PDM_ENABLED 0
+#endif
+
+#ifndef NRFX_POWER_ENABLED
+#define NRFX_POWER_ENABLED 0
+#endif
+
+#ifndef NRFX_PPI_ENABLED
+#define NRFX_PPI_ENABLED 0
+#endif
+
+#ifndef NRFX_PRS_ENABLED
+#define NRFX_PRS_ENABLED 0
+#endif
+
+#ifndef NRFX_QDEC_ENABLED
+#define NRFX_QDEC_ENABLED 0
+#endif
+
+#ifndef NRFX_RNG_ENABLED
+#define NRFX_RNG_ENABLED 0
+#endif
+
+#ifndef NRFX_RTC_ENABLED
+#define NRFX_RTC_ENABLED 0
+#endif
+
+#ifndef NRFX_SPIM_ENABLED
+#define NRFX_SPIM_ENABLED 0
+#endif
+
+#ifndef NRFX_SPIS_ENABLED
+#define NRFX_SPIS_ENABLED 0
+#endif
+
+#ifndef NRFX_SPI_ENABLED
+#define NRFX_SPI_ENABLED 0
+#endif
+
+#ifndef NRFX_SWI_ENABLED
+#define NRFX_SWI_ENABLED 0
+#endif
+
+#ifndef NRFX_SYSTICK_ENABLED
+#define NRFX_SYSTICK_ENABLED 0
+#endif
+
+#ifndef NRFX_TIMER_ENABLED
+#define NRFX_TIMER_ENABLED 0
+#endif
+
+#ifndef NRFX_TWIM_ENABLED
+#define NRFX_TWIM_ENABLED 0
+#endif
+
+#ifndef NRFX_TWIS_ENABLED
+#define NRFX_TWIS_ENABLED 0
+#endif
+
+#ifndef NRFX_TWI_ENABLED
+#define NRFX_TWI_ENABLED 0
+#endif
+
+#ifndef NRFX_UARTE_ENABLED
+#define NRFX_UARTE_ENABLED 0
+#endif
+
+#ifndef NRFX_UART_ENABLED
+#define NRFX_UART_ENABLED 0
+#endif
+
+#ifndef NRFX_WDT_ENABLED
+#define NRFX_WDT_ENABLED 0
+#endif
+
+#if
[GitHub] [mynewt-core] mlaz merged pull request #1855: Trying to add NRF52811 support
mlaz merged pull request #1855: Trying to add NRF52811 support URL: https://github.com/apache/mynewt-core/pull/1855 This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
