comparison: src/DetailiSpindel.cpp
src/DetailiSpindel.cpp
- changeset 500
- cf75e6fadcb1
- parent 499
- 10d208fa6c74
- child 502
- 0f15edebc665
equal
deleted
inserted
replaced
| 499:10d208fa6c74 | 500:cf75e6fadcb1 |
|---|---|
| 138 ui->svgVal->setText(""); | 138 ui->svgVal->setText(""); |
| 139 ui->abvVal->setText(""); | 139 ui->abvVal->setText(""); |
| 140 ui->batVal->setText(""); | 140 ui->batVal->setText(""); |
| 141 } | 141 } |
| 142 | 142 |
| 143 double batt = query.value("battery").toDouble() - 3.064; // 0% voltage | 143 const float battery_max = 4.13; |
| 144 const float battery_min = 3.43; | |
| 145 | |
| 146 double batt = ((query.value("battery").toDouble() - battery_min) / (battery_max - battery_min)) * 100; | |
| 144 if (batt < 0) | 147 if (batt < 0) |
| 145 batt = 0; | 148 batt = 0; |
| 146 batt = round(batt / 1.05 * 1000.0) / 10; // 100% range. Was 1.17875 | |
| 147 if (batt > 100) | 149 if (batt > 100) |
| 148 batt = 100; | 150 batt = 100; |
| 149 ui->batVal->setText(QString("%1%").arg(batt, 2, 'f', 1, '0')); | 151 ui->batVal->setText(QString("%1%").arg(batt, 2, 'f', 1, '0')); |
| 150 | 152 |
| 151 ui->thermoBox->show(); | 153 ui->thermoBox->show(); |
