rg_i2c+rg_system: Moved I2C GPIO extender init from rg_input to rg_system

If RG_I2C_GPIO_DRIVER is defined, rg_i2c_gpio_init() will be called very early in rg_system_init

That is because input, display, audio, everything really, could depend on it.

Author: ducalex

components/retro-go/rg_i2c.c

@@ -10,8 +10,6 @@
 #endif
 
 static bool i2c_initialized = false;
-static bool gpio_extender_initialized = false;
-static uint8_t gpio_extender_address = 0x00;
 
 #define TRY(x)                 \
     if ((err = (x)) != ESP_OK) \
@@ -127,14 +125,12 @@ bool rg_i2c_write_byte(uint8_t addr, uint8_t reg, uint8_t value)
     return rg_i2c_write(addr, reg, &value, 1);
 }
 
-#if RG_I2C_DRIVER == 1
 
-#define AW9523_REG_INPUT0    0x00 ///< Register for reading input values
-#define AW9523_REG_OUTPUT0   0x02 ///< Register for writing output values
-#define AW9523_REG_POLARITY0 0x04 ///< Register for polarity inversion of inputs
-#define AW9523_REG_CONFIG0   0x06 ///< Register for configuring direction
+#ifdef RG_I2C_GPIO_DRIVER
+static bool gpio_extender_initialized = false;
+static uint8_t gpio_extender_address = 0x00;
 
-#else
+#if RG_I2C_GPIO_DRIVER == 1     // AW9523
 
 #define AW9523_REG_CHIPID     0x10 ///< Register for hardcode chip ID
 #define AW9523_REG_SOFTRESET  0x7F ///< Register for soft resetting
@@ -145,6 +141,13 @@ bool rg_i2c_write_byte(uint8_t addr, uint8_t reg, uint8_t value)
 #define AW9523_REG_GCR        0x11 ///< Register for general configuration
 #define AW9523_REG_LEDMODE    0x12 ///< Register for configuring const current
 
+#elif RG_I2C_GPIO_DRIVER == 2   // PCF9539
+
+#define AW9523_REG_INPUT0    0x00 ///< Register for reading input values
+#define AW9523_REG_OUTPUT0   0x02 ///< Register for writing output values
+#define AW9523_REG_POLARITY0 0x04 ///< Register for polarity inversion of inputs
+#define AW9523_REG_CONFIG0   0x06 ///< Register for configuring direction
+
 #endif
 
 
@@ -156,36 +159,45 @@ bool rg_i2c_gpio_init(void)
     if (!i2c_initialized && !rg_i2c_init())
         return false;
 
-    gpio_extender_initialized = true;
-#if RG_I2C_DRIVER == 1
-    gpio_extender_address = 0x74;
-
-    rg_i2c_write_byte(gpio_extender_address, AW9523_REG_OUTPUT0, 0xFF);
-    rg_i2c_write_byte(gpio_extender_address, AW9523_REG_OUTPUT0 + 1, 0xFF);
-    rg_i2c_write_byte(gpio_extender_address, AW9523_REG_POLARITY0, 0x00);
-    rg_i2c_write_byte(gpio_extender_address, AW9523_REG_POLARITY0 + 1, 0x00);
-    rg_i2c_write_byte(gpio_extender_address, AW9523_REG_CONFIG0,  0xFF);
-    rg_i2c_write_byte(gpio_extender_address, AW9523_REG_CONFIG0 + 1,  0xFF);
-#else
-    gpio_extender_address = 0x58;
+#if RG_I2C_GPIO_DRIVER == 1     // AW9523
 
+    gpio_extender_address = RG_I2C_GPIO_ADDR;
     rg_i2c_write_byte(gpio_extender_address, AW9523_REG_SOFTRESET, 0);
     rg_usleep(10 * 1000);
-
     uint8_t id = rg_i2c_read_byte(gpio_extender_address, AW9523_REG_CHIPID);
     if (id != 0x23)
     {
         RG_LOGE("AW9523 invalid ID 0x%x found", id);
         return false;
     }
-
     rg_i2c_write_byte(gpio_extender_address, AW9523_REG_CONFIG0, 0xFF);
     rg_i2c_write_byte(gpio_extender_address, AW9523_REG_CONFIG0 + 1, 0xFF);
     rg_i2c_write_byte(gpio_extender_address, AW9523_REG_LEDMODE, 0xFF);
     rg_i2c_write_byte(gpio_extender_address, AW9523_REG_LEDMODE + 1, 0xFF);
     rg_i2c_write_byte(gpio_extender_address, AW9523_REG_GCR, 1 << 4);
-#endif
+
+    gpio_extender_initialized = true;
     return true;
+
+#elif RG_I2C_GPIO_DRIVER == 2   // PCF9539
+
+    gpio_extender_address = RG_I2C_GPIO_ADDR;
+    rg_i2c_write_byte(gpio_extender_address, AW9523_REG_OUTPUT0, 0xFF);
+    rg_i2c_write_byte(gpio_extender_address, AW9523_REG_OUTPUT0 + 1, 0xFF);
+    rg_i2c_write_byte(gpio_extender_address, AW9523_REG_POLARITY0, 0x00);
+    rg_i2c_write_byte(gpio_extender_address, AW9523_REG_POLARITY0 + 1, 0x00);
+    rg_i2c_write_byte(gpio_extender_address, AW9523_REG_CONFIG0,  0xFF);
+    rg_i2c_write_byte(gpio_extender_address, AW9523_REG_CONFIG0 + 1,  0xFF);
+
+    gpio_extender_initialized = true;
+    return true;
+
+#else
+
+    RG_LOGE("Unknown driver type");
+    return false;
+
+#endif
 }
 
 bool rg_i2c_gpio_deinit(void)
