Skip to content

Commit

Permalink
Fixed compilation bug with ESP32-BLE-Keyboard
Browse files Browse the repository at this point in the history
Signed-off-by: simonmicro <simon@simonmicro.de>
  • Loading branch information
simonmicro committed Aug 11, 2024
1 parent ac57345 commit 4d6f9a5
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 9 deletions.
2 changes: 1 addition & 1 deletion lib/ESP32-BLE-Keyboard
20 changes: 13 additions & 7 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,14 @@
[platformio]
default_envs = LIGHT_EDITION_V3_3

# ===========================================
# A note regarding the platform/library versions here:
# Due to potential upstream bugs, we pinned all versions to the latest known working version.
# While this will prevent the use of latest features, it will also prevent randomly breaking builds...
# ===========================================

[env]
platform = espressif32@^6.5.0
platform = espressif32@6.8.1
; for USE_ULP: use a special branch and git submodule add https://github.com/boarchuz/HULP.git
; platform_packages =
; framework-arduinoespressif32 @ https://github.com/marcovannoord/arduino-esp32.git#idf-release/v4.2
Expand All @@ -22,12 +28,12 @@ framework = arduino
board_build.partitions = min_spiffs.csv ; OTA updates (two app slots), but no space for the SPIFFS (as it is currently not used)
monitor_filters = esp32_exception_decoder ; Well, it works?!
lib_deps =
adafruit/Adafruit Unified Sensor@^1.1.9
adafruit/Adafruit BusIO@^1.14.1
makuna/RTC@^2.4.0
bblanchon/ArduinoJson@^6.21.2
finitespace/BME280@^3.0.0 ; TODO Use the more popular Adafruit BME280 Library instead (also true for others?)?
mprograms/QMC5883LCompass@^1.1.1
adafruit/Adafruit Unified Sensor@1.1.14
adafruit/Adafruit BusIO@1.16.1
makuna/RTC@2.4.3
bblanchon/ArduinoJson@6.21.5
finitespace/BME280@3.0.0 ; TODO Use the more popular Adafruit BME280 Library instead (also true for others?)?
mprograms/QMC5883LCompass@1.2.3
upload_speed = 460800
monitor_speed = 115200
; Define additional build stage scripts - used to "compile" the html or define additional information
Expand Down
6 changes: 5 additions & 1 deletion src/apps/tools/OswAppBLEMediaCtrl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,16 @@
#ifdef OSW_FEATURE_BLE_MEDIA_CTRL
#include "./apps/tools/OswAppBLEMediaCtrl.h"

#include <BleKeyboard.h>
#include <config.h>
#include <gfx_util.h>
#include <OswAppV1.h>
#include <osw_hal.h>

// workaround for compile issues via https://github.com/espressif/arduino-esp32/issues/6388
#define BLE_42_FEATURE_SUPPORT TRUE
#define BLE_50_FEATURE_SUPPORT TRUE
#include <BleKeyboard.h>

BleKeyboard* bleKeyboard;

void OswAppBLEMediaCtrl::setup() {
Expand Down

0 comments on commit 4d6f9a5

Please sign in to comment.