summaryrefslogtreecommitdiff
path: root/ports/nrf
diff options
context:
space:
mode:
authorarturo182 <arturo182@tlen.pl>2018-07-08 15:04:41 +0200
committerarturo182 <arturo182@tlen.pl>2018-07-08 15:18:11 +0200
commitc6a2a55bc9593469b8547d4ea9a0833894d5bc12 (patch)
tree75debc6aa9c20c57000b20ecf5c3a6ca40a3688d /ports/nrf
parent887486582e94012061d48d1f5310fd979021b9ac (diff)
nrf: Cleanup mpconfigboard files
All the removed defines were used by legacy modules that are now removed.
Diffstat (limited to 'ports/nrf')
-rw-r--r--ports/nrf/boards/feather52832/mpconfigboard.h41
-rw-r--r--ports/nrf/boards/feather52840/mpconfigboard.h45
-rw-r--r--ports/nrf/boards/pca10040/mpconfigboard.h43
-rw-r--r--ports/nrf/boards/pca10056/mpconfigboard.h47
-rw-r--r--ports/nrf/mpconfigport.h8
5 files changed, 12 insertions, 172 deletions
diff --git a/ports/nrf/boards/feather52832/mpconfigboard.h b/ports/nrf/boards/feather52832/mpconfigboard.h
index d0da6e398..cfbf22447 100644
--- a/ports/nrf/boards/feather52832/mpconfigboard.h
+++ b/ports/nrf/boards/feather52832/mpconfigboard.h
@@ -25,47 +25,12 @@
*/
#define MICROPY_HW_BOARD_NAME "Bluefruit nRF52 Feather"
-#define MICROPY_HW_MCU_NAME "NRF52832"
-#define MICROPY_PY_SYS_PLATFORM "nrf52"
+#define MICROPY_HW_MCU_NAME "nRF52832"
+#define MICROPY_PY_SYS_PLATFORM "nRF52"
-#define MICROPY_HW_HAS_LED (1)
-#define MICROPY_HW_HAS_SWITCH (0)
-#define MICROPY_HW_HAS_FLASH (0)
-#define MICROPY_HW_HAS_SDCARD (0)
-#define MICROPY_HW_HAS_MMA7660 (0)
-#define MICROPY_HW_HAS_LIS3DSH (0)
-#define MICROPY_HW_HAS_LCD (0)
-#define MICROPY_HW_ENABLE_RNG (0)
-#define MICROPY_HW_ENABLE_RTC (0)
-#define MICROPY_HW_ENABLE_TIMER (0)
-#define MICROPY_HW_ENABLE_SERVO (0)
-#define MICROPY_HW_ENABLE_DAC (0)
-#define MICROPY_HW_ENABLE_CAN (0)
-
-#define MICROPY_HW_LED_COUNT (2)
-#define MICROPY_HW_LED_PULLUP (0)
-
-#define MICROPY_HW_LED1 (17) // LED1
-#define MICROPY_HW_LED2 (19) // LED2
-
-// UART config
#define MICROPY_HW_UART1_RX (pin_P0_08)
#define MICROPY_HW_UART1_TX (pin_P0_06)
#define MICROPY_HW_UART1_HWFC (0)
-// SPI0 config
-#define MICROPY_HW_SPI0_NAME "SPI0"
-#define MICROPY_HW_SPI0_SCK (pin_P0_12) // (Arduino D13)
-#define MICROPY_HW_SPI0_MOSI (pin_P0_13) // (Arduino D11)
-#define MICROPY_HW_SPI0_MISO (pin_P0_14) // (Arduino D12)
-
-#define MICROPY_HW_PWM0_NAME "PWM0"
-#define MICROPY_HW_PWM1_NAME "PWM1"
-#define MICROPY_HW_PWM2_NAME "PWM2"
-
-#define HELP_TEXT_BOARD_LED "1,2"
-
-
-
-#define PORT_HEAP_SIZE (32*1024)
+#define PORT_HEAP_SIZE (32 * 1024)
#define CIRCUITPY_AUTORELOAD_DELAY_MS 500
diff --git a/ports/nrf/boards/feather52840/mpconfigboard.h b/ports/nrf/boards/feather52840/mpconfigboard.h
index 252906fca..aff9177d0 100644
--- a/ports/nrf/boards/feather52840/mpconfigboard.h
+++ b/ports/nrf/boards/feather52840/mpconfigboard.h
@@ -27,53 +27,14 @@
#define FEATHER52840
#define MICROPY_HW_BOARD_NAME "Feather52840"
-#define MICROPY_HW_MCU_NAME "NRF52840"
-#define MICROPY_PY_SYS_PLATFORM "nrf52840-PDK"
+#define MICROPY_HW_MCU_NAME "nRF52840"
+#define MICROPY_PY_SYS_PLATFORM "nRF52840-PDK"
-#define MICROPY_HW_HAS_LED (1)
-#define MICROPY_HW_HAS_SWITCH (0)
-#define MICROPY_HW_HAS_FLASH (0)
-#define MICROPY_HW_HAS_SDCARD (0)
-#define MICROPY_HW_HAS_MMA7660 (0)
-#define MICROPY_HW_HAS_LIS3DSH (0)
-#define MICROPY_HW_HAS_LCD (0)
-#define MICROPY_HW_ENABLE_RNG (0)
-#define MICROPY_HW_ENABLE_RTC (0)
-#define MICROPY_HW_ENABLE_TIMER (0)
-#define MICROPY_HW_ENABLE_SERVO (0)
-#define MICROPY_HW_ENABLE_DAC (0)
-#define MICROPY_HW_ENABLE_CAN (0)
-
-#define MICROPY_HW_LED_COUNT (4)
-#define MICROPY_HW_LED_PULLUP (1)
-
-#define MICROPY_HW_LED1 (13) // LED1
-#define MICROPY_HW_LED2 (14) // LED2
-#define MICROPY_HW_LED3 (15) // LED3
-#define MICROPY_HW_LED4 (16) // LED4
-
-// UART config
#define MICROPY_HW_UART1_RX (pin_P0_08)
#define MICROPY_HW_UART1_TX (pin_P0_06)
#define MICROPY_HW_UART1_CTS (pin_P0_07)
#define MICROPY_HW_UART1_RTS (pin_P0_05)
#define MICROPY_HW_UART1_HWFC (1)
-// SPI0 config
-#define MICROPY_HW_SPI0_NAME "SPI0"
-
-#define MICROPY_HW_SPI0_SCK (pin_P1_15)
-#define MICROPY_HW_SPI0_MOSI (pin_P1_13)
-#define MICROPY_HW_SPI0_MISO (pin_P1_14)
-
-#define MICROPY_HW_PWM0_NAME "PWM0"
-#define MICROPY_HW_PWM1_NAME "PWM1"
-#define MICROPY_HW_PWM2_NAME "PWM2"
-#if 0
-#define MICROPY_HW_PWM3_NAME "PWM3"
-#endif
-
-#define HELP_TEXT_BOARD_LED "1,2,3,4"
-
-#define PORT_HEAP_SIZE (128*1024)
+#define PORT_HEAP_SIZE (128 * 1024)
#define CIRCUITPY_AUTORELOAD_DELAY_MS 500
diff --git a/ports/nrf/boards/pca10040/mpconfigboard.h b/ports/nrf/boards/pca10040/mpconfigboard.h
index ea8000ca5..f618a39ea 100644
--- a/ports/nrf/boards/pca10040/mpconfigboard.h
+++ b/ports/nrf/boards/pca10040/mpconfigboard.h
@@ -24,52 +24,15 @@
* THE SOFTWARE.
*/
-#define PCA10040
-
#define MICROPY_HW_BOARD_NAME "PCA10040"
-#define MICROPY_HW_MCU_NAME "NRF52832"
-#define MICROPY_PY_SYS_PLATFORM "nrf52-DK"
-
-#define MICROPY_HW_HAS_LED (1)
-#define MICROPY_HW_HAS_SWITCH (0)
-#define MICROPY_HW_HAS_FLASH (0)
-#define MICROPY_HW_HAS_SDCARD (0)
-#define MICROPY_HW_HAS_MMA7660 (0)
-#define MICROPY_HW_HAS_LIS3DSH (0)
-#define MICROPY_HW_HAS_LCD (0)
-#define MICROPY_HW_ENABLE_RNG (0)
-#define MICROPY_HW_ENABLE_RTC (0)
-#define MICROPY_HW_ENABLE_TIMER (0)
-#define MICROPY_HW_ENABLE_SERVO (0)
-#define MICROPY_HW_ENABLE_DAC (0)
-#define MICROPY_HW_ENABLE_CAN (0)
-
-#define MICROPY_HW_LED_COUNT (4)
-#define MICROPY_HW_LED_PULLUP (1)
-
-#define MICROPY_HW_LED1 (17) // LED1
-#define MICROPY_HW_LED2 (18) // LED2
-#define MICROPY_HW_LED3 (19) // LED3
-#define MICROPY_HW_LED4 (20) // LED4
+#define MICROPY_HW_MCU_NAME "nRF52832"
+#define MICROPY_PY_SYS_PLATFORM "nRF52-DK"
-// UART config
#define MICROPY_HW_UART1_RX (pin_P0_08)
#define MICROPY_HW_UART1_TX (pin_P0_06)
#define MICROPY_HW_UART1_CTS (pin_P0_07)
#define MICROPY_HW_UART1_RTS (pin_P0_05)
#define MICROPY_HW_UART1_HWFC (1)
-// SPI0 config
-#define MICROPY_HW_SPI0_NAME "SPI0"
-#define MICROPY_HW_SPI0_SCK (pin_P0_25) // (Arduino D13)
-#define MICROPY_HW_SPI0_MOSI (pin_P0_23) // (Arduino D11)
-#define MICROPY_HW_SPI0_MISO (pin_P0_24) // (Arduino D12)
-
-#define MICROPY_HW_PWM0_NAME "PWM0"
-#define MICROPY_HW_PWM1_NAME "PWM1"
-#define MICROPY_HW_PWM2_NAME "PWM2"
-
-#define HELP_TEXT_BOARD_LED "1,2,3,4"
-
-#define PORT_HEAP_SIZE (32*1024)
+#define PORT_HEAP_SIZE (32 * 1024)
#define CIRCUITPY_AUTORELOAD_DELAY_MS 500
diff --git a/ports/nrf/boards/pca10056/mpconfigboard.h b/ports/nrf/boards/pca10056/mpconfigboard.h
index 2be1156d0..427857247 100644
--- a/ports/nrf/boards/pca10056/mpconfigboard.h
+++ b/ports/nrf/boards/pca10056/mpconfigboard.h
@@ -24,56 +24,15 @@
* THE SOFTWARE.
*/
-#define PCA10056
-
#define MICROPY_HW_BOARD_NAME "PCA10056"
-#define MICROPY_HW_MCU_NAME "NRF52840"
-#define MICROPY_PY_SYS_PLATFORM "nrf52840-PDK"
-
-#define MICROPY_HW_HAS_LED (1)
-#define MICROPY_HW_HAS_SWITCH (0)
-#define MICROPY_HW_HAS_FLASH (0)
-#define MICROPY_HW_HAS_SDCARD (0)
-#define MICROPY_HW_HAS_MMA7660 (0)
-#define MICROPY_HW_HAS_LIS3DSH (0)
-#define MICROPY_HW_HAS_LCD (0)
-#define MICROPY_HW_ENABLE_RNG (0)
-#define MICROPY_HW_ENABLE_RTC (0)
-#define MICROPY_HW_ENABLE_TIMER (0)
-#define MICROPY_HW_ENABLE_SERVO (0)
-#define MICROPY_HW_ENABLE_DAC (0)
-#define MICROPY_HW_ENABLE_CAN (0)
-
-#define MICROPY_HW_LED_COUNT (4)
-#define MICROPY_HW_LED_PULLUP (1)
-
-#define MICROPY_HW_LED1 (13) // LED1
-#define MICROPY_HW_LED2 (14) // LED2
-#define MICROPY_HW_LED3 (15) // LED3
-#define MICROPY_HW_LED4 (16) // LED4
+#define MICROPY_HW_MCU_NAME "nRF52840"
+#define MICROPY_PY_SYS_PLATFORM "nRF52840-PDK"
-// UART config
#define MICROPY_HW_UART1_RX (pin_P0_08)
#define MICROPY_HW_UART1_TX (pin_P0_06)
#define MICROPY_HW_UART1_CTS (pin_P0_07)
#define MICROPY_HW_UART1_RTS (pin_P0_05)
#define MICROPY_HW_UART1_HWFC (1)
-// SPI0 config
-#define MICROPY_HW_SPI0_NAME "SPI0"
-
-#define MICROPY_HW_SPI0_SCK (pin_P1_15)
-#define MICROPY_HW_SPI0_MOSI (pin_P1_13)
-#define MICROPY_HW_SPI0_MISO (pin_P1_14)
-
-#define MICROPY_HW_PWM0_NAME "PWM0"
-#define MICROPY_HW_PWM1_NAME "PWM1"
-#define MICROPY_HW_PWM2_NAME "PWM2"
-#if 0
-#define MICROPY_HW_PWM3_NAME "PWM3"
-#endif
-
-#define HELP_TEXT_BOARD_LED "1,2,3,4"
-
-#define PORT_HEAP_SIZE (128*1024)
+#define PORT_HEAP_SIZE (128 * 1024)
#define CIRCUITPY_AUTORELOAD_DELAY_MS 500
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index f8e717ccc..05f64bb4f 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -126,14 +126,6 @@
#define MICROPY_KBD_EXCEPTION (1)
-#ifndef MICROPY_HW_LED_COUNT
-#define MICROPY_HW_LED_COUNT (0)
-#endif
-
-#ifndef MICROPY_HW_LED_PULLUP
-#define MICROPY_HW_LED_PULLUP (0)
-#endif
-
#ifndef MICROPY_PY_HW_RNG
#define MICROPY_PY_HW_RNG (1)
#endif