@@ -223,3 +235,4 @@ bool rg_i2c_gpio_set_level(int pin, int level)
     uint8_t val = rg_i2c_read_byte(gpio_extender_address, reg);
     return rg_i2c_write_byte(gpio_extender_address, reg, level ? (val | mask) : (val & ~mask));
 }
+#endif

components/retro-go/rg_input.c

@@ -128,7 +128,7 @@ bool rg_input_read_gamepad_raw(uint32_t *out)
 
 #if defined(RG_GAMEPAD_I2C_MAP)
     uint32_t buttons = 0;
-#if defined(RG_TARGET_QTPY_GAMER) || defined(RG_TARGET_BYTEBOI_REV1)
+#if defined(RG_I2C_GPIO_DRIVER)
     buttons = ~(rg_i2c_gpio_read_port(0) | rg_i2c_gpio_read_port(1) << 8);
 #elif defined(RG_TARGET_T_DECK_PLUS)
     uint8_t data[5];
@@ -286,9 +286,7 @@ void rg_input_init(void)
 #if defined(RG_GAMEPAD_I2C_MAP)
     RG_LOGI("Initializing I2C gamepad driver...");
     rg_i2c_init();
-#if defined(RG_TARGET_QTPY_GAMER) || defined(RG_TARGET_BYTEBOI_REV1)
-    rg_i2c_gpio_init();
-#elif defined(RG_TARGET_T_DECK_PLUS)
+#if defined(RG_TARGET_T_DECK_PLUS)
     rg_i2c_write_byte(T_DECK_KBD_ADDRESS, -1, T_DECK_KBD_MODE_RAW_CMD);
 #endif
     UPDATE_GLOBAL_MAP(keymap_i2c);

components/retro-go/rg_system.c

@@ -444,6 +444,11 @@ rg_app_t *rg_system_init(int sampleRate, const rg_handlers_t *handlers, void *_u
     printf(" built for: %s. type: %s\n", RG_TARGET_NAME, app.isRelease ? "release" : "dev");
     printf("========================================================\n\n");
 
+#ifdef RG_I2C_GPIO_DRIVER
+    rg_i2c_init();
+    rg_i2c_gpio_init();
+#endif
+
     rg_storage_init();
     rg_input_init();
 

components/retro-go/targets/byteboi-rev1/config.h

@@ -45,7 +45,6 @@
     ILI9341_CMD(0xE1, 0x00, 0x0E, 0x14, 0x03, 0x11, 0x07, 0x31, 0xC1, 0x48, 0x08, 0x0F, 0x0C, 0x31, 0x36, 0x0F);
 
 
-
 // Input
 // Refer to rg_input.h to see all available RG_KEY_* and RG_GAMEPAD_*_MAP types
 #define RG_GAMEPAD_I2C_MAP {\
@@ -70,11 +69,14 @@
 #define RG_BATTERY_CALC_PERCENT(raw) (((raw) * 2.f - 3500.f) / (4200.f - 3500.f) * 100.f)
 #define RG_BATTERY_CALC_VOLTAGE(raw) ((raw) * 2.f * 0.001f)
 
+// GPIO Extender
+#define RG_I2C_GPIO_DRIVER          2   // 1 = AW9523, 2 = PCF9539, 3 = MCP23017
+#define RG_I2C_GPIO_ADDR            0x74
+
 // Status LED
 //#define RG_GPIO_LED                 GPIO_NUM_14
 
 // I2C BUS
-#define RG_I2C_DRIVER               1   // 0 = AW9523, 1 = PCF9539
 #define RG_GPIO_I2C_SDA             GPIO_NUM_23
 #define RG_GPIO_I2C_SCL             GPIO_NUM_22
 

components/retro-go/targets/odroid-go/config.h

@@ -67,6 +67,10 @@
 #define RG_BATTERY_CALC_PERCENT(raw) (((raw) * 2.f - 3500.f) / (4200.f - 3500.f) * 100.f)
 #define RG_BATTERY_CALC_VOLTAGE(raw) ((raw) * 2.f * 0.001f)
 
+// GPIO Extender
+// #define RG_I2C_GPIO_DRIVER          0   // 1 = AW9523, 2 = PCF9539, 3 = MCP23017
+// #define RG_I2C_GPIO_ADDR            0x00
+
 // Status LED
 #define RG_GPIO_LED                 GPIO_NUM_2
 

components/retro-go/targets/qtpy-gamer/config.h

@@ -1,5 +1,5 @@
 // Target definition
-#define RG_TARGET_NAME             "QTPY ESP32"
+#define RG_TARGET_NAME             "QTPY-GAMER"
 
 // Storage
 #define RG_STORAGE_ROOT             "/sd"
@@ -48,6 +48,10 @@
 #define RG_BATTERY_CALC_PERCENT(raw) (99)
 #define RG_BATTERY_CALC_VOLTAGE(raw) (0)
 
+// GPIO Extender
+#define RG_I2C_GPIO_DRIVER          1   // 1 = AW9523, 2 = PCF9539, 3 = MCP23017
+#define RG_I2C_GPIO_ADDR            0x58
+
 // Status LED - not actually used, we've got neopixels instead :/
 // #define RG_GPIO_LED                 GPIO_NUM_NC
 

components/retro-go/targets/qtpy-gamer/docs/README.md

@@ -1,4 +1,4 @@
-# QTPY ESP32
+# QTPY-GAMER
 
 - Status:
 - Ref: