jeka/OTGateway
1
0
Fork 0
mirror of https://github.com/Laxilef/OTGateway.git synced 2025-12-10 18:24:27 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix: various fixes

Browse Source 
Found by PVS-Studio
This commit is contained in:
Yurii
2025-09-23 04:02:40 +03:00
parent f3ba43adbd
commit 28a5218b7c
4 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Sensors.h
View File

@@ -334,7 +334,7 @@ public:
uint8_t valueId = (uint8_t) valueType; uint8_t valueId = (uint8_t) valueType;
if (!isValidValueId(valueId)) { if (!isValidValueId(valueId)) {
return false; return 0;
} }
float value = 0.0f; float value = 0.0f;

42
src/SensorsTask.h
View File

@@ -385,7 +385,7 @@ protected:
continue; continue;
} }
const float sensorResistance = value > 0.001f const float sensorResistance = value > 1
? DEFAULT_NTC_REF_RESISTANCE / (DEFAULT_NTC_VREF / (float) value - 1.0f) ? DEFAULT_NTC_REF_RESISTANCE / (DEFAULT_NTC_VREF / (float) value - 1.0f)
: 0.0f; : 0.0f;
const float rawTemp = 1.0f / ( const float rawTemp = 1.0f / (
@@ -577,7 +577,7 @@ protected:
bool subscribeToBleDevice(const uint8_t sensorId, NimBLEClient* pClient) { bool subscribeToBleDevice(const uint8_t sensorId, NimBLEClient* pClient) {
auto& sSensor = Sensors::settings[sensorId]; auto& sSensor = Sensors::settings[sensorId];
auto pAddress = pClient->getPeerAddress().toString().c_str(); auto pAddress = pClient->getPeerAddress().toString();
NimBLERemoteService* pService = nullptr; NimBLERemoteService* pService = nullptr;
NimBLERemoteCharacteristic* pChar = nullptr; NimBLERemoteCharacteristic* pChar = nullptr;
@@ -588,13 +588,13 @@ protected:
if (!pService) { if (!pService) {
Log.straceln( Log.straceln(
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to find env service (%s) on device %s"), FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to find env service (%s) on device %s"),
sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress.c_str()
); );
} else { } else {
Log.straceln( Log.straceln(
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found env service (%s) on device %s"), FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found env service (%s) on device %s"),
sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress.c_str()
); );
// 0x2A6E - Notify temperature x0.01C (pvvx) // 0x2A6E - Notify temperature x0.01C (pvvx)
@@ -606,7 +606,7 @@ protected:
if (pChar && (pChar->canNotify() || pChar->canIndicate())) { if (pChar && (pChar->canNotify() || pChar->canIndicate())) {
Log.straceln( Log.straceln(
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found temp char (%s) in env service on device %s"), FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found temp char (%s) in env service on device %s"),
sensorId, sSensor.name, charUuid.toString().c_str(), pAddress sensorId, sSensor.name, charUuid.toString().c_str(), pAddress.c_str()
); );
pChar->unsubscribe(); pChar->unsubscribe();
@@ -661,14 +661,14 @@ protected:
Log.straceln( Log.straceln(
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to temp char (%s) in env service on device %s"), FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to temp char (%s) in env service on device %s"),
sensorId, sSensor.name, sensorId, sSensor.name,
charUuid.toString().c_str(), pAddress charUuid.toString().c_str(), pAddress.c_str()
); );
} else { } else {
Log.swarningln( Log.swarningln(
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to temp char (%s) in env service on device %s"), FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to temp char (%s) in env service on device %s"),
sensorId, sSensor.name, sensorId, sSensor.name,
charUuid.toString().c_str(), pAddress charUuid.toString().c_str(), pAddress.c_str()
); );
} }
} }
@@ -683,7 +683,7 @@ protected:
if (pChar && (pChar->canNotify() || pChar->canIndicate())) { if (pChar && (pChar->canNotify() || pChar->canIndicate())) {
Log.straceln( Log.straceln(
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found temp char (%s) in env service on device %s"), FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found temp char (%s) in env service on device %s"),
sensorId, sSensor.name, charUuid.toString().c_str(), pAddress sensorId, sSensor.name, charUuid.toString().c_str(), pAddress.c_str()
); );
pChar->unsubscribe(); pChar->unsubscribe();
@@ -738,14 +738,14 @@ protected:
Log.straceln( Log.straceln(
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to temp char (%s) in env service on device %s"), FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to temp char (%s) in env service on device %s"),
sensorId, sSensor.name, sensorId, sSensor.name,
charUuid.toString().c_str(), pAddress charUuid.toString().c_str(), pAddress.c_str()
); );
} else { } else {
Log.swarningln( Log.swarningln(
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to temp char (%s) in env service on device %s"), FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to temp char (%s) in env service on device %s"),
sensorId, sSensor.name, sensorId, sSensor.name,
charUuid.toString().c_str(), pAddress charUuid.toString().c_str(), pAddress.c_str()
); );
} }
} }
@@ -754,7 +754,7 @@ protected:
if (!tempNotifyCreated) { if (!tempNotifyCreated) {
Log.swarningln( Log.swarningln(
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': not found supported temp chars in env service on device %s"), FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': not found supported temp chars in env service on device %s"),
sensorId, sSensor.name, pAddress sensorId, sSensor.name, pAddress.c_str()
); );
pClient->disconnect(); pClient->disconnect();
@@ -772,7 +772,7 @@ protected:
if (pChar && (pChar->canNotify() || pChar->canIndicate())) { if (pChar && (pChar->canNotify() || pChar->canIndicate())) {
Log.straceln( Log.straceln(
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found humidity char (%s) in env service on device %s"), FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found humidity char (%s) in env service on device %s"),
sensorId, sSensor.name, charUuid.toString().c_str(), pAddress sensorId, sSensor.name, charUuid.toString().c_str(), pAddress.c_str()
); );
pChar->unsubscribe(); pChar->unsubscribe();
@@ -827,14 +827,14 @@ protected:
Log.straceln( Log.straceln(
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to humidity char (%s) in env service on device %s"), FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to humidity char (%s) in env service on device %s"),
sensorId, sSensor.name, sensorId, sSensor.name,
charUuid.toString().c_str(), pAddress charUuid.toString().c_str(), pAddress.c_str()
); );
} else { } else {
Log.swarningln( Log.swarningln(
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to humidity char (%s) in env service on device %s"), FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to humidity char (%s) in env service on device %s"),
sensorId, sSensor.name, sensorId, sSensor.name,
charUuid.toString().c_str(), pAddress charUuid.toString().c_str(), pAddress.c_str()
); );
} }
} }
@@ -843,7 +843,7 @@ protected:
if (!humidityNotifyCreated) { if (!humidityNotifyCreated) {
Log.swarningln( Log.swarningln(
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': not found supported humidity chars in env service on device %s"), FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': not found supported humidity chars in env service on device %s"),
sensorId, sSensor.name, pAddress sensorId, sSensor.name, pAddress.c_str()
); );
} }
} }
@@ -857,13 +857,13 @@ protected:
if (!pService) { if (!pService) {
Log.straceln( Log.straceln(
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to find battery service (%s) on device %s"), FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to find battery service (%s) on device %s"),
sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress.c_str()
); );
} else { } else {
Log.straceln( Log.straceln(
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found battery service (%s) on device %s"), FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found battery service (%s) on device %s"),
sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress sensorId, sSensor.name, serviceUuid.toString().c_str(), pAddress.c_str()
); );
// 0x2A19 - Notify the battery charge level 0..99% (pvvx) // 0x2A19 - Notify the battery charge level 0..99% (pvvx)
@@ -875,7 +875,7 @@ protected:
if (pChar && (pChar->canNotify() || pChar->canIndicate())) { if (pChar && (pChar->canNotify() || pChar->canIndicate())) {
Log.straceln( Log.straceln(
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found battery char (%s) in battery service on device %s"), FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': found battery char (%s) in battery service on device %s"),
sensorId, sSensor.name, charUuid.toString().c_str(), pAddress sensorId, sSensor.name, charUuid.toString().c_str(), pAddress.c_str()
); );
pChar->unsubscribe(); pChar->unsubscribe();
@@ -930,14 +930,14 @@ protected:
Log.straceln( Log.straceln(
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to battery char (%s) in battery service on device %s"), FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': subscribed to battery char (%s) in battery service on device %s"),
sensorId, sSensor.name, sensorId, sSensor.name,
charUuid.toString().c_str(), pAddress charUuid.toString().c_str(), pAddress.c_str()
); );
} else { } else {
Log.swarningln( Log.swarningln(
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to battery char (%s) in battery service on device %s"), FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to subscribe to battery char (%s) in battery service on device %s"),
sensorId, sSensor.name, sensorId, sSensor.name,
charUuid.toString().c_str(), pAddress charUuid.toString().c_str(), pAddress.c_str()
); );
} }
} }
@@ -946,7 +946,7 @@ protected:
if (!batteryNotifyCreated) { if (!batteryNotifyCreated) {
Log.swarningln( Log.swarningln(
FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': not found supported battery chars in battery service on device %s"), FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': not found supported battery chars in battery service on device %s"),
sensorId, sSensor.name, pAddress sensorId, sSensor.name, pAddress.c_str()
); );
} }
} }

