Commit e585d524 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Allow software and hardware i2c to be used together (e.g. on different pins)

parent ea1f28f5

Makefile

+4 −0
Original line number Diff line number Diff line
@@ -273,6 +273,10 @@ ifdef CONFIG_driver_softi2c 
	COMMON_FLAGS += -DDRIVER_SOFTI2C

endif



ifdef CONFIG_meta_driver_hardware_i2c

	COMMON_FLAGS += -DDRIVER_HARDWARE_I2C

endif



ifdef CONFIG_lib_inflate

	CXX_TARGETS += src/lib/inflate.cc

endif

include/driver/soft_i2c.h

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ class SoftI2C { 
				unsigned char rx_len, unsigned char *rx_buf);

};



#ifndef DRIVER_HARDWARE_I2C

extern SoftI2C i2c;

#endif



#endif

src/app/i2cdetect/main.cc

+3 −2
Original line number Diff line number Diff line
@@ -6,9 +6,10 @@ 
#include "arch.h"

#include "driver/gpio.h"

#include "driver/stdout.h"

#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(DRIVER_SOFTI2C)

#ifdef DRIVER_HARDWARE_I2C

#include "driver/i2c.h"

#else

#endif

#ifdef DRIVER_SOFTI2C

#include "driver/soft_i2c.h"

#endif

src/arch/arduino-nano/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ select meta_driver_adc 


config arch_arduino_nano_driver_i2c

bool "I2C"

depends on !driver_softi2c

select meta_driver_hardware_i2c

select meta_driver_i2c



config arch_arduino_nano_driver_neopixel

src/arch/blinkenrocket/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# SPDX-License-Identifier: CC0-1.0

config arch_blinkenrocket_driver_i2c

bool "I2C"

depends on !driver_softi2c

select meta_driver_hardware_i2c

select meta_driver_i2c



config arch_blinkenrocket_driver_uptime