Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Update esp-nimble-cpp submodule to latest #335

Merged
merged 1 commit into from
Oct 15, 2024
Merged

chore: Update esp-nimble-cpp submodule to latest #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/ble_gatt_server/include/ble_gatt_server_callbacks.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ class BleGattServerCallbacks : public NimBLEServerCallbacks {
public:
virtual void onConnect(NimBLEServer *server, NimBLEConnInfo &conn_info) override;
virtual void onDisconnect(NimBLEServer *server, NimBLEConnInfo &conn_info, int reason) override;
virtual void onAuthenticationComplete(const NimBLEConnInfo &conn_info) override;
virtual void onAuthenticationComplete(NimBLEConnInfo &conn_info) override;
virtual uint32_t onPassKeyDisplay() override;
virtual void onConfirmPIN(const NimBLEConnInfo &conn_info, uint32_t pass_key) override;
virtual void onConfirmPIN(NimBLEConnInfo &conn_info, uint32_t pass_key) override;

protected:
friend class BleGattServer;
Expand Down
12 changes: 6 additions & 6 deletions components/ble_gatt_server/include/device_info_service.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ class DeviceInfoService : public BaseComponent {
logger_.error("Characteristic not created");
return;
}
manufacturer_name_->setValue(reinterpret_cast<const uint8_t *>(name.data()), name.size());
manufacturer_name_->setValue(name);
}

/// Set the model number
Expand All @@ -177,7 +177,7 @@ class DeviceInfoService : public BaseComponent {
logger_.error("Characteristic not created");
return;
}
model_number_->setValue(reinterpret_cast<const uint8_t *>(number.data()), number.size());
model_number_->setValue(number);
}

/// Set the serial number
Expand All @@ -187,7 +187,7 @@ class DeviceInfoService : public BaseComponent {
logger_.error("Characteristic not created");
return;
}
serial_number_->setValue(reinterpret_cast<const uint8_t *>(number.data()), number.size());
serial_number_->setValue(number);
}

/// Set the software version
Expand All @@ -197,7 +197,7 @@ class DeviceInfoService : public BaseComponent {
logger_.error("Characteristic not created");
return;
}
software_version_->setValue(reinterpret_cast<const uint8_t *>(version.data()), version.size());
software_version_->setValue(version);
}

/// Set the firmware version
Expand All @@ -207,7 +207,7 @@ class DeviceInfoService : public BaseComponent {
logger_.error("Characteristic not created");
return;
}
firmware_version_->setValue(reinterpret_cast<const uint8_t *>(version.data()), version.size());
firmware_version_->setValue(version);
}

/// Set the hardware version
Expand All @@ -217,7 +217,7 @@ class DeviceInfoService : public BaseComponent {
logger_.error("Characteristic not created");
return;
}
hardware_version_->setValue(reinterpret_cast<const uint8_t *>(version.data()), version.size());
hardware_version_->setValue(version);
}

protected:
Expand Down
4 changes: 2 additions & 2 deletions components/ble_gatt_server/src/ble_gatt_server_callbacks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ void BleGattServerCallbacks::onDisconnect(NimBLEServer *server, NimBLEConnInfo &
}
}

void BleGattServerCallbacks::onAuthenticationComplete(const NimBLEConnInfo &conn_info) {
void BleGattServerCallbacks::onAuthenticationComplete(NimBLEConnInfo &conn_info) {
if (server_ && server_->callbacks_.authentication_complete_callback) {
server_->callbacks_.authentication_complete_callback(conn_info);
}
Expand All @@ -64,7 +64,7 @@ uint32_t BleGattServerCallbacks::onPassKeyDisplay() {
return NimBLEDevice::getSecurityPasskey();
}
}
void BleGattServerCallbacks::onConfirmPIN(const NimBLEConnInfo &conn_info, uint32_t pass_key) {
void BleGattServerCallbacks::onConfirmPIN(NimBLEConnInfo &conn_info, uint32_t pass_key) {
if (server_ && server_->callbacks_.confirm_passkey_callback) {
server_->callbacks_.confirm_passkey_callback(conn_info, pass_key);
} else {
Expand Down
2 changes: 1 addition & 1 deletion components/esp-nimble-cpp
Open in desktop
Submodule esp-nimble-cpp updated 39 files
+10 −2 CMakeLists.txt
+3 −3 docs/Migration_guide.md
+4 −4 examples/Advanced/NimBLE_Client/main/main.cpp
+3 −3 examples/Advanced/NimBLE_Server/main/main.cpp
+1 −1 examples/NimBLE_server_get_client_name/main/main.cpp
+3 −3 examples/basic/BLE_client/main/main.cpp
+2 −2 examples/basic/BLE_notify/main/main.cpp
+2 −2 examples/basic/BLE_uart/main/main.cpp
+1 −1 src/NimBLEAdvertisedDevice.cpp
+30 −40 src/NimBLEAttValue.h
+50 −0 src/NimBLEAttribute.h
+147 −340 src/NimBLECharacteristic.cpp
+99 −155 src/NimBLECharacteristic.h
+16 −14 src/NimBLEClient.cpp
+20 −21 src/NimBLEClient.h
+30 −22 src/NimBLEConnInfo.h
+41 −205 src/NimBLEDescriptor.cpp
+30 −72 src/NimBLEDescriptor.h
+4 −1 src/NimBLEDevice.cpp
+8 −1 src/NimBLEDevice.h
+2 −2 src/NimBLEExtAdvertising.cpp
+3 −3 src/NimBLEHIDDevice.cpp
+1 −1 src/NimBLEHIDDevice.h
+48 −0 src/NimBLELocalAttribute.h
+156 −0 src/NimBLELocalValueAttribute.h
+177 −579 src/NimBLERemoteCharacteristic.cpp
+46 −148 src/NimBLERemoteCharacteristic.h
+11 −290 src/NimBLERemoteDescriptor.cpp
+17 −76 src/NimBLERemoteDescriptor.h
+108 −224 src/NimBLERemoteService.cpp
+37 −57 src/NimBLERemoteService.h
+212 −0 src/NimBLERemoteValueAttribute.cpp
+142 −0 src/NimBLERemoteValueAttribute.h
+92 −25 src/NimBLEServer.cpp
+13 −12 src/NimBLEServer.h
+139 −213 src/NimBLEService.cpp
+36 −53 src/NimBLEService.h
+7 −1 src/NimBLEUUID.cpp
+1 −0 src/NimBLEUUID.h
2 changes: 1 addition & 1 deletion components/hid_service/example/main/hid_service_example.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ extern "C" void app_main(void) {
auto input_report = hid_service.input_report(input_report_id);

// use the HID service to make an output report characteristic
auto output_report = hid_service.output_report(output_report_id);
[[maybe_unused]] auto output_report = hid_service.output_report(output_report_id);

// now that we've made the input characteristic, we can start the service
hid_service.start();
Expand Down
3 changes: 1 addition & 2 deletions components/hid_service/include/hid_service.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@ class HidService : public espp::BaseComponent {
/// @param report_map The report map as a string view.
void set_report_map(std::string_view report_map) {
if (report_map_) {
report_map_->setValue(reinterpret_cast<const uint8_t *>(report_map.data()),
report_map.size());
report_map_->setValue(report_map);
} else {
logger_.error("Report map characteristic not created");
}
Expand Down