8
src/Settings.h
View File

@@ -170,15 +170,15 @@ struct Settings {
struct { struct {
struct { struct {
bool enabled = false; bool enabled = false;
byte gpio = GPIO_IS_NOT_CONFIGURED; uint8_t gpio = GPIO_IS_NOT_CONFIGURED;
byte invertState = false; bool invertState = false;
unsigned short thresholdTime = 60; unsigned short thresholdTime = 60;
} input; } input;
struct { struct {
bool enabled = false; bool enabled = false;
byte gpio = GPIO_IS_NOT_CONFIGURED; uint8_t gpio = GPIO_IS_NOT_CONFIGURED;
byte invertState = false; bool invertState = false;
unsigned short thresholdTime = 60; unsigned short thresholdTime = 60;
bool onFault = true; bool onFault = true;
bool onLossConnection = true; bool onLossConnection = true;

8
src/utils.h
View File

@@ -72,7 +72,7 @@ time_t mkgmtime(const struct tm *ptm) {
inline bool isDigit(const char* ptr) { inline bool isDigit(const char* ptr) {
char* endPtr; char* endPtr;
strtol(ptr, &endPtr, 10); auto tmp = strtol(ptr, &endPtr, 10);
return *endPtr == 0; return *endPtr == 0;
} }
@@ -1324,7 +1324,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
if (!src[FPSTR(S_HEATING)][FPSTR(S_MIN_TEMP)].isNull()) { if (!src[FPSTR(S_HEATING)][FPSTR(S_MIN_TEMP)].isNull()) {
unsigned char value = src[FPSTR(S_HEATING)][FPSTR(S_MIN_TEMP)].as<unsigned char>(); unsigned char value = src[FPSTR(S_HEATING)][FPSTR(S_MIN_TEMP)].as<unsigned char>();
if (value != dst.heating.minTemp && value >= vars.slave.heating.minTemp && value < vars.slave.heating.maxTemp && value != dst.heating.minTemp) { if (value != dst.heating.minTemp && value >= vars.slave.heating.minTemp && value < vars.slave.heating.maxTemp && value != dst.heating.maxTemp) {
dst.heating.minTemp = value; dst.heating.minTemp = value;
changed = true; changed = true;
} }
@@ -1333,7 +1333,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
if (!src[FPSTR(S_HEATING)][FPSTR(S_MAX_TEMP)].isNull()) { if (!src[FPSTR(S_HEATING)][FPSTR(S_MAX_TEMP)].isNull()) {
unsigned char value = src[FPSTR(S_HEATING)][FPSTR(S_MAX_TEMP)].as<unsigned char>(); unsigned char value = src[FPSTR(S_HEATING)][FPSTR(S_MAX_TEMP)].as<unsigned char>();
if (value != dst.heating.maxTemp && value > vars.slave.heating.minTemp && value <= vars.slave.heating.maxTemp && value != dst.heating.maxTemp) { if (value != dst.heating.maxTemp && value > vars.slave.heating.minTemp && value <= vars.slave.heating.maxTemp && value != dst.heating.minTemp) {
dst.heating.maxTemp = value; dst.heating.maxTemp = value;
changed = true; changed = true;
} }
@@ -1894,7 +1894,7 @@ bool jsonToSensorSettings(const uint8_t sensorId, const JsonVariantConst src, Se
// gpio // gpio
if (!src[FPSTR(S_GPIO)].isNull()) { if (!src[FPSTR(S_GPIO)].isNull()) {
if (dst.type != Sensors::Type::DALLAS_TEMP && dst.type == Sensors::Type::BLUETOOTH && dst.type == Sensors::Type::NTC_10K_TEMP) { if (dst.type != Sensors::Type::DALLAS_TEMP && dst.type != Sensors::Type::NTC_10K_TEMP) {
if (dst.gpio != GPIO_IS_NOT_CONFIGURED) { if (dst.gpio != GPIO_IS_NOT_CONFIGURED) {
dst.gpio = GPIO_IS_NOT_CONFIGURED; dst.gpio = GPIO_IS_NOT_CONFIGURED;
changed = true; changed = true;