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

broadcasters: add Typhoon BlueWeather, minor fix for ATC1441 #124

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

broadcasters: add Typhoon BlueWeather, minor fix for ATC1441 #124

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
78a39ff
broadcasters: add Typhoon BlueWeather, minor fix for ATC1441
Jul 20, 2021
e6ba534
Merge branch 'shmuelzon:master' into master
relghuar Jul 26, 2021
07b4301
Merge remote-tracking branch 'upstream/master'
Dec 8, 2021
c7bd441
Merge remote-tracking branch 'upstream/master'
Jun 21, 2022
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
79 changes: 77 additions & 2 deletions main/broadcasters.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,81 @@ static broadcaster_ops_t mijia_sensor_ops = {
.metadata_get = mijia_sensor_metadata_get,
};

/* Typhoon TB002 BlueWeather Temp+Humi sensor
*/
#define TB002_SENSOR_SERVICE_UUID 0xFE00

typedef struct {
uint16_t hCompId;
uint8_t bUnk1;
uint16_t hTemp;
uint16_t hUnk2;
uint16_t hHumi;
uint16_t hUnk3;
uint16_t hBatt;
uint16_t hUnk4;
uint16_t hUnk5;
} __attribute__((packed)) tb002_data_t;

static tb002_data_t *tb002_sensor_data_get(uint8_t *adv_data,
uint8_t adv_data_len, uint8_t *tb002_sensor_len)
{
uint8_t len;
uint8_t *data = esp_ble_resolve_adv_data(adv_data,
ESP_BLE_AD_MANUFACTURER_SPECIFIC_TYPE, &len);

if (tb002_sensor_len)
*tb002_sensor_len = len;

return (tb002_data_t *)data;
}
static int tb002_sensor_is_broadcaster(uint8_t *adv_data, size_t adv_data_len)
{
uint8_t len;

uint16_t *pSvc16 = (uint16_t*)esp_ble_resolve_adv_data(adv_data,
ESP_BLE_AD_TYPE_16SRV_PART, &len);
if (len != 2 || le16toh(*pSvc16) != TB002_SENSOR_SERVICE_UUID)
{
return 0;
}

tb002_data_t *tb002_sensor = tb002_sensor_data_get(adv_data,
adv_data_len, &len);
if (!tb002_sensor || len != sizeof(tb002_data_t))
{
return 0;
}

return 1;
}
static void tb002_sensor_metadata_get(uint8_t *adv_data, size_t adv_data_len,
int rssi, broadcaster_meta_data_cb_t cb, void *ctx)
{
uint8_t len;
tb002_data_t *tb002_sensor = tb002_sensor_data_get(adv_data,
adv_data_len, &len);

double tempC = (be16toh(tb002_sensor->hTemp)-1599.425)*0.03122;
double humi = (be16toh(tb002_sensor->hHumi)-550.0)*0.0668;
uint16_t batt = be16toh(tb002_sensor->hBatt);

char buf[16];
snprintf(buf, 16, "%.1f", tempC);
cb("Temperature", buf, ctx);
snprintf(buf, 16, "%.1f", humi);
cb("Humidity", buf, ctx);
snprintf(buf, 16, "%d", batt);
cb("Battery", buf, ctx);

}
static broadcaster_ops_t tb002_sensor_ops = {
.name = "Typhoon TB002",
.is_broadcaster = tb002_sensor_is_broadcaster,
.metadata_get = tb002_sensor_metadata_get,
};


/* Beewi Smart Door
* Note that the Beewi Smart Door sensor is also connectable. When connected, it
* provides battery information and door status history (without the current
Expand Down Expand Up @@ -694,7 +769,6 @@ static broadcaster_ops_t beewi_smart_door_ops = {
#define ATC1441_TEMP_HUM_SERVICE_UUID 0x181A

typedef struct {
uint16_t not_used;
uint16_t service_uuid;
mac_addr_t mac;
int16_t temp;
Expand Down Expand Up @@ -740,7 +814,7 @@ static void atc1441_temp_hum_metadata_get(uint8_t *adv_data,
atc1441_temp_hum_t *atc1441_data = atc1441_temp_hum_data_get(adv_data,
adv_data_len, &len);

cb("MACAddress", _mactoa(atc1441_data->mac), ctx);
cb("MACAddress", mactoa(atc1441_data->mac), ctx);

sprintf(s, "%hhu", atc1441_data->message_counter);
cb("MessageCounter", s, ctx);
Expand All @@ -766,6 +840,7 @@ static broadcaster_ops_t atc1441_temp_hum_ops = {

/* Common */
static broadcaster_ops_t *broadcaster_ops[] = {
&tb002_sensor_ops,
&ibeacon_ops,
&eddystone_ops,
&mijia_sensor_ops,
Expand Down