aa90c83a06
Conflicts resolved: src/Afterburner.cpp src/Bluetooth/BluetoothHC05.cpp src/OLED/433MHzScreen.cpp src/OLED/433MHzScreen.h src/Protocol/BlueWireTask.cpp src/Protocol/TxManage.cpp |
||
---|---|---|
.. | ||
Adafruit-GFX-Library | ||
Adafruit_BME280_Library | ||
Adafruit_Sensor | ||
Adafruit_SSD1306 | ||
ArduinoJson | ||
async-mqtt-client | ||
asyncHTTPrequest | ||
AsyncTCP | ||
esp32-ds18b20 | ||
esp32-sh1106-oled | ||
esp32_https_server-master | ||
esp32FOTA | ||
RTClib | ||
TelnetSpy | ||
WiFiManager-dev |