8000 did required modification to merge the temperature sensore module · boneskull/circuitpython@378c40b · GitHub
[go: up one dir, main page]
Skip to content

Commit 378c40b

Browse files
author
Bander Ajba
committed
did required modification to merge the temperature sensore module
1 parent 3882b0e commit 378c40b

File tree

16 files changed

+68
-97
lines changed

16 files changed

+68
-97
lines changed

‎nrf5/boards/nrf51822_ac_s110.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ MEMORY
99
FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x040000 /* entire flash, 256 KiB */
1010
FLASH_ISR (rx) : ORIGIN = 0x00018000, LENGTH = 0x000400 /* sector 0, 1 KiB */
1111
FLASH_TEXT (rx) : ORIGIN = 0x00018400, LENGTH = 0x027c00 /* 159 KiB */
12-
RAM (xrw) : ORIGIN = 0x20001800, LENGTH = 0x002800 /* 12 KiB */
12+
RAM (xrw) : ORIGIN = 0x20002000, LENGTH = 0x006000 /* 12 KiB */
1313
}
1414

1515
/* produce a link error if there is not this amount of RAM for these sections */

‎nrf5/boards/pca10000/mpconfigboard.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232

3333
#define MICROPY_PY_MACHINE_HW_SPI (0)
3434
#define MICROPY_PY_MACHINE_PWM (0)
35+
#define MICROPY_PY_MACHINE_TEMP (1)
3536

3637
#define MICROPY_HW_HAS_SWITCH (0)
3738
#define MICROPY_HW_HAS_FLASH (0)

‎nrf5/boards/pca10000/nrf51_hal_conf.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33

44
#define HAL_UART_MODULE_ENABLED
55
#define HAL_TIME_MODULE_ENABLED
6+
#define HAL_TEMP_MODULE_ENABLED
67

78
#endif // NRF51_HAL_CONF_H__

‎nrf5/boards/pca10001/mpconfigboard.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232

3333
#define MICROPY_PY_MACHINE_HW_SPI (0)
3434
#define MICROPY_PY_MACHINE_PWM (0)
35+
#define MICROPY_PY_MACHINE_TEMP (1)
3536

3637
#define MICROPY_HW_HAS_SWITCH (0)
3738
#define MICROPY_HW_HAS_FLASH (0)
@@ -46,6 +47,7 @@
4647
#define MICROPY_HW_ENABLE_DAC (0)
4748
#define MICROPY_HW_ENABLE_CAN (0)
4849

50+
4951
#define MICROPY_HW_LED_COUNT (2)
5052
#define MICROPY_HW_LED_PULLUP (0)
5153

@@ -57,6 +59,6 @@
5759
#define MICROPY_HW_UART1_TX (pin_A9)
5860
#define MICROPY_HW_UART1_CTS (pin_A10)
5961
#define MICROPY_HW_UART1_RTS (pin_A8)
60-
#define MICROPY_HW_UART1_HWFC (1)
62+
#define MICROPY_HW_UART1_HWFC (0)
6163

6264
#define HELP_TEXT_BOARD_LED "1,2"

‎nrf5/boards/pca10001/nrf51_hal_conf.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,10 @@
44
#define HAL_UART_MODULE_ENABLED
55
// #define HAL_SPI_MODULE_ENABLED
66
#define HAL_TIME_MODULE_ENABLED
7+
#define HAL_RTC_MODULE_ENABLED
8+
#define HAL_TIMER_MODULE_ENABLED
9+
#define HAL_TWI_MODULE_ENABLED
10+
#define HAL_ADC_MODULE_ENABLED
11+
#define HAL_TEMP_MODULE_ENABLED
712

813
#endif // NRF51_HAL_CONF_H__

‎nrf5/boards/pca10028/mpconfigboard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
#define MICROPY_HW_UART1_TX (pin_A9)
7474
#define MICROPY_HW_UART1_CTS (pin_A10)
7575
#define MICROPY_HW_UART1_RTS (pin_A8)
76-
#define MICROPY_HW_UART1_HWFC (0)
76+
#define MICROPY_HW_UART1_HWFC (1)
7777

7878
// SPI0 config
7979
#define MICROPY_HW_SPI0_NAME "SPI0"

‎nrf5/boards/pca10031/mpconfigboard.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#define MICROPY_PY_SYS_PLATFORM "nrf51-dongle"
3232

3333
#define MICROPY_PY_MACHINE_PWM (0)
34+
#define MICROPY_PY_MACHINE_TEMP (1)
3435

3536
#define MICROPY_HW_HAS_SWITCH (0)
3637
#define MICROPY_HW_HAS_FLASH (0)

‎nrf5/boards/pca10031/nrf51_hal_conf.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
#define HAL_UART_MODULE_ENABLED
55
#define HAL_SPI_MODULE_ENABLED
66
#define HAL_TIME_MODULE_ENABLED
7+
#define HAL_TEMP_MODULE_ENABLED
78

89
#endif // NRF51_HAL_CONF_H__

‎nrf5/boards/pca10040/mpconfigboard.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
#define MICROPY_PY_MACHINE_RTC (1)
3737
#define MICROPY_PY_MACHINE_I2C (1)
3838
#define MICROPY_PY_MACHINE_ADC (1)
39+
#define MICROPY_PY_MACHINE_TEMP (1)
3940

4041
#define MICROPY_PY_DISPLAY (1)
4142
#define MICROPY_PY_DISPLAY_EPAPER_SLD00200P (1)

‎nrf5/boards/pca10040/nrf52_hal_conf.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#define HAL_TIMER_MODULE_ENABLED
1010
#define HAL_TWI_MODULE_ENABLED
1111
#define HAL_ADCE_MODULE_ENABLED
12+
#define HAL_TEMP_MODULE_ENABLED
1213
// #define HAL_UARTE_MODULE_ENABLED
1314
// #define HAL_SPIE_MODULE_ENABLED
1415
// #define HAL_TWIE_MODULE_ENABLED

0 commit comments

Comments
 (0)
0