From 178f482d0607db0d62eb90c1520e23850ea155b6 Mon Sep 17 00:00:00 2001 From: Chuck Stearns Date: Sun, 6 Oct 2024 15:04:06 -0500 Subject: [PATCH] syntax errors related to String() when compiling with Arduino IDE 2.3.3 --- BleKeyboard.cpp | 8 ++++---- BleKeyboard.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/BleKeyboard.cpp b/BleKeyboard.cpp index 48a8930..dc923a4 100644 --- a/BleKeyboard.cpp +++ b/BleKeyboard.cpp @@ -95,10 +95,10 @@ static const uint8_t _hidReportDescriptor[] = { END_COLLECTION(0) // END_COLLECTION }; -BleKeyboard::BleKeyboard(std::string deviceName, std::string deviceManufacturer, uint8_t batteryLevel) +BleKeyboard::BleKeyboard(String deviceName, String deviceManufacturer, uint8_t batteryLevel) : hid(0) - , deviceName(std::string(deviceName).substr(0, 15)) - , deviceManufacturer(std::string(deviceManufacturer).substr(0,15)) + , deviceName(String(deviceName).substring(0, 15)) + , deviceManufacturer(String(deviceManufacturer).substring(0,15)) , batteryLevel(batteryLevel) {} void BleKeyboard::begin(void) @@ -161,7 +161,7 @@ void BleKeyboard::setBatteryLevel(uint8_t level) { } //must be called before begin in order to set the name -void BleKeyboard::setName(std::string deviceName) { +void BleKeyboard::setName(String deviceName) { this->deviceName = deviceName; } diff --git a/BleKeyboard.h b/BleKeyboard.h index 0736a02..1d1ce07 100644 --- a/BleKeyboard.h +++ b/BleKeyboard.h @@ -138,8 +138,8 @@ class BleKeyboard : public Print, public BLEServerCallbacks, public BLECharacter BLEAdvertising* advertising; KeyReport _keyReport; MediaKeyReport _mediaKeyReport; - std::string deviceName; - std::string deviceManufacturer; + String deviceName; + String deviceManufacturer; uint8_t batteryLevel; bool connected = false; uint32_t _delay_ms = 7; @@ -150,7 +150,7 @@ class BleKeyboard : public Print, public BLEServerCallbacks, public BLECharacter uint16_t version = 0x0210; public: - BleKeyboard(std::string deviceName = "ESP32 Keyboard", std::string deviceManufacturer = "Espressif", uint8_t batteryLevel = 100); + BleKeyboard(String deviceName = "ESP32 Keyboard", String deviceManufacturer = "Espressif", uint8_t batteryLevel = 100); void begin(void); void end(void); void sendReport(KeyReport* keys); @@ -165,7 +165,7 @@ class BleKeyboard : public Print, public BLEServerCallbacks, public BLECharacter void releaseAll(void); bool isConnected(void); void setBatteryLevel(uint8_t level); - void setName(std::string deviceName); + void setName(String deviceName); void setDelay(uint32_t ms); void set_vendor_id(uint16_t vid);