Merge pull request #297 from tracedgod/tracedgod

Fix Actions not building on branch 'tracedgod'
This commit is contained in:
Just Call Me Koko
2023-07-13 18:32:15 -04:00
committed by GitHub
3 changed files with 14 additions and 13 deletions
+1
View File
@@ -1,4 +1,5 @@
.vscode/arduino.json
.vscode/c_cpp_properties.json
.vscode/settings.json
esp32_marauder/.vscode/settings.json
+8 -8
View File
@@ -1,24 +1,24 @@
[submodule "esp32_marauder/libraries/lv_arduino"]
path = esp32_marauder/libraries/lv_arduino
url = git@github.com:lvgl/lv_arduino.git
url = https://github.com/lvgl/lv_arduino.git
[submodule "esp32_marauder/libraries/LinkedList"]
path = esp32_marauder/libraries/LinkedList
url = git@github.com:ivanseidel/LinkedList.git
url = https://github.com/ivanseidel/LinkedList.git
[submodule "esp32_marauder/libraries/TFT_eSPI"]
path = esp32_marauder/libraries/TFT_eSPI
url = git@github.com:justcallmekoko/TFT_eSPI.git
url = https://github.com/justcallmekoko/TFT_eSPI.git
[submodule "esp32_marauder/libraries/JPEGDecoder"]
path = esp32_marauder/libraries/JPEGDecoder
url = git@github.com:Bodmer/JPEGDecoder.git
url = https://github.com/Bodmer/JPEGDecoder.git
[submodule "esp32_marauder/libraries/NimBLE-Arduino"]
path = esp32_marauder/libraries/NimBLE-Arduino
url = git@github.com:h2zero/NimBLE-Arduino.git
url = https://github.com/h2zero/NimBLE-Arduino.git
[submodule "esp32_marauder/libraries/Adafruit_NeoPixel"]
path = esp32_marauder/libraries/Adafruit_NeoPixel
url = git@github.com:adafruit/Adafruit_NeoPixel.git
url = https://github.com/adafruit/Adafruit_NeoPixel.git
[submodule "esp32_marauder/libraries/ArduinoJson"]
path = esp32_marauder/libraries/ArduinoJson
url = git@github.com:bblanchon/ArduinoJson.git
url = https://github.com/bblanchon/ArduinoJson.git
[submodule "esp32_marauder/libraries/SwitchLib"]
path = esp32_marauder/libraries/SwitchLib
url = git@github.com:justcallmekoko/SwitchLib.git
url = https://github.com/justcallmekoko/SwitchLib.git
+5 -5
View File
@@ -28,7 +28,7 @@
//#define FLIPPER_ZERO_HAT
#define HAS_BATTERY
#define HAS_BUTTONS
//#define HAS_NEOPIXEL_LED
#define HAS_NEOPIXEL_LED
#define HAS_PWR_MGMT
#define HAS_SCREEN
#define HAS_SD
@@ -41,7 +41,7 @@
#define HAS_BATTERY
#define HAS_BT
#define HAS_BUTTONS
//#define HAS_NEOPIXEL_LED
#define HAS_NEOPIXEL_LED
//#define HAS_PWR_MGMT
#define HAS_SCREEN
#define HAS_SD
@@ -54,7 +54,7 @@
#define HAS_BATTERY
#define HAS_BT
//#define HAS_BUTTONS
//#define HAS_NEOPIXEL_LED
#define HAS_NEOPIXEL_LED
//#define HAS_PWR_MGMT
#define HAS_SCREEN
#define HAS_SD
@@ -67,7 +67,7 @@
#define HAS_BATTERY
#define HAS_BT
//#define HAS_BUTTONS
//#define HAS_NEOPIXEL_LED
#define HAS_NEOPIXEL_LED
//#define HAS_PWR_MGMT
#define HAS_SCREEN
#define HAS_SD
@@ -80,7 +80,7 @@
#define HAS_BATTERY
#define HAS_BT
//#define HAS_BUTTONS
//#define HAS_NEOPIXEL_LED
#define HAS_NEOPIXEL_LED
//#define HAS_PWR_MGMT
#define HAS_SCREEN
#define HAS_SD