diff options
| author | Scott Shawcroft <scott@tannewt.org> | 2017-08-28 13:59:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-28 13:59:26 -0700 |
| commit | 447a4b1ecd5655357c9daaace03b91355d2e2c6d (patch) | |
| tree | 46ca08a93e9870aab4fbb533843f3c99796cbdf4 /shared-module | |
| parent | 4e63d55d8d0df6d7600bb684fa90a8cb54708ba8 (diff) | |
| parent | c679c80c710fd4a0e37ad87200d8a721e19727aa (diff) | |
Merge pull request #208 from adafruit/merge-v1.9.2
Merge MicroPython v1.9.2
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 |