Skip to content

Add support for iBeacons. #1016

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

Merged
1technophile merged 1 commit into from
Jul 12, 2021
Merged

Add support for iBeacons. #1016

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
21 changes: 21 additions & 0 deletions main/ZgatewayBT.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1363,6 +1363,14 @@ JsonObject& process_bledata(JsonObject& BLEdata) {
createOrUpdateDevice(mac, device_flags_init, WS02);
return process_ws02(BLEdata);
}
Log.trace(F("Is it an iBeacon? %u" CR), strlen(manufacturerdata));
if (strlen(manufacturerdata) == 50 && strncmp(&manufacturerdata[0], "4c00", 4) == NULL) {
Log.trace(F("iBeacon data reading" CR));
BLEdata.set("model", "IBEACON");
if (device->sensorModel == -1)
createOrUpdateDevice(mac, device_flags_init, IBEACON);
return process_ibeacon(BLEdata);
}
# if !pubBLEManufacturerData
Log.trace(F("Remove manufacturer data" CR));
BLEdata.remove("manufacturerdata");
Expand Down Expand Up @@ -1731,6 +1739,19 @@ JsonObject& process_mokobeaconXPro(JsonObject& BLEdata) {
return BLEdata;
}

JsonObject& process_ibeacon(JsonObject& BLEdata) {
const char* manufacturerdata = BLEdata["manufacturerdata"].as<const char*>();
char mfid[5] = {NULL};
char proxUUID[33] = {NULL};
strncpy(&mfid[0], manufacturerdata, 4);
strncpy(&proxUUID[0], manufacturerdata + 8, 32);
BLEdata.set("MFID:", mfid);
BLEdata.set("UUID:", proxUUID);
BLEdata.set("Major:", (uint16_t)value_from_hex_data(manufacturerdata, 40, 4, false, false));
BLEdata.set("Minor:", (uint16_t)value_from_hex_data(manufacturerdata, 44, 4, false, false));
BLEdata.set("Power:", (int8_t)value_from_hex_data(manufacturerdata, 48, 4, false));
}

void hass_presence(JsonObject& HomePresence) {
int BLErssi = HomePresence["rssi"];
Log.trace(F("BLErssi %d" CR), BLErssi);
Expand Down
1 change: 1 addition & 0 deletions main/config_BT.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ enum ble_sensor_model {
EDDYSTONE_TLM,
MOKOBEACON,
MOKOBEACONXPRO,
IBEACON,
GENERIC,
};

Expand Down