Skip to content

Commit

Permalink
Merge bluetooth branch
Browse files Browse the repository at this point in the history
  • Loading branch information
seime committed Dec 15, 2024
1 parent 0b2734c commit 6e677ce
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import com.google.protobuf.GeneratedMessageV3;
import com.google.protobuf.GeneratedMessage;

import io.esphome.api.BluetoothDeviceConnectionResponse;
import io.esphome.api.BluetoothGATTGetServicesDoneResponse;
Expand Down Expand Up @@ -143,7 +143,7 @@ protected ESPHomeBluetoothDevice createDevice(BluetoothAddress address) {
return new ESPHomeBluetoothDevice(this, address);
}

public void handleBluetoothMessage(@NonNull GeneratedMessageV3 message, ESPHomeHandler handler) {
public void handleBluetoothMessage(@NonNull GeneratedMessage message, ESPHomeHandler handler) {

// Update RSSi list

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ public ESPHomeHandlerFactory(@Reference ESPChannelTypeProvider dynamicChannelTyp
ThingTypeUID thingTypeUID = thing.getThingTypeUID();

if (BindingConstants.THING_TYPE_DEVICE.equals(thingTypeUID)) {
return new ESPHomeHandler(thing, connectionSelector, dynamicChannelTypeProvider, eventSubscriber, scheduler);
return new ESPHomeHandler(thing, connectionSelector, dynamicChannelTypeProvider, eventSubscriber,
scheduler);
} else if (BindingConstants.THING_TYPE_BLE_PROXY.equals(thingTypeUID)) {
ESPHomeBluetoothProxyHandler handler = new ESPHomeBluetoothProxyHandler((Bridge) thing, thingRegistry);
registerBluetoothAdapter(handler);
Expand Down

0 comments on commit 6e677ce

Please sign in to comment.