diff options
| author | Dan Halbert <halbert@halwitz.org> | 2017-08-25 22:17:07 -0400 |
|---|---|---|
| committer | Dan Halbert <halbert@halwitz.org> | 2017-08-25 22:17:07 -0400 |
| commit | ef61b5ecb59e9b4e37e3e3c023c62d583c23eb16 (patch) | |
| tree | 45a798fbed0dc673304597b29e0b60174195ce79 /shared-module | |
| parent | 266be307770abe11c220eb493388807920914b7a (diff) | |
| parent | 1f78e7a43130acfa4bedf16c1007a1b0f37c75c3 (diff) | |
Initial merge of micropython v1.9.2 into circuitpython 2.0.0 (in development) master.
cpx build compiles and loads and works in repl; test suite not run yet
esp8266 not tested yet
Diffstat (limited to 'shared-module')
| -rw-r--r-- | shared-module/bitbangio/types.h | 6 | ||||
| -rw-r--r-- | shared-module/busio/I2C.h | 6 | ||||
| -rw-r--r-- | shared-module/busio/OneWire.h | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/shared-module/bitbangio/types.h b/shared-module/bitbangio/types.h index 46723a958..dfe50f049 100644 --- a/shared-module/bitbangio/types.h +++ b/shared-module/bitbangio/types.h @@ -24,8 +24,8 @@ * THE SOFTWARE. */ -#ifndef __MICROPY_INCLUDED_SHARED_MODULE_BITBANGIO_TYPES_H__ -#define __MICROPY_INCLUDED_SHARED_MODULE_BITBANGIO_TYPES_H__ +#ifndef MICROPY_INCLUDED_SHARED_MODULE_BITBANGIO_TYPES_H +#define MICROPY_INCLUDED_SHARED_MODULE_BITBANGIO_TYPES_H #include "common-hal/digitalio/DigitalInOut.h" @@ -57,4 +57,4 @@ typedef struct { volatile bool locked:1; } bitbangio_spi_obj_t; -#endif // __MICROPY_INCLUDED_SHARED_MODULE_BITBANGIO_TYPES_H__ +#endif // MICROPY_INCLUDED_SHARED_MODULE_BITBANGIO_TYPES_H diff --git a/shared-module/busio/I2C.h b/shared-module/busio/I2C.h index 9706124c2..8e3525f19 100644 --- a/shared-module/busio/I2C.h +++ b/shared-module/busio/I2C.h @@ -24,8 +24,8 @@ * THE SOFTWARE. */ -#ifndef __MICROPY_INCLUDED_ATMEL_SAMD_SHARED_MODULE_BUSIO_I2C_H__ -#define __MICROPY_INCLUDED_ATMEL_SAMD_SHARED_MODULE_BUSIO_I2C_H__ +#ifndef MICROPY_INCLUDED_ATMEL_SAMD_SHARED_MODULE_BUSIO_I2C_H +#define MICROPY_INCLUDED_ATMEL_SAMD_SHARED_MODULE_BUSIO_I2C_H #include "shared-module/bitbangio/types.h" @@ -36,4 +36,4 @@ typedef struct { bitbangio_i2c_obj_t bitbang; } busio_i2c_obj_t; -#endif // __MICROPY_INCLUDED_ATMEL_SAMD_SHARED_MODULE_BUSIO_I2C_H__ +#endif // MICROPY_INCLUDED_ATMEL_SAMD_SHARED_MODULE_BUSIO_I2C_H diff --git a/shared-module/busio/OneWire.h b/shared-module/busio/OneWire.h index 9404a7206..9ffb89d49 100644 --- a/shared-module/busio/OneWire.h +++ b/shared-module/busio/OneWire.h @@ -24,8 +24,8 @@ * THE SOFTWARE. */ -#ifndef __MICROPY_INCLUDED_ATMEL_SAMD_SHARED_MODULE_BUSIO_ONEWIRE_H__ -#define __MICROPY_INCLUDED_ATMEL_SAMD_SHARED_MODULE_BUSIO_ONEWIRE_H__ +#ifndef MICROPY_INCLUDED_ATMEL_SAMD_SHARED_MODULE_BUSIO_ONEWIRE_H +#define MICROPY_INCLUDED_ATMEL_SAMD_SHARED_MODULE_BUSIO_ONEWIRE_H #include "shared-module/bitbangio/types.h" @@ -36,4 +36,4 @@ typedef struct { bitbangio_onewire_obj_t bitbang; } busio_onewire_obj_t; -#endif // __MICROPY_INCLUDED_ATMEL_SAMD_SHARED_MODULE_BUSIO_ONEWIRE_H__ +#endif // MICROPY_INCLUDED_ATMEL_SAMD_SHARED_MODULE_BUSIO_ONEWIRE_H |