Update TwoWire class to support multiple instances (#2405)

This PR revises the `TwoWire` class so that multiple instances work as expected. The code from `twi.h` and `si2c.cpp` has been ported is no longer required by the framework, although there may be libraries which make use of them so have been left.
SmingHub · Oct 27, 2021 · cc99648 · cc99648
1 parent 12061b3
commit cc99648
Show file tree

Hide file tree

Showing 8 changed files with 344 additions and 172 deletions.
diff --git a/Sming/Arch/Esp32/Core/twi_arch.h b/Sming/Arch/Esp32/Core/twi_arch.h
@@ -19,3 +19,6 @@
 #define SCL_LOW() gpio_ll_output_enable(&GPIO, gpio_num_t(twi_scl))
 #define SCL_HIGH() gpio_ll_output_disable(&GPIO, gpio_num_t(twi_scl))
 #define SCL_READ() (gpio_ll_get_level(&GPIO, gpio_num_t(twi_scl)) != 0)
+
+#define DEFAULT_SDA_PIN 21
+#define DEFAULT_SCL_PIN 22
diff --git a/Sming/Arch/Esp8266/Core/twi_arch.h b/Sming/Arch/Esp8266/Core/twi_arch.h
@@ -15,3 +15,6 @@
 #define SCL_LOW() (GPES = (1 << twi_scl))
 #define SCL_HIGH() (GPEC = (1 << twi_scl))
 #define SCL_READ() ((GPI & (1 << twi_scl)) != 0)
+
+#define DEFAULT_SDA_PIN 2
+#define DEFAULT_SCL_PIN 0
diff --git a/Sming/Arch/Host/Core/twi_arch.h b/Sming/Arch/Host/Core/twi_arch.h
@@ -15,3 +15,6 @@
 #define SCL_LOW()
 #define SCL_HIGH()
 #define SCL_READ() 1
+
+#define DEFAULT_SDA_PIN 255
+#define DEFAULT_SCL_PIN 255
diff --git a/Sming/Arch/Rp2040/Core/twi_arch.h b/Sming/Arch/Rp2040/Core/twi_arch.h
@@ -8,6 +8,7 @@
 #pragma once
 
 #include <hardware/gpio.h>
+#include <pico.h>
 
 //Enable SDA (becomes output and since GPO is 0 for the pin, it will pull the line low)
 #define SDA_LOW() gpio_set_dir(twi_sda, true)
@@ -17,3 +18,6 @@
 #define SCL_LOW() gpio_set_dir(twi_scl, true)
 #define SCL_HIGH() gpio_set_dir(twi_scl, false)
 #define SCL_READ() gpio_get(twi_scl)
+
+#define DEFAULT_SDA_PIN PICO_DEFAULT_I2C_SDA_PIN
+#define DEFAULT_SCL_PIN PICO_DEFAULT_I2C_SCL_PIN