diff options
Diffstat (limited to 'esp8266')
| -rw-r--r-- | esp8266/Makefile | 2 | ||||
| -rw-r--r-- | esp8266/common-hal/nativeio/I2C.c | 63 | ||||
| -rw-r--r-- | esp8266/common-hal/nativeio/types.h | 9 |
3 files changed, 3 insertions, 71 deletions
diff --git a/esp8266/Makefile b/esp8266/Makefile index d7c8cef18..eac6eddc5 100644 --- a/esp8266/Makefile +++ b/esp8266/Makefile @@ -113,7 +113,6 @@ SRC_COMMON_HAL = \ nativeio/AnalogIn.c \ nativeio/AnalogOut.c \ nativeio/DigitalInOut.c \ - nativeio/I2C.c \ nativeio/PulseIn.c \ nativeio/PulseOut.c \ nativeio/PWMOut.c \ @@ -132,6 +131,7 @@ SRC_SHARED_MODULE = \ bitbangio/I2C.c \ bitbangio/OneWire.c \ bitbangio/SPI.c \ + nativeio/I2C.c \ nativeio/OneWire.c \ SRC_SHARED_MODULE_EXPANDED = $(addprefix shared-bindings/, $(SRC_SHARED_MODULE)) \ diff --git a/esp8266/common-hal/nativeio/I2C.c b/esp8266/common-hal/nativeio/I2C.c deleted file mode 100644 index 8addb92cd..000000000 --- a/esp8266/common-hal/nativeio/I2C.c +++ /dev/null @@ -1,63 +0,0 @@ -/* - * This file is part of the MicroPython project, http://micropython.org/ - * - * The MIT License (MIT) - * - * Copyright (c) 2016 Scott Shawcroft - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ - -#include "shared-bindings/nativeio/I2C.h" -#include "py/mperrno.h" -#include "py/nlr.h" - -void common_hal_nativeio_i2c_construct(nativeio_i2c_obj_t *self, - const mcu_pin_obj_t* scl, const mcu_pin_obj_t* sda, uint32_t freq) { - nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, - "No hardware support for I2C. Use bitbangio instead.")); -} - -void common_hal_nativeio_i2c_deinit(nativeio_i2c_obj_t *self) { -} - -bool common_hal_nativeio_i2c_probe(nativeio_i2c_obj_t *self, uint8_t addr) { - return false; -} - -bool common_hal_nativeio_i2c_try_lock(nativeio_i2c_obj_t *self) { - return false; -} - -bool common_hal_nativeio_i2c_has_lock(nativeio_i2c_obj_t *self) { - return false; -} - -void common_hal_nativeio_i2c_unlock(nativeio_i2c_obj_t *self) { -} - -uint8_t common_hal_nativeio_i2c_write(nativeio_i2c_obj_t *self, uint16_t addr, - const uint8_t * data, size_t len, bool transmit_stop_bit) { - return MP_EIO; -} - -uint8_t common_hal_nativeio_i2c_read(nativeio_i2c_obj_t *self, uint16_t addr, - uint8_t * data, size_t len) { - return MP_EIO; -} diff --git a/esp8266/common-hal/nativeio/types.h b/esp8266/common-hal/nativeio/types.h index 0a45712e4..05b7d28c2 100644 --- a/esp8266/common-hal/nativeio/types.h +++ b/esp8266/common-hal/nativeio/types.h @@ -34,8 +34,8 @@ #include "py/obj.h" -// Use the bitbang wrapper for OneWire -// TODO(tannewt): Wrap bitbangio for I2C too. +// Use the bitbang wrapper for I2C and OneWire +#include "shared-module/nativeio/I2C.h" #include "shared-module/nativeio/OneWire.h" typedef struct { @@ -48,11 +48,6 @@ typedef struct { mp_obj_base_t base; } nativeio_analogout_obj_t; -// Not supported, throws error on construction. -typedef struct { - mp_obj_base_t base; -} nativeio_i2c_obj_t; - typedef struct { mp_obj_base_t base; bool locked; |