seba/obd2_gauge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gauge: implement full calibrations for speed (0-160km/h) and volt (10-16V) with floating precision

Browse source
This commit is contained in:
Sebastián Nieto 2026-09-09 22:44:20 -03:00
parent 2f58b502ed
commit 429944b834
3 changed files with 38 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
emulator/obd2_emulator.py
View file

@ -47,26 +47,26 @@ class VehicleState:
if phase < 8.0: if phase < 8.0:
p = phase / 8.0 p = phase / 8.0
self.rpm = 800.0 + p * (6000.0 - 800.0) self.rpm = 800.0 + p * (6000.0 - 800.0)
self.speed = p * 180.0 self.speed = p * 160.0
self.coolant_temp = 85.0 + p * (120.0 - 85.0) self.coolant_temp = 85.0 + p * (120.0 - 85.0)
self.pcm_volt = 13.2 + p * (16.0 - 13.2) self.pcm_volt = 11.5 + p * (16.0 - 11.5)
elif phase < 12.0: elif phase < 12.0:
# MAX SCALE ON ALL INSTRUMENTS # MAX SCALE ON ALL INSTRUMENTS
self.rpm = 6000.0 self.rpm = 6000.0
self.speed = 180.0 self.speed = 160.0
self.coolant_temp = 120.0 self.coolant_temp = 120.0
self.pcm_volt = 16.0 self.pcm_volt = 16.0
elif phase < 20.0: elif phase < 20.0:
p = (phase - 12.0) / 8.0 p = (phase - 12.0) / 8.0
self.rpm = 6000.0 - p * (6000.0 - 800.0) self.rpm = 6000.0 - p * (6000.0 - 800.0)
self.speed = 180.0 - p * 180.0 self.speed = 160.0 - p * 160.0
self.coolant_temp = 120.0 - p * (120.0 - 85.0) self.coolant_temp = 120.0 - p * (120.0 - 85.0)
self.pcm_volt = 16.0 - p * (16.0 - 13.2) self.pcm_volt = 16.0 - p * (16.0 - 11.5)
else: else:
self.rpm = 800.0 self.rpm = 800.0
self.speed = 0.0 self.speed = 0.0
self.coolant_temp = 88.0 self.coolant_temp = 88.0
self.pcm_volt = 13.8 self.pcm_volt = 14.2
# Correlated auxiliary telemetry # Correlated auxiliary telemetry
self.map_psi = 10.0 + 16.0 * ((self.rpm - 800.0) / 5200.0) self.map_psi = 10.0 + 16.0 * ((self.rpm - 800.0) / 5200.0)

64
sketch/obd2_gauge/meter.h
View file

