diff --git a/.github/workflows/build_parallel.yml b/.github/workflows/build_parallel.yml index c0e4067..41dd158 100644 --- a/.github/workflows/build_parallel.yml +++ b/.github/workflows/build_parallel.yml @@ -143,7 +143,7 @@ jobs: uses: actions/checkout@v2 with: repository: adafruit/Adafruit_NeoPixel - ref: 1.10.7 + ref: 1.12.0 path: CustomAdafruit_NeoPixel - name: Install ArduinoJson diff --git a/.github/workflows/nightly_build.yml b/.github/workflows/nightly_build.yml index 9440a97..fa1098a 100644 --- a/.github/workflows/nightly_build.yml +++ b/.github/workflows/nightly_build.yml @@ -183,7 +183,7 @@ jobs: uses: actions/checkout@v2 with: repository: adafruit/Adafruit_NeoPixel - ref: 1.10.7 + ref: 1.12.0 path: CustomAdafruit_NeoPixel - name: Install ArduinoJson diff --git a/esp32_marauder/configs.h b/esp32_marauder/configs.h index 2f95ed5..f4f3ab4 100644 --- a/esp32_marauder/configs.h +++ b/esp32_marauder/configs.h @@ -32,7 +32,7 @@ //#define MARAUDER_V8 //// END BOARD TARGETS - #define MARAUDER_VERSION "v1.8.7" + #define MARAUDER_VERSION "v1.8.8" #define GRAPH_REFRESH 100 @@ -425,7 +425,7 @@ #define HAS_TOUCH //#define HAS_FLIPPER_LED //#define FLIPPER_ZERO_HAT - //#define HAS_BATTERY + #define HAS_BATTERY //#define HAS_BT //#define HAS_BUTTONS #define HAS_NEOPIXEL_LED @@ -2400,6 +2400,11 @@ #define I2C_SCL 25 #endif + #ifdef MARAUDER_V8 + #define I2C_SCL 4 + #define I2C_SDA 5 + #endif + #endif //// MARAUDER TITLE STUFF