Invert the charge current if necessary, assume the value always changes

This commit is contained in:
Matti Viljanen 2022-08-10 00:12:13 +03:00
parent 31c709435b
commit c0b7c4ddce
No known key found for this signature in database
GPG key ID: CF32A1495158F888
4 changed files with 23 additions and 11 deletions

View file

@ -187,12 +187,16 @@ void Battery::updateData()
}
if(currentFile && currentFile->open(QIODevice::ReadOnly)) {
nextCurrent = currentFile->readLine().trimmed().toInt();
if(nextCurrent != current) {
current = nextCurrent;
emit currentChanged(current);
logD(QString("Current: %1mA").arg(current / 1000));
current = currentFile->readLine().trimmed().toInt();
if(!invertDecided) {
invertCurrent = (!chargerConnected && current > 10);
if(invertCurrent) logL("Battery current inverted");
else logL("Battery current not inverted");
invertDecided = true;
}
current = current * (invertCurrent ? -1 : 1);
emit currentChanged(current);
logH(QString("Current: %1mA").arg(current / 1000));
currentFile->close();
}

View file

@ -83,7 +83,9 @@ private:
bool chargerIsEnabled = true;
int nextCharge = charge;
int nextCurrent = current;
bool invertCurrent = false;
bool invertDecided = false;
bool nextChargerConnected = chargerConnected;
QString nextState = state;
bool nextChargingEnabled = chargingEnabled;

View file

@ -224,11 +224,15 @@ void Battery::updateData()
}
if(currentFile && currentFile->open(QIODevice::ReadOnly)) {
nextCurrent = currentFile->readLine().trimmed().toInt();
if(nextCurrent != current) {
current = nextCurrent;
logV(QString("Current: %1mA").arg(current / 1000));
current = currentFile->readLine().trimmed().toInt();
if(!invertDecided) {
invertCurrent = (!chargerConnected && current > 10);
if(invertCurrent) logL("Battery current inverted");
else logL("Battery current not inverted");
invertDecided = true;
}
current = current * (invertCurrent ? -1 : 1);
logH(QString("Current: %1mA").arg(current / 1000));
currentFile->close();
}

View file

@ -107,7 +107,9 @@ private:
bool chargerIsEnabled = true;
int nextCharge = charge;
int nextCurrent = current;
bool invertCurrent = false;
bool invertDecided = false;
bool nextChargerConnected = chargerConnected;
QString nextState = state;
bool nextChargingEnabled = chargingEnabled;