djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nrf5: Renaming configuration define in board configs using i2c from MICROPY_PY_MACHINE_HW_I2C to MICROPY_PY_MACHINE_I2C as the config is overlapping with the latter.

Browse Source
This commit is contained in:
Glenn Ruben Bakke 2017-02-02 18:41:44 +01:00
parent 14d4a8def8
commit 4cbdbc9a4b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nrf5/boards/pca10028/mpconfigboard.h
View File

@ -41,7 +41,7 @@
#define MICROPY_PY_MACHINE_PWM (0) #define MICROPY_PY_MACHINE_PWM (0)
#define MICROPY_PY_MACHINE_TIMER (1) #define MICROPY_PY_MACHINE_TIMER (1)
#define MICROPY_PY_MACHINE_RTC (1) #define MICROPY_PY_MACHINE_RTC (1)
#define MICROPY_PY_MACHINE_HW_I2C (1) #define MICROPY_PY_MACHINE_I2C (1)
#define MICROPY_PY_MACHINE_ADC (1) #define MICROPY_PY_MACHINE_ADC (1)
#define MICROPY_PY_USOCKET (0) #define MICROPY_PY_USOCKET (0)

2
nrf5/boards/pca10056/mpconfigboard.h
View File

@ -32,7 +32,7 @@
#define MICROPY_PY_MACHINE_PWM (1) #define MICROPY_PY_MACHINE_PWM (1)
#define MICROPY_PY_MACHINE_HW_SPI (1) #define MICROPY_PY_MACHINE_HW_SPI (1)
#define MICROPY_PY_MACHINE_HW_I2C (1) #define MICROPY_PY_MACHINE_I2C (1)
#define MICROPY_PY_MACHINE_ADC (1) #define MICROPY_PY_MACHINE_ADC (1)
#define MICROPY_PY_DISPLAY (1) #define MICROPY_PY_DISPLAY (1)

2
nrf5/main.c
View File

@ -108,7 +108,7 @@ int main(int argc, char **argv) {
spi_init0(); spi_init0();
#endif #endif
#if MICROPY_PY_MACHINE_HW_I2C #if MICROPY_PY_MACHINE_I2C
i2c_init0(); i2c_init0();
#endif #endif