@ -697,6 +697,8 @@ inline void drawQuadrantDividers() {
// Determine display color for meter: // Determine display color for meter:
// ECT (PID 0): VERDE (< 98), AMARILLO (98-105), ROJO (>= 106) // ECT (PID 0): VERDE (< 98), AMARILLO (98-105), ROJO (>= 106)
// RPM (PID 1): VERDE (< 3500), AMARILLO (3500-5000), ROJO (5000-6000) // RPM (PID 1): VERDE (< 3500), AMARILLO (3500-5000), ROJO (5000-6000)
// Voltaje (PID 2): ROJO (< 12.0 o >= 15.3), AMARILLO (12.0-13.2 o 14.8-15.2), VERDE (13.3-14.7)
// Velocidad (PID 3): VERDE (< 110), AMARILLO (110-130), ROJO (>= 130)
// Otros instrumentos: VERDE / ROJO (según umbral de advertencia) // Otros instrumentos: VERDE / ROJO (según umbral de advertencia)
inline uint16_t getMeterColor(uint8_t pidIdx, float data, int warn) { inline uint16_t getMeterColor(uint8_t pidIdx, float data, int warn) {
if (pidIdx == 0) { // 0 = Temperatura ECT (PID 0105) if (pidIdx == 0) { // 0 = Temperatura ECT (PID 0105)
@ -709,10 +711,30 @@ inline uint16_t getMeterColor(uint8_t pidIdx, float data, int warn) {
if (data >= 3500.0f) return TFT_YELLOW; if (data >= 3500.0f) return TFT_YELLOW;
return TFT_GREEN; return TFT_GREEN;
} }
if (pidIdx == 2) { // 2 = Voltaje (PID 0142)
if (data < 12.0f || data >= 15.3f) return TFT_RED;
if (data < 13.3f || data >= 14.8f) return TFT_YELLOW;
return TFT_GREEN;
}
if (pidIdx == 3) { // 3 = Velocidad (PID 010D)
if (data >= 130.0f) return TFT_RED;
if (data >= 110.0f) return TFT_YELLOW;
return TFT_GREEN;
}
if (warn > 0 && data >= (float)warn) return TFT_RED; if (warn > 0 && data >= (float)warn) return TFT_RED;
return TFT_GREEN; return TFT_GREEN;
} }
// Compute block count (0..NUM_BAR_BLOCKS) with sub-integer floating point precision
inline int calcMeterBlocks(float val, int min, int max) {
float range = (float)(max - min);
if (range <= 0.0f) return 0;
int b = (int)(((val - (float)min) / range) * (float)NUM_BAR_BLOCKS + 0.5f);
if (b < 0) b = 0;
if (b > NUM_BAR_BLOCKS) b = NUM_BAR_BLOCKS;
return b;
}
// 4-quadrant Numeric Meter (160x120 px) // 4-quadrant Numeric Meter (160x120 px)
void numericMeter4(uint8_t cell, uint8_t pid, bool redrawHeader = true) { void numericMeter4(uint8_t cell, uint8_t pid, bool redrawHeader = true) {
int w = 160; int w = 160;
@ -816,17 +838,8 @@ void plotArc4(uint8_t cell, float data, int warn, int min, int max, bool digit,
String numStr = String(data, digit); String numStr = String(data, digit);
int newBlocks = map(data, min, max, 0, NUM_BAR_BLOCKS); int newBlocks = calcMeterBlocks(data, min, max);
if (newBlocks < 0) int oldBlocks = (old_data[cell] < min) ? 0 : calcMeterBlocks(old_data[cell], min, max);
newBlocks = 0;
if (newBlocks > NUM_BAR_BLOCKS)
newBlocks = NUM_BAR_BLOCKS;
int oldBlocks = (old_data[cell] < min) ? 0 : map(old_data[cell], min, max, 0, NUM_BAR_BLOCKS);
if (oldBlocks < 0)
oldBlocks = 0;
if (oldBlocks > NUM_BAR_BLOCKS)
oldBlocks = NUM_BAR_BLOCKS;
bool colorChanged = (col != oldCol); bool colorChanged = (col != oldCol);
if (col == TFT_RED) { if (col == TFT_RED) {
@ -983,17 +996,8 @@ void plotFullScreen(uint8_t cell, float data, int warn, int min, int max,
String numStr = String(data, digit); String numStr = String(data, digit);
if (!cellIsNumeric[cell]) { if (!cellIsNumeric[cell]) {
int newBlocks = map(data, min, max, 0, NUM_BAR_BLOCKS); int newBlocks = calcMeterBlocks(data, min, max);
if (newBlocks < 0) int oldBlocks = (old_data[cell] < min) ? 0 : calcMeterBlocks(old_data[cell], min, max);
newBlocks = 0;
if (newBlocks > NUM_BAR_BLOCKS)
newBlocks = NUM_BAR_BLOCKS;
int oldBlocks = (old_data[cell] < min) ? 0 : map(old_data[cell], min, max, 0, NUM_BAR_BLOCKS);
if (oldBlocks < 0)
oldBlocks = 0;
if (oldBlocks > NUM_BAR_BLOCKS)
oldBlocks = NUM_BAR_BLOCKS;
bool colorChanged = (col != oldCol); bool colorChanged = (col != oldCol);
if (col == TFT_RED) { if (col == TFT_RED) {
@ -1282,9 +1286,7 @@ void handleArcAlarmFlash() {
wasInRedAlarm[cell] = false; wasInRedAlarm[cell] = false;
int min = pidConfig[pidIdx][4].toInt(); int min = pidConfig[pidIdx][4].toInt();
int max = pidConfig[pidIdx][5].toInt(); int max = pidConfig[pidIdx][5].toInt();
int newBlocks = map(data, min, max, 0, NUM_BAR_BLOCKS); int newBlocks = calcMeterBlocks(data, min, max);
if (newBlocks < 0) newBlocks = 0;
if (newBlocks > NUM_BAR_BLOCKS) newBlocks = NUM_BAR_BLOCKS;
for (uint8_t i = 0; i < newBlocks; i++) { for (uint8_t i = 0; i < newBlocks; i++) {
drawBarBlock(i, col); drawBarBlock(i, col);
} }
@ -1296,9 +1298,7 @@ void handleArcAlarmFlash() {
if (toggleTick) { if (toggleTick) {
int min = pidConfig[pidIdx][4].toInt(); int min = pidConfig[pidIdx][4].toInt();
int max = pidConfig[pidIdx][5].toInt(); int max = pidConfig[pidIdx][5].toInt();
int newBlocks = map(data, min, max, 0, NUM_BAR_BLOCKS); int newBlocks = calcMeterBlocks(data, min, max);
if (newBlocks < 0) newBlocks = 0;
if (newBlocks > NUM_BAR_BLOCKS) newBlocks = NUM_BAR_BLOCKS;
if (arcFlashVisible) { if (arcFlashVisible) {
for (uint8_t i = 0; i < newBlocks; i++) { for (uint8_t i = 0; i < newBlocks; i++) {
@ -1330,9 +1330,7 @@ void handleArcAlarmFlash() {
wasInRedAlarm[cell] = false; wasInRedAlarm[cell] = false;
int min = pidConfig[pidIdx][4].toInt(); int min = pidConfig[pidIdx][4].toInt();
int max = pidConfig[pidIdx][5].toInt(); int max = pidConfig[pidIdx][5].toInt();
int newBlocks = map(data, min, max, 0, NUM_BAR_BLOCKS); int newBlocks = calcMeterBlocks(data, min, max);
if (newBlocks < 0) newBlocks = 0;
if (newBlocks > NUM_BAR_BLOCKS) newBlocks = NUM_BAR_BLOCKS;
for (uint8_t i = 0; i < newBlocks; i++) { for (uint8_t i = 0; i < newBlocks; i++) {
drawQuadBarBlock(cell, i, col); drawQuadBarBlock(cell, i, col);
} }
@ -1344,9 +1342,7 @@ void handleArcAlarmFlash() {
if (toggleTick) { if (toggleTick) {
int min = pidConfig[pidIdx][4].toInt(); int min = pidConfig[pidIdx][4].toInt();
int max = pidConfig[pidIdx][5].toInt(); int max = pidConfig[pidIdx][5].toInt();
int newBlocks = map(data, min, max, 0, NUM_BAR_BLOCKS); int newBlocks = calcMeterBlocks(data, min, max);
if (newBlocks < 0) newBlocks = 0;
if (newBlocks > NUM_BAR_BLOCKS) newBlocks = NUM_BAR_BLOCKS;
if (arcFlashVisible) { if (arcFlashVisible) {
for (uint8_t i = 0; i < newBlocks; i++) { for (uint8_t i = 0; i < newBlocks; i++) {

4
sketch/obd2_gauge/obd2_gauge.ino
View file

@ -85,8 +85,8 @@ const String pidConfig[4][9] = {
//[pid][data] //[pid][data]
{ "Temperatura", "`C", "0105", "1", "0", "120", "2", "0", "106" }, //0 = Temperatura (0105) { "Temperatura", "`C", "0105", "1", "0", "120", "2", "0", "106" }, //0 = Temperatura (0105)
{ "RPM", "rpm", "010C", "3", "0", "6000", "0", "0", "5000" }, //1 = RPM (010C) { "RPM", "rpm", "010C", "3", "0", "6000", "0", "0", "5000" }, //1 = RPM (010C)
{ "Voltaje", "V", "0142", "4", "0", "16", "1", "1", "15" }, //2 = Voltaje (0142) { "Voltaje", "V", "0142", "4", "10", "16", "1", "1", "15" }, //2 = Voltaje (0142)
{ "Velocidad", "km/h", "010D", "7", "0", "180", "0", "0", "130" } //3 = Velocidad (010D) { "Velocidad", "km/h", "010D", "7", "0", "160", "0", "0", "130" } //3 = Velocidad (010D)
}; };
//hold warning value //hold warning value