Skip to content

Fix ClearGlass CGG1 and CGP1W sensors recognition #849

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 5 commits into from
Jan 29, 2021
Merged

Fix ClearGlass CGG1 and CGP1W sensors recognition #849

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4f94803
Merge pull request #1 from 1technophile/development
Nikolay-Ch Jan 22, 2021
e6aebd5
Fix ClearGlass CGG1 and CGP1W sensors recognition
Nikolay-Ch Jan 22, 2021
da37a50
CGG1 parsing refactoring
Nikolay-Ch Jan 27, 2021
96f47e0
Fix for code-rules
Nikolay-Ch Jan 27, 2021
58a8830
fix strncmp using
Nikolay-Ch Jan 27, 2021
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
18 changes: 6 additions & 12 deletions main/ZgatewayBT.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -926,14 +926,6 @@ JsonObject& process_bledata(JsonObject& BLEdata) {
createOrUpdateDevice(mac, device_flags_init, LYWSD02);
return process_sensors(2, BLEdata);
}
Log.trace(F("Is it a CGG1?" CR));
if (strstr(service_data, "304703") != NULL && strlen(service_data) > ServicedataMinLength) {
Log.trace(F("CGG1 data reading method 1" CR));
BLEdata.set("model", "CGG1");
if (device->sensorModel == -1)
createOrUpdateDevice(mac, device_flags_init, CGG1);
return process_sensors(0, BLEdata);
}
Log.trace(F("Is it a MUE4094RT?" CR));
if (strstr(service_data, "4030dd") != NULL) {
Log.trace(F("MUE4094RT data reading" CR));
Expand All @@ -943,20 +935,22 @@ JsonObject& process_bledata(JsonObject& BLEdata) {
return process_milamp(BLEdata);
}
Log.trace(F("Is it a CGP1W?" CR));
if ((strstr(service_data, "08094c") != NULL || strstr(service_data, "080972") != NULL) && strlen(service_data) > ServicedataMinLength) {
if ((strncmp(service_data, "0809", 4) == 0) && strlen(service_data) > ServicedataMinLength) {
Log.trace(F("CGP1W data reading" CR));
BLEdata.set("model", "CGP1W");
if (device->sensorModel == -1)
createOrUpdateDevice(mac, device_flags_init, CGP1W);
return process_cleargrass(BLEdata, true);
}
Log.trace(F("Is it a CGG1" CR));
if (strstr(service_data, "080774") != NULL) {
Log.trace(F("CGG1 method 2" CR));
// One type of the advertising packet format started with 50204703 or 50304703, where 4703 is a type of a sensor
// Another type of the advertising packet started with 0807 or 8816
if ((strncmp(&service_data[2], "4703", 4) == 0 && strlen(service_data) > ServicedataMinLength) || (strncmp(service_data, "0807", 4) == 0) || (strncmp(service_data, "8816", 4) == 0)) {
Log.trace(F("CGG1 data reading" CR));
BLEdata.set("model", "CGG1");
if (device->sensorModel == -1)
createOrUpdateDevice(mac, device_flags_init, CGG1);
return process_cleargrass(BLEdata, false);
return strncmp(&service_data[2], "4703", 4) == 0 ? process_sensors(0, BLEdata) : process_cleargrass(BLEdata, false);
}
Log.trace(F("Is it a CGD1?" CR));
if (((strstr(service_data, "080caf") != NULL || strstr(service_data, "080c09") != NULL) && (strlen(service_data) > ServicedataMinLength)) || (strstr(service_data, "080cd0") != NULL && (strlen(service_data) > ServicedataMinLength - 6))) {
Expand Down