Fixed compilation for other esp32 chips

Author: ducalex

components/retro-go/rg_audio.c

@@ -56,8 +56,8 @@ void rg_audio_init(int sampleRate)
         .bits_per_sample = 16,
         .channel_format = I2S_CHANNEL_FMT_RIGHT_LEFT,
         .communication_format = I2S_COMM_FORMAT_STAND_MSB,
-        .dma_buf_count = 5, // Goal is to have ~800 samples over 2-8 buffers (optimize for 533 usage)
-        .dma_buf_len = 180, // The unit is stereo samples (4 bytes)
+        .dma_buf_count = 3, // Goal is to have ~800 samples over 2-8 buffers (3x270 or 5x180 are pretty good)
+        .dma_buf_len = 270, // The unit is stereo samples (4 bytes) (optimize for 533 usage)
         .intr_alloc_flags = 0, // ESP_INTR_FLAG_LEVEL1
         .use_apll = 0
     };

components/retro-go/rg_display.c

@@ -164,8 +164,8 @@ static void spi_init()
     gpio_set_level(RG_GPIO_LCD_DC, 1);
 
     //Initialize the SPI bus
-    spi_bus_initialize(HSPI_HOST, &buscfg, 1);
-    spi_bus_add_device(HSPI_HOST, &devcfg, &spi_dev);
+    spi_bus_initialize(SPI2_HOST, &buscfg, 1);
+    spi_bus_add_device(SPI2_HOST, &devcfg, &spi_dev);
     //assert(ret==ESP_OK);
 
     xTaskCreatePinnedToCore(&spi_task, "spi_task", 1024, NULL, 5, NULL, 1);
@@ -175,7 +175,7 @@ static void spi_deinit(void)
 {
     // To do: Stop SPI task...
     spi_bus_remove_device(spi_dev);
-    spi_bus_free(HSPI_HOST);
+    spi_bus_free(SPI2_HOST);
 }
 
 static void ili9341_cmd(uint8_t cmd, const void *data, size_t data_len)
@@ -219,7 +219,7 @@ static void ili9341_init()
     spi_init();
 
 #define ILI9341_CMD(cmd, data...) {const uint8_t x[] = data; ili9341_cmd(cmd, x, sizeof(x));}
-#if defined(RG_TARGET_ODROID_GO)
+#if RG_SCREEN_TYPE == 0 // LCD Model (ODROID-GO)
     ILI9341_CMD(0x01, {});     // Reset
     ILI9341_CMD(0x3A, {0x55}); // Pixel Format Set RGB565
     ILI9341_CMD(0xCF, {0x00, 0xc3, 0x30});
@@ -242,7 +242,7 @@ static void ili9341_init()
     ILI9341_CMD(0xE1, {0x00, 0x0E, 0x14, 0x03, 0x11, 0x07, 0x31, 0xC1, 0x48, 0x08, 0x0F, 0x0C, 0x31, 0x36, 0x0F}); // Set Gamma
     ILI9341_CMD(0x11, {}); // Exit Sleep
     ILI9341_CMD(0x29, {}); // Display on
-#elif defined(RG_TARGET_MRGC_G32)
+#elif RG_SCREEN_TYPE == 1 // LCD Model (MRGC-G32)
     ILI9341_CMD(0x01, {});     // Reset
     ILI9341_CMD(0x3A, {0x55}); // Pixel Format Set RGB565
     ILI9341_CMD(0x36, {(0x00|0x00|0x00)});
@@ -260,7 +260,7 @@ static void ili9341_init()
     ILI9341_CMD(0xE1, {0xD0, 0x00, 0x03, 0x09, 0x05, 0x25, 0x3A, 0x55, 0x50, 0x3D, 0x1C, 0x1D, 0x1D, 0x1E});
     ILI9341_CMD(0x11, {}); // Exit Sleep
     ILI9341_CMD(0x29, {}); // Display on
-#elif defined(RG_TARGET_QTPY_GAMER)
+#elif RG_SCREEN_TYPE == 2 // LCD Model (QT-PY Gamer)
     ILI9341_CMD(0x01, {});     // Reset
     ILI9341_CMD(0x11, {}); // Exit Sleep
     ILI9341_CMD(0x3A, {0x55}); // Pixel Format Set RGB565

components/retro-go/rg_input.c

@@ -168,7 +168,7 @@ void rg_input_init(void)
 
     const char *driver = "GPIO";
 
-    adc1_config_width(ADC_WIDTH_12Bit);
+    adc1_config_width(ADC_WIDTH_MAX - 1);
     adc1_config_channel_atten(RG_GPIO_GAMEPAD_X, ADC_ATTEN_11db);
     adc1_config_channel_atten(RG_GPIO_GAMEPAD_Y, ADC_ATTEN_11db);
 
