diff --git a/.github/workflows/build_parallel.yml b/.github/workflows/build_parallel.yml index e6b5f65..d27334b 100644 --- a/.github/workflows/build_parallel.yml +++ b/.github/workflows/build_parallel.yml @@ -19,21 +19,21 @@ jobs: board: - { name: "Flipper Zero WiFi Dev Board", flag: "MARAUDER_FLIPPER", fbqn: "esp32:esp32:esp32s2:PartitionScheme=min_spiffs,FlashSize=4M,PSRAM=enabled", file_name: "flipper", tft: false, tft_file: "", build_dir: "esp32s2", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - { name: "Flipper Zero Multi Board S3", flag: "MARAUDER_MULTIBOARD_S3", fbqn: "esp32:esp32:esp32s3:PartitionScheme=min_spiffs,FlashSize=4M", file_name: "multiboardS3", tft: false, tft_file: "", build_dir: "esp32s3", addr: "0x0", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - - { name: "OG Marauder", flag: "MARAUDER_V4", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "old_hardware", tft: true, tft_file: "User_Setup_og_marauder.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "master", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } + - { name: "OG Marauder", flag: "MARAUDER_V4", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "old_hardware", tft: true, tft_file: "User_Setup_og_marauder.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - { name: "Marauder v6", flag: "MARAUDER_V6", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "v6", tft: true, tft_file: "User_Setup_og_marauder.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "master", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - { name: "Marauder v6.1", flag: "MARAUDER_V6_1", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "v6_1", tft: true, tft_file: "User_Setup_og_marauder.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "master", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - - { name: "Marauder Kit", flag: "MARAUDER_KIT", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "kit", tft: true, tft_file: "User_Setup_og_marauder.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "master", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - - { name: "Marauder Mini", flag: "MARAUDER_MINI", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "mini", tft: true, tft_file: "User_Setup_marauder_mini.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "master", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - - { name: "ESP32 LDDB", flag: "ESP32_LDDB", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "esp32_lddb", tft: false, tft_file: "", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "master", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - - { name: "Marauder Dev Board Pro", flag: "MARAUDER_DEV_BOARD_PRO", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "marauder_dev_board_pro", tft: false, tft_file: "", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "master", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } + - { name: "Marauder Kit", flag: "MARAUDER_KIT", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "kit", tft: true, tft_file: "User_Setup_og_marauder.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } + - { name: "Marauder Mini", flag: "MARAUDER_MINI", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "mini", tft: true, tft_file: "User_Setup_marauder_mini.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } + - { name: "ESP32 LDDB", flag: "ESP32_LDDB", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "esp32_lddb", tft: false, tft_file: "", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } + - { name: "Marauder Dev Board Pro", flag: "MARAUDER_DEV_BOARD_PRO", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "marauder_dev_board_pro", tft: false, tft_file: "", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - { name: "M5StickCPlus", flag: "MARAUDER_M5STICKC", fbqn: "esp32:esp32:m5stick-c:PartitionScheme=min_spiffs", file_name: "m5stickc_plus", tft: true, tft_file: "User_Setup_marauder_m5stickc.h", build_dir: "m5stick-c", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - { name: "M5StickCPlus 2", flag: "MARAUDER_M5STICKCP2", fbqn: "esp32:esp32:m5stick-c:PartitionScheme=min_spiffs", file_name: "m5stickc_plus2", tft: true, tft_file: "User_Setup_marauder_m5stickcp2.h", build_dir: "m5stick-c", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - { name: "Rev Feather", flag: "MARAUDER_REV_FEATHER", fbqn: "esp32:esp32:esp32s2:PartitionScheme=min_spiffs,FlashSize=4M,PSRAM=enabled", file_name: "rev_feather", tft: true, tft_file: "User_Setup_marauder_rev_feather.h", build_dir: "esp32s2", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - - { name: "Marauder v7", flag: "MARAUDER_V7", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "marauder_v7", tft: true, tft_file: "User_Setup_dual_nrf24.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "master", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - - { name: "Marauder CYD 2432S028", flag: "MARAUDER_CYD_MICRO", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "cyd_2432S028", tft: true, tft_file: "User_Setup_cyd_micro.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "master", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - - { name: "Marauder CYD 2432S024 GUITION", flag: "MARAUDER_CYD_GUITION", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "cyd_2432S024_guition", tft: true, tft_file: "User_Setup_cyd_guition.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "master", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - - { name: "Marauder CYD 2432S028 2 USB", flag: "MARAUDER_CYD_2USB", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "cyd_2432S028_2usb", tft: true, tft_file: "User_Setup_cyd_2usb.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "master", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - - { name: "Marauder CYD 3.5inch", flag: "MARAUDER_CYD_3_5_INCH", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "cyd_3_5_inch", tft: true, tft_file: "User_Setup_cyd_3_5_inch.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "master", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } + - { name: "Marauder v7", flag: "MARAUDER_V7", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "marauder_v7", tft: true, tft_file: "User_Setup_dual_nrf24.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } + - { name: "Marauder CYD 2432S028", flag: "MARAUDER_CYD_MICRO", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "cyd_2432S028", tft: true, tft_file: "User_Setup_cyd_micro.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } + - { name: "Marauder CYD 2432S024 GUITION", flag: "MARAUDER_CYD_GUITION", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "cyd_2432S024_guition", tft: true, tft_file: "User_Setup_cyd_guition.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } + - { name: "Marauder CYD 2432S028 2 USB", flag: "MARAUDER_CYD_2USB", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "cyd_2432S028_2usb", tft: true, tft_file: "User_Setup_cyd_2usb.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } + - { name: "Marauder CYD 3.5inch", flag: "MARAUDER_CYD_3_5_INCH", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "cyd_3_5_inch", tft: true, tft_file: "User_Setup_cyd_3_5_inch.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - { name: "M5Cardputer", flag: "MARAUDER_CARDPUTER", fbqn: "esp32:esp32:esp32s3:PartitionScheme=min_spiffs,FlashSize=8M,PSRAM=disabled", file_name: "m5cardputer", tft: true, tft_file: "User_Setup_marauder_m5cardputer.h", build_dir: "esp32s3", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - { name: "ESP32-C5-DevKitC-1", flag: "MARAUDER_C5", fbqn: "esp32:esp32:esp32c5:FlashSize=8M,PartitionScheme=min_spiffs,PSRAM=enabled", file_name: "esp32c5devkitc1", tft: false, tft_file: "", build_dir: "esp32c5", addr: "0x2000", idf_ver: "3.3.4", nimble_ver: "master", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } diff --git a/.github/workflows/nightly_build.yml b/.github/workflows/nightly_build.yml index cec0e9b..42d71fa 100644 --- a/.github/workflows/nightly_build.yml +++ b/.github/workflows/nightly_build.yml @@ -68,21 +68,21 @@ jobs: board: - { name: "Flipper Zero WiFi Dev Board", flag: "MARAUDER_FLIPPER", fbqn: "esp32:esp32:esp32s2:PartitionScheme=min_spiffs,FlashSize=4M,PSRAM=enabled", file_name: "flipper", tft: false, tft_file: "", build_dir: "esp32s2", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - { name: "Flipper Zero Multi Board S3", flag: "MARAUDER_MULTIBOARD_S3", fbqn: "esp32:esp32:esp32s3:PartitionScheme=min_spiffs,FlashSize=4M", file_name: "multiboardS3", tft: false, tft_file: "", build_dir: "esp32s3", addr: "0x0", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - - { name: "OG Marauder", flag: "MARAUDER_V4", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "old_hardware", tft: true, tft_file: "User_Setup_og_marauder.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "master", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } + - { name: "OG Marauder", flag: "MARAUDER_V4", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "old_hardware", tft: true, tft_file: "User_Setup_og_marauder.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - { name: "Marauder v6", flag: "MARAUDER_V6", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "v6", tft: true, tft_file: "User_Setup_og_marauder.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "master", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - { name: "Marauder v6.1", flag: "MARAUDER_V6_1", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "v6_1", tft: true, tft_file: "User_Setup_og_marauder.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "master", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - - { name: "Marauder Kit", flag: "MARAUDER_KIT", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "kit", tft: true, tft_file: "User_Setup_og_marauder.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "master", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - - { name: "Marauder Mini", flag: "MARAUDER_MINI", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "mini", tft: true, tft_file: "User_Setup_marauder_mini.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "master", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - - { name: "ESP32 LDDB", flag: "ESP32_LDDB", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "esp32_lddb", tft: false, tft_file: "", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "master", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - - { name: "Marauder Dev Board Pro", flag: "MARAUDER_DEV_BOARD_PRO", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "marauder_dev_board_pro", tft: false, tft_file: "", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "master", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } + - { name: "Marauder Kit", flag: "MARAUDER_KIT", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "kit", tft: true, tft_file: "User_Setup_og_marauder.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } + - { name: "Marauder Mini", flag: "MARAUDER_MINI", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "mini", tft: true, tft_file: "User_Setup_marauder_mini.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } + - { name: "ESP32 LDDB", flag: "ESP32_LDDB", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "esp32_lddb", tft: false, tft_file: "", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } + - { name: "Marauder Dev Board Pro", flag: "MARAUDER_DEV_BOARD_PRO", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "marauder_dev_board_pro", tft: false, tft_file: "", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - { name: "M5StickCPlus", flag: "MARAUDER_M5STICKC", fbqn: "esp32:esp32:m5stick-c:PartitionScheme=min_spiffs", file_name: "m5stickc_plus", tft: true, tft_file: "User_Setup_marauder_m5stickc.h", build_dir: "m5stick-c", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - { name: "M5StickCPlus 2", flag: "MARAUDER_M5STICKCP2", fbqn: "esp32:esp32:m5stick-c:PartitionScheme=min_spiffs", file_name: "m5stickc_plus2", tft: true, tft_file: "User_Setup_marauder_m5stickcp2.h", build_dir: "m5stick-c", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - { name: "Rev Feather", flag: "MARAUDER_REV_FEATHER", fbqn: "esp32:esp32:esp32s2:PartitionScheme=min_spiffs,FlashSize=4M,PSRAM=enabled", file_name: "rev_feather", tft: true, tft_file: "User_Setup_marauder_rev_feather.h", build_dir: "esp32s2", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - - { name: "Marauder v7", flag: "MARAUDER_V7", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "marauder_v7", tft: true, tft_file: "User_Setup_dual_nrf24.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "master", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - - { name: "Marauder CYD 2432S028", flag: "MARAUDER_CYD_MICRO", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "cyd_2432S028", tft: true, tft_file: "User_Setup_cyd_micro.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "master", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - - { name: "Marauder CYD 2432S024 GUITION", flag: "MARAUDER_CYD_GUITION", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "cyd_2432S024_guition", tft: true, tft_file: "User_Setup_cyd_guition.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "master", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - - { name: "Marauder CYD 2432S028 2 USB", flag: "MARAUDER_CYD_2USB", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "cyd_2432S028_2usb", tft: true, tft_file: "User_Setup_cyd_2usb.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "master", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - - { name: "Marauder CYD 3.5inch", flag: "MARAUDER_CYD_3_5_INCH", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "cyd_3_5_inch", tft: true, tft_file: "User_Setup_cyd_3_5_inch.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "master", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } + - { name: "Marauder v7", flag: "MARAUDER_V7", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "marauder_v7", tft: true, tft_file: "User_Setup_dual_nrf24.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } + - { name: "Marauder CYD 2432S028", flag: "MARAUDER_CYD_MICRO", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "cyd_2432S028", tft: true, tft_file: "User_Setup_cyd_micro.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } + - { name: "Marauder CYD 2432S024 GUITION", flag: "MARAUDER_CYD_GUITION", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "cyd_2432S024_guition", tft: true, tft_file: "User_Setup_cyd_guition.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } + - { name: "Marauder CYD 2432S028 2 USB", flag: "MARAUDER_CYD_2USB", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "cyd_2432S028_2usb", tft: true, tft_file: "User_Setup_cyd_2usb.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } + - { name: "Marauder CYD 3.5inch", flag: "MARAUDER_CYD_3_5_INCH", fbqn: "esp32:esp32:d32:PartitionScheme=min_spiffs", file_name: "cyd_3_5_inch", tft: true, tft_file: "User_Setup_cyd_3_5_inch.h", build_dir: "d32", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - { name: "M5Cardputer", flag: "MARAUDER_CARDPUTER", fbqn: "esp32:esp32:esp32s3:PartitionScheme=min_spiffs,FlashSize=8M,PSRAM=disabled", file_name: "m5cardputer", tft: true, tft_file: "User_Setup_marauder_m5cardputer.h", build_dir: "esp32s3", addr: "0x1000", idf_ver: "2.0.11", nimble_ver: "1.3.8", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } - { name: "ESP32-C5-DevKitC-1", flag: "MARAUDER_C5", fbqn: "esp32:esp32:esp32c5:FlashSize=8M,PartitionScheme=min_spiffs,PSRAM=enabled", file_name: "esp32c5devkitc1", tft: false, tft_file: "", build_dir: "esp32c5", addr: "0x2000", idf_ver: "3.3.4", nimble_ver: "master", esp_async: "bigbrodude6119/ESPAsyncWebServer", esp_async_ver: "master" } diff --git a/esp32_marauder/WiFiScan.cpp b/esp32_marauder/WiFiScan.cpp index ad5cba0..7a02d6d 100644 --- a/esp32_marauder/WiFiScan.cpp +++ b/esp32_marauder/WiFiScan.cpp @@ -1772,7 +1772,7 @@ void WiFiScan::RunSetup() { Serial.println("Setting up wifi..."); esp_wifi_init(&cfg); - #ifdef HAS_DUAL_BAND + #ifdef HAS_IDF_3 esp_wifi_set_country(&country); esp_event_loop_create_default(); #endif @@ -2282,7 +2282,7 @@ void WiFiScan::startWiFiAttacks(uint8_t scan_mode, uint16_t color, String title_ packets_sent = 0; esp_wifi_init(&cfg); - #ifdef HAS_DUAL_BAND + #ifdef HAS_IDF_3 esp_wifi_set_country(&country); #endif esp_wifi_set_storage(WIFI_STORAGE_RAM); @@ -2564,7 +2564,7 @@ void WiFiScan::StopScan(uint8_t scan_mode) void WiFiScan::getMAC(bool get_sta, uint8_t* mac) { char *buf; esp_wifi_init(&cfg2); - #ifdef HAS_DUAL_BAND + #ifdef HAS_IDF_3 esp_wifi_set_country(&country); #endif esp_wifi_set_storage(WIFI_STORAGE_RAM); @@ -3544,7 +3544,7 @@ void WiFiScan::RunEvilPortal(uint8_t scan_mode, uint16_t color) display_obj.setupScrollArea(display_obj.TOP_FIXED_AREA_2, BOT_FIXED_AREA); #endif - #ifdef HAS_DUAL_BAND + #ifdef HAS_IDF_3 esp_wifi_init(&cfg); //esp_wifi_set_country(&country); #endif @@ -3612,7 +3612,7 @@ void WiFiScan::RunAPScan(uint8_t scan_mode, uint16_t color) esp_event_loop_create_default(); esp_wifi_init(&cfg2); - #ifdef HAS_DUAL_BAND + #ifdef HAS_IDF_3 esp_wifi_set_country(&country); esp_event_loop_create_default(); #endif @@ -4316,7 +4316,7 @@ void WiFiScan::RunPacketMonitor(uint8_t scan_mode, uint16_t color) Serial.println(F("Running packet scan...")); esp_wifi_init(&cfg2); - #ifdef HAS_DUAL_BAND + #ifdef HAS_IDF_3 esp_wifi_set_country(&country); esp_event_loop_create_default(); #endif @@ -4399,7 +4399,7 @@ void WiFiScan::RunEapolScan(uint8_t scan_mode, uint16_t color) #endif esp_wifi_init(&cfg); - #ifdef HAS_DUAL_BAND + #ifdef HAS_IDF_3 esp_wifi_set_country(&country); esp_event_loop_create_default(); #endif @@ -4469,7 +4469,7 @@ void WiFiScan::RunMimicFlood(uint8_t scan_mode, uint16_t color) { packets_sent = 0; esp_wifi_init(&cfg); - #ifdef HAS_DUAL_BAND + #ifdef HAS_IDF_3 esp_wifi_set_country(&country); esp_event_loop_create_default(); #endif @@ -4521,7 +4521,7 @@ void WiFiScan::RunPineScan(uint8_t scan_mode, uint16_t color) #endif esp_wifi_init(&cfg2); - #ifdef HAS_DUAL_BAND + #ifdef HAS_IDF_3 esp_wifi_set_country(&country); esp_event_loop_create_default(); #endif @@ -4575,7 +4575,7 @@ void WiFiScan::RunMultiSSIDScan(uint8_t scan_mode, uint16_t color) #endif esp_wifi_init(&cfg2); - #ifdef HAS_DUAL_BAND + #ifdef HAS_IDF_3 esp_wifi_set_country(&country); esp_event_loop_create_default(); #endif @@ -4626,7 +4626,7 @@ void WiFiScan::RunPwnScan(uint8_t scan_mode, uint16_t color) #endif esp_wifi_init(&cfg2); - #ifdef HAS_DUAL_BAND + #ifdef HAS_IDF_3 esp_wifi_set_country(&country); esp_event_loop_create_default(); #endif @@ -4994,7 +4994,7 @@ void WiFiScan::RunBeaconScan(uint8_t scan_mode, uint16_t color) if (scan_mode != WIFI_SCAN_WAR_DRIVE) { esp_wifi_init(&cfg2); - #ifdef HAS_DUAL_BAND + #ifdef HAS_IDF_3 esp_wifi_set_country(&country); esp_event_loop_create_default(); #endif @@ -5069,7 +5069,7 @@ void WiFiScan::RunStationScan(uint8_t scan_mode, uint16_t color) } else { Serial.println(F("Wi-Fi init succeeded with custom config.")); } - #ifdef HAS_DUAL_BAND + #ifdef HAS_IDF_3 esp_wifi_set_country(&country); esp_event_loop_create_default(); #endif @@ -5141,7 +5141,7 @@ void WiFiScan::RunRawScan(uint8_t scan_mode, uint16_t color) #endif esp_wifi_init(&cfg2); - #ifdef HAS_DUAL_BAND + #ifdef HAS_IDF_3 esp_wifi_set_country(&country); esp_event_loop_create_default(); #endif @@ -5192,7 +5192,7 @@ void WiFiScan::RunDeauthScan(uint8_t scan_mode, uint16_t color) #endif esp_wifi_init(&cfg2); - #ifdef HAS_DUAL_BAND + #ifdef HAS_IDF_3 esp_wifi_set_country(&country); esp_event_loop_create_default(); #endif @@ -5252,7 +5252,7 @@ void WiFiScan::RunSAEScan(uint8_t scan_mode, uint16_t color) { esp_wifi_init(&cfg2); else esp_wifi_init(&cfg); - #ifdef HAS_DUAL_BAND + #ifdef HAS_IDF_3 esp_wifi_set_country(&country); esp_event_loop_create_default(); #endif @@ -5335,7 +5335,7 @@ void WiFiScan::RunProbeScan(uint8_t scan_mode, uint16_t color) #endif esp_wifi_init(&cfg2); - #ifdef HAS_DUAL_BAND + #ifdef HAS_IDF_3 esp_wifi_set_country(&country); esp_event_loop_create_default(); #endif @@ -10793,7 +10793,7 @@ bool WiFiScan::checkHostPort(IPAddress ip, uint16_t port, uint16_t timeout) { return false; } -#ifndef HAS_DUAL_BAND +#ifndef HAS_IDF_3 bool WiFiScan::readARP(IPAddress targ_ip) { // Convert IPAddress to ip4_addr_t using IP4_ADDR ip4_addr_t test_ip; @@ -10817,7 +10817,7 @@ bool WiFiScan::checkHostPort(IPAddress ip, uint16_t port, uint16_t timeout) { bool WiFiScan::singleARP(IPAddress ip_addr) { - #ifndef HAS_DUAL_BAND + #ifndef HAS_IDF_3 void* netif = NULL; tcpip_adapter_get_netif(TCPIP_ADAPTER_IF_STA, &netif); struct netif* netif_interface = (struct netif*)netif; @@ -10849,7 +10849,7 @@ bool WiFiScan::checkHostPort(IPAddress ip, uint16_t port, uint16_t timeout) { String display_string = ""; String output_line = ""; - #ifndef HAS_DUAL_BAND + #ifndef HAS_IDF_3 void* netif = NULL; tcpip_adapter_get_netif(TCPIP_ADAPTER_IF_STA, &netif); struct netif* netif_interface = (struct netif*)netif; @@ -10994,7 +10994,7 @@ void WiFiScan::pingScan(uint8_t scan_mode) { if (this->current_scan_ip != IPAddress(0, 0, 0, 0)) { this->current_scan_ip = getNextIP(this->current_scan_ip, this->subnet); - #ifndef HAS_DUAL_BAND + #ifndef HAS_IDF_3 if (this->singleARP(this->current_scan_ip)) { #else if (this->isHostAlive(this->current_scan_ip)) { @@ -11221,7 +11221,7 @@ void WiFiScan::main(uint32_t currentTime) this->pingScan(); } else if (currentScanMode == WIFI_ARP_SCAN) { - #ifndef HAS_DUAL_BAND + #ifndef HAS_IDF_3 this->fullARP(); #endif } diff --git a/esp32_marauder/WiFiScan.h b/esp32_marauder/WiFiScan.h index 60642d3..936e92a 100644 --- a/esp32_marauder/WiFiScan.h +++ b/esp32_marauder/WiFiScan.h @@ -14,7 +14,7 @@ #include // 1.3.8, 2.3.2 #endif -#ifdef HAS_DUAL_BAND +#ifdef HAS_IDF_3 extern "C" { #include "esp_netif.h" #include "esp_netif_net_stack.h" @@ -32,11 +32,11 @@ #include "mbedtls/bignum.h" #include "mbedtls/ctr_drbg.h" #include "mbedtls/ecp.h" -#ifndef HAS_DUAL_BAND +#ifndef HAS_IDF_3 #include #include #endif -#ifdef HAS_DUAL_BAND +#ifdef HAS_IDF_3 #include "esp_system.h" #include "esp_mac.h" #endif @@ -223,10 +223,6 @@ extern Settings settings_obj; esp_err_t esp_wifi_80211_tx(wifi_interface_t ifx, const void *buffer, int len, bool en_sys_seq); -//#ifdef HAS_DUAL_BAND -// esp_err_t esp_base_mac_addr_set(uint8_t *Mac); -//#endif - #define EMPTY_ENTRY 0 #define VALID_ENTRY 1 #define TOMBSTONE_ENTRY 2 @@ -746,7 +742,7 @@ class WiFiScan wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT(); - #ifndef HAS_DUAL_BAND + #ifndef HAS_IDF_3 wifi_init_config_t cfg2 = { \ .event_handler = &esp_event_send_internal, \ .osi_funcs = &g_wifi_osi_funcs, \ diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index 8749eb0..1b103e0 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -6,7 +6,7 @@ #define POLISH_POTATO - //#define DEVELOPER + #define DEVELOPER //// BOARD TARGETS //#define MARAUDER_M5STICKC @@ -14,7 +14,7 @@ //#define MARAUDER_MINI //#define MARAUDER_V4 //#define MARAUDER_V6 - //#define MARAUDER_V6_1 + #define MARAUDER_V6_1 //#define MARAUDER_V7 //#define MARAUDER_V7_1 //#define MARAUDER_KIT @@ -140,7 +140,9 @@ #define USE_SD #define HAS_TEMP_SENSOR #define HAS_GPS - #define HAS_NIMBLE_2 + //#define HAS_NIMBLE_2 + //#define HAS_IDF_3 + //#define HAS_C5_SD #endif #ifdef MARAUDER_V7 @@ -158,7 +160,7 @@ #define USE_SD #define HAS_TEMP_SENSOR #define HAS_GPS - #define HAS_NIMBLE_2 + //#define HAS_NIMBLE_2 #endif #ifdef MARAUDER_V7_1 @@ -177,7 +179,7 @@ #define HAS_TEMP_SENSOR #define HAS_GPS #define HAS_PSRAM - #define HAS_NIMBLE_2 + //#define HAS_NIMBLE_2 #endif #ifdef MARAUDER_REV_FEATHER @@ -210,7 +212,7 @@ #define USE_SD #define HAS_TEMP_SENSOR #define HAS_GPS - #define HAS_NIMBLE_2 + //#define HAS_NIMBLE_2 #endif #if defined(MARAUDER_V6) || defined(MARAUDER_V6_1) @@ -229,6 +231,8 @@ #define HAS_TEMP_SENSOR #define HAS_GPS #define HAS_NIMBLE_2 + #define HAS_IDF_3 + #define HAS_C5_SD #endif #ifdef MARAUDER_CYD_MICRO @@ -248,7 +252,7 @@ #define HAS_TEMP_SENSOR #define HAS_GPS #define HAS_CYD_TOUCH - #define HAS_NIMBLE_2 + //#define HAS_NIMBLE_2 #endif #ifdef MARAUDER_CYD_2USB @@ -269,7 +273,7 @@ #define HAS_GPS #define HAS_CYD_TOUCH #define HAS_CYD_PORTRAIT - #define HAS_NIMBLE_2 + //#define HAS_NIMBLE_2 #endif #ifdef MARAUDER_CYD_3_5_INCH @@ -291,7 +295,7 @@ //#define HAS_CYD_TOUCH #define HAS_SEPARATE_SD #define HAS_CYD_PORTRAIT - #define HAS_NIMBLE_2 + //#define HAS_NIMBLE_2 #endif #ifdef MARAUDER_CYD_GUITION @@ -311,7 +315,7 @@ #define HAS_TEMP_SENSOR #define HAS_GPS //#define HAS_CYD_TOUCH - #define HAS_NIMBLE_2 + //#define HAS_NIMBLE_2 #endif #ifdef MARAUDER_KIT @@ -328,7 +332,7 @@ #define USE_SD #define HAS_TEMP_SENSOR #define HAS_GPS - #define HAS_NIMBLE_2 + //#define HAS_NIMBLE_2 #endif #ifdef GENERIC_ESP32 @@ -342,7 +346,7 @@ //#define HAS_SD //#define HAS_TEMP_SENSOR //#define HAS_GPS - #define HAS_NIMBLE_2 + //#define HAS_NIMBLE_2 #endif #ifdef MARAUDER_FLIPPER @@ -389,7 +393,7 @@ #define USE_SD //#define HAS_TEMP_SENSOR //#define HAS_GPS - #define HAS_NIMBLE_2 + //#define HAS_NIMBLE_2 #endif #ifdef MARAUDER_DEV_BOARD_PRO @@ -404,7 +408,7 @@ #define USE_SD //#define HAS_TEMP_SENSOR #define HAS_GPS - #define HAS_NIMBLE_2 + //#define HAS_NIMBLE_2 #endif #ifdef XIAO_ESP32_S3 @@ -437,6 +441,7 @@ //#define HAS_PSRAM //#define HAS_TEMP_SENSOR #define HAS_NIMBLE_2 + #define HAS_IDF_3 #endif #ifdef MARAUDER_V8 @@ -458,6 +463,7 @@ #define HAS_PSRAM //#define HAS_TEMP_SENSOR #define HAS_NIMBLE_2 + #define HAS_IDF_3 #endif //// END BOARD FEATURES @@ -2555,6 +2561,18 @@ #define SD_MOSI TFT_MOSI #define SD_SCK TFT_SCLK #endif + + #ifdef MARAUDER_V6 + #define SD_MISO TFT_MISO + #define SD_MOSI TFT_MOSI + #define SD_SCK TFT_SCLK + #endif + + #ifdef MARAUDER_V6_1 + #define SD_MISO TFT_MISO + #define SD_MOSI TFT_MOSI + #define SD_SCK TFT_SCLK + #endif #endif //// END STUPID CYD STUFF diff --git a/esp32_marauder/esp32_marauder.ino b/esp32_marauder/esp32_marauder.ino index 94d3030..0fcdc12 100644 --- a/esp32_marauder/esp32_marauder.ino +++ b/esp32_marauder/esp32_marauder.ino @@ -160,10 +160,15 @@ void setup() esp_log_level_set("*", ESP_LOG_NONE); #endif - #ifndef HAS_DUAL_BAND + #ifndef HAS_IDF_3 esp_spiram_init(); #endif + Serial.begin(115200); + + while(!Serial) + delay(10); + #ifdef HAS_C5_SD Serial.println("Starting shared SPI for C5 SD configuration..."); sharedSPI.begin(SD_SCK, SD_MISO, SD_MOSI); @@ -204,10 +209,10 @@ void setup() delay(10); #endif - Serial.begin(115200); + //Serial.begin(115200); - while(!Serial) - delay(10); + //while(!Serial) + // delay(10); Serial.println("ESP-IDF version is: " + String(esp_get_idf_version()));