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-bindings/touchio | |
| 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-bindings/touchio')
| -rw-r--r-- | shared-bindings/touchio/TouchIn.h | 6 | ||||
| -rw-r--r-- | shared-bindings/touchio/__init__.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/shared-bindings/touchio/TouchIn.h b/shared-bindings/touchio/TouchIn.h index 495cb2b14..6ee668f38 100644 --- a/shared-bindings/touchio/TouchIn.h +++ b/shared-bindings/touchio/TouchIn.h @@ -24,8 +24,8 @@ * THE SOFTWARE. */ -#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_TOUCHIO_TOUCHIN_H__ -#define __MICROPY_INCLUDED_SHARED_BINDINGS_TOUCHIO_TOUCHIN_H__ +#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_TOUCHIO_TOUCHIN_H +#define MICROPY_INCLUDED_SHARED_BINDINGS_TOUCHIO_TOUCHIN_H #include "common-hal/microcontroller/Pin.h" #include "common-hal/touchio/TouchIn.h" @@ -36,4 +36,4 @@ void common_hal_touchio_touchin_construct(touchio_touchin_obj_t* self, const mcu void common_hal_touchio_touchin_deinit(touchio_touchin_obj_t* self); bool common_hal_touchio_touchin_get_value(touchio_touchin_obj_t *self); -#endif // __MICROPY_INCLUDED_SHARED_BINDINGS_TOUCHIO_TOUCHIN_H__ +#endif // MICROPY_INCLUDED_SHARED_BINDINGS_TOUCHIO_TOUCHIN_H diff --git a/shared-bindings/touchio/__init__.h b/shared-bindings/touchio/__init__.h index fc40e462b..f1d350141 100644 --- a/shared-bindings/touchio/__init__.h +++ b/shared-bindings/touchio/__init__.h @@ -24,11 +24,11 @@ * THE SOFTWARE. */ -#ifndef __MICROPY_INCLUDED_SHARED_BINDINGS_TOUCHIO___INIT___H__ -#define __MICROPY_INCLUDED_SHARED_BINDINGS_TOUCHIO___INIT___H__ +#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_TOUCHIO___INIT___H +#define MICROPY_INCLUDED_SHARED_BINDINGS_TOUCHIO___INIT___H #include "py/obj.h" // Nothing now. -#endif // __MICROPY_INCLUDED_SHARED_BINDINGS_TOUCHIO___INIT___H__ +#endif // MICROPY_INCLUDED_SHARED_BINDINGS_TOUCHIO___INIT___H |