@@ -303,9 +303,9 @@ bool rg_input_read_battery(float *percent, float *volts)
     // ADC not initialized
     if (adc_chars.vref == 0)
     {
-        adc1_config_width(ADC_WIDTH_12Bit);
+        adc1_config_width(ADC_WIDTH_MAX - 1);
         adc1_config_channel_atten(ADC1_CHANNEL_0, ADC_ATTEN_11db);
-        esp_adc_cal_characterize(ADC_UNIT_1, ADC_ATTEN_11db, ADC_WIDTH_BIT_12, 1100, &adc_chars);
+        esp_adc_cal_characterize(ADC_UNIT_1, ADC_ATTEN_11db, ADC_WIDTH_MAX - 1, 1100, &adc_chars);
     }
 
     for (int i = 0; i < 4; ++i)

components/retro-go/rg_storage.c

@@ -65,7 +65,7 @@ void rg_storage_init(void)
 #if RG_STORAGE_DRIVER == 1
 
     sdmmc_host_t host_config = SDSPI_HOST_DEFAULT();
-    host_config.slot = HSPI_HOST;
+    host_config.slot = SPI2_HOST;
     host_config.max_freq_khz = SDMMC_FREQ_DEFAULT; // SDMMC_FREQ_26M;
     host_config.do_transaction = &sdcard_do_transaction;
 

components/retro-go/targets/esplay-micro.h

@@ -41,7 +41,8 @@
 #define RG_AUDIO_USE_EXT_DAC        1
 
 // Video
-#define RG_SCREEN_TYPE              0
+#define RG_SCREEN_DRIVER            0   // 0 = ILI9341
+#define RG_SCREEN_TYPE              1
 #define RG_SCREEN_WIDTH             240
 #define RG_SCREEN_HEIGHT            320
 #define RG_SCREEN_ROTATE            0

components/retro-go/targets/mrgc-g32.h

@@ -12,6 +12,7 @@
 #define RG_AUDIO_USE_EXT_DAC        1
 
 // Video
+#define RG_SCREEN_DRIVER            0   // 0 = ILI9341
 #define RG_SCREEN_TYPE              0
 #define RG_SCREEN_WIDTH             320
 #define RG_SCREEN_HEIGHT            240

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

@@ -11,7 +11,8 @@
 #define RG_AUDIO_USE_SPEAKER        1
 
 // Video
-#define RG_SCREEN_TYPE              0
+#define RG_SCREEN_DRIVER            0   // 0 = ILI9341
+#define RG_SCREEN_TYPE              2
 #define RG_SCREEN_WIDTH             240
 #define RG_SCREEN_HEIGHT            240
 #define RG_SCREEN_ROTATE            0

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

@@ -4,6 +4,7 @@
 import subprocess
 import shutil
 import shlex
+import glob
 import time
 import math
 import sys
@@ -16,7 +17,11 @@
 except:
     pass
 
-DEFAULT_TARGET = os.getenv("RG_TOOL_TARGET", "odroid-go")
+TARGETS = ["odroid-go", "mrgc-g32", "qtpy-gamer"]
+for t in glob.glob("components/retro-go/targets/*.h"):
+    TARGETS.append(os.path.basename(t)[0:-2])
+
+DEFAULT_TARGET = os.getenv("RG_TOOL_TARGET", TARGETS[0])
 DEFAULT_BAUD = os.getenv("RG_TOOL_BAUD", "1152000")
 DEFAULT_PORT = os.getenv("RG_TOOL_PORT", "COM3")
 PROJECT_NAME = os.getenv("PROJECT_NAME", "Retro-Go") # os.path.basename(os.getcwd()).title()
@@ -120,8 +125,8 @@ def analyze_profile(frames):
         debug_print("")
 
 
-def build_firmware(targets, device_type):
-    print("Building firmware with: %s\n" % " ".join(targets))
+def build_firmware(apps, device_type):
+    print("Building firmware with: %s\n" % " ".join(apps))
     args = [
         sys.executable,
         "tools/mkfw.py",
@@ -133,16 +138,16 @@ def build_firmware(targets, device_type):
     if device_type in ["mrgc-g32", "esplay"]:
         args.append("--esplay")
 
-    for target in targets:
-        part = PROJECT_APPS[target]
-        args += [str(part[0]), str(part[1]), str(part[2]), target, os.path.join(target, "build", target + ".bin")]
+    for app in apps:
+        part = PROJECT_APPS[app]
+        args += [str(part[0]), str(part[1]), str(part[2]), app, os.path.join(app, "build", app + ".bin")]
 
     print("Running: %s" % ' '.join(shlex.quote(arg) for arg in args[1:]))
     subprocess.run(args, check=True)
 
 
-def build_image(targets, device_type):
-    print("Building image with: %s\n" % " ".join(targets))
+def build_image(apps, device_type):
+    print("Building image with: %s\n" % " ".join(apps))
     image_file = ("%s_%s_%s.img" % (PROJECT_NAME, PROJECT_VER, device_type)).lower()
     image_data = bytearray(b"\xFF" * 0x10000)
     table_ota = 0
@@ -152,17 +157,17 @@ def build_image(targets, device_type):
         "phy_init, data, phy, 61440, 4096",
     ]
 
-    for target in targets:
-        part = PROJECT_APPS[target]
-        with open(os.path.join(target, "build", target + ".bin"), "rb") as f:
+    for app in apps:
+        part = PROJECT_APPS[app]
+        with open(os.path.join(app, "build", app + ".bin"), "rb") as f:
             data = f.read()
         part_size = max(part[2], math.ceil(len(data) / 0x10000) * 0x10000)
-        table_csv.append("%s, app, ota_%d, %d, %d" % (target, table_ota, len(image_data), part_size))
+        table_csv.append("%s, app, ota_%d, %d, %d" % (app, table_ota, len(image_data), part_size))
         table_ota += 1
         image_data += data + b"\xFF" * (part_size - len(data))
 
     try:
-        cwd = os.path.join(os.getcwd(), list(targets)[0])
+        cwd = os.path.join(os.getcwd(), list(apps)[0])
         subprocess.run("idf.py bootloader", stdout=subprocess.DEVNULL, shell=True, check=True, cwd=cwd)
         with open(os.path.join(cwd, "build", "bootloader", "bootloader.bin"), "rb") as f:
             bootloader_bin = f.read()
@@ -182,32 +187,32 @@ def build_image(targets, device_type):
     print("Saved image '%s' (%d bytes)\n" % (image_file, len(image_data)))
 
 
-def clean_app(target):
-    print("Cleaning up app '%s'..." % target)
+def clean_app(app):
+    print("Cleaning up app '%s'..." % app)
     try:
-        os.unlink(os.path.join(target, "sdkconfig"))
-        os.unlink(os.path.join(target, "sdkconfig.old"))
+        os.unlink(os.path.join(app, "sdkconfig"))
+        os.unlink(os.path.join(app, "sdkconfig.old"))
     except:
         pass
     try:
-        shutil.rmtree(os.path.join(target, "build"))
+        shutil.rmtree(os.path.join(app, "build"))
     except:
         pass
     print("Done.\n")
 
 
-def build_app(target, device_type, with_profiling=False, with_netplay=False):
+def build_app(app, device_type, with_profiling=False, with_netplay=False):
     # To do: clean up if any of the flags changed since last build
-    print("Building app '%s'" % target)
+    print("Building app '%s'" % app)
     os.putenv("ENABLE_PROFILING", "1" if with_profiling else "0")
     os.putenv("ENABLE_NETPLAY", "1" if with_netplay else "0")
     os.putenv("PROJECT_VER", PROJECT_VER)
     os.putenv("RG_TARGET", re.sub(r'[^A-Z0-9]', '_', device_type.upper()))
-    subprocess.run("idf.py app", shell=True, check=True, cwd=os.path.join(os.getcwd(), target))
+    subprocess.run("idf.py app", shell=True, check=True, cwd=os.path.join(os.getcwd(), app))
 
     try:
         print("\nPatching esp_image_header_t to skip sha256 on boot... ", end="")
-        with open(os.path.join(target, "build", target + ".bin"), "r+b") as fp:
+        with open(os.path.join(app, "build", app + ".bin"), "r+b") as fp:
             fp.seek(23)
             fp.write(b"\0")
         print("done!\n")
@@ -216,10 +221,10 @@ def build_app(target, device_type, with_profiling=False, with_netplay=False):
         pass
 
 
-def monitor_app(target, port, baudrate=115200):
-    print("Starting monitor for app '%s'" % target)
+def monitor_app(app, port, baudrate=115200):
+    print("Starting monitor for app '%s'" % app)
     mon = serial.Serial(port, baudrate=baudrate, timeout=0)
-    elf = os.path.join(target, "build", target + ".elf")
+    elf = os.path.join(app, "build", app + ".elf")
 
     mon.setDTR(False)
     mon.setRTS(False)
@@ -287,7 +292,7 @@ def monitor_app(target, port, baudrate=115200):
     "apps", nargs="*", default="all", choices=["all"] + list(PROJECT_APPS.keys())
 )
 parser.add_argument(
-    "--target", default=DEFAULT_TARGET, choices=["odroid-go", "esp32s2", "mrgc-g32", "qtpy-gamer"], help="Device to target"
+    "--target", default=DEFAULT_TARGET, choices=set(TARGETS), help="Device to target"
 )
 parser.add_argument(
     "--with-netplay", action="store_const", const=True, help="Build with netplay enabled"