add tens and amp

This commit is contained in:
smayzy 2026-04-27 00:55:05 +02:00
parent cf82ec5071
commit 81e2a7a90b
2 changed files with 29 additions and 44 deletions

View File

@ -8,9 +8,7 @@
- power (W) - power (W)
- rpm (tr/min) - rpm (tr/min)
- bat (%) - bat (%)
- torque (Nm) - tens (V)
- amp (A)
- eff (Wh/Km) - eff (Wh/Km)
- bat_temp (°C)
- var_temp (°C)
- mot_temp (°C)
- warn (message) - warn (message)

View File

@ -69,13 +69,11 @@ typedef struct {
typedef struct { typedef struct {
StInt speed; StInt speed;
StInt rpm; StInt rpm;
StFlt tq;
StInt power; StInt power;
StFlt eff; StFlt eff;
StInt bat; StInt bat;
StFlt bat_temp; StFlt tens;
StFlt var_temp; StFlt amp;
StFlt mot_temp;
StStr message; StStr message;
} Tel; } Tel;
@ -102,12 +100,10 @@ void get_fake_data(Tel *t) {
t->speed.data = t->speed.ldata + rand() % (t->speed.hdata - t->speed.ldata + 1); t->speed.data = t->speed.ldata + rand() % (t->speed.hdata - t->speed.ldata + 1);
t->power.data = t->power.ldata + rand() % (t->power.hdata - t->power.ldata + 1); t->power.data = t->power.ldata + rand() % (t->power.hdata - t->power.ldata + 1);
t->bat.data = t->bat.ldata + rand() % (t->bat.hdata - t->bat.ldata + 1); t->bat.data = t->bat.ldata + rand() % (t->bat.hdata - t->bat.ldata + 1);
t->tq.data = t->tq.ldata + ((float)rand() / (float)RAND_MAX) * (float)(t->tq.hdata - t->tq.ldata);
t->rpm.data = t->rpm.ldata + rand() % (t->rpm.hdata - t->rpm.ldata + 1); t->rpm.data = t->rpm.ldata + rand() % (t->rpm.hdata - t->rpm.ldata + 1);
t->tens.data = t->tens.ldata + ((float)rand() / (float)RAND_MAX) * (float)(t->tens.hdata - t->tens.ldata);
t->amp.data = t->amp.ldata + ((float)rand() / (float)RAND_MAX) * (float)(t->amp.hdata - t->amp.ldata);
t->eff.data = t->eff.ldata + ((float)rand() / (float)RAND_MAX) * (float)(t->eff.hdata - t->eff.ldata); t->eff.data = t->eff.ldata + ((float)rand() / (float)RAND_MAX) * (float)(t->eff.hdata - t->eff.ldata);
t->bat_temp.data = t->bat_temp.ldata + ((float)rand() / (float)RAND_MAX) * (float)(t->bat_temp.hdata - t->bat_temp.ldata);
t->var_temp.data = t->var_temp.ldata + ((float)rand() / (float)RAND_MAX) * (float)(t->var_temp.hdata - t->var_temp.ldata);
t->mot_temp.data = t->mot_temp.ldata + ((float)rand() / (float)RAND_MAX) * (float)(t->mot_temp.hdata - t->mot_temp.ldata);
} }
void read_can(Tel *t, int soc) { void read_can(Tel *t, int soc) {
@ -140,8 +136,8 @@ void read_uart(Tel *t, int fd, SerialParser *uart_str) {
uart_str->linebuf[uart_str->linepos] = '\0'; uart_str->linebuf[uart_str->linepos] = '\0';
float tmp_v, tmp_a; float tmp_v, tmp_a;
if (sscanf(uart_str->linebuf, "%f,%f", &tmp_v, &tmp_a) == 2) { if (sscanf(uart_str->linebuf, "%f,%f", &tmp_v, &tmp_a) == 2) {
//t->v = tmp_v; t->tens.data = tmp_v;
//t->a = tmp_a; t->amp.data = tmp_a;
} }
uart_str->linepos = 0; uart_str->linepos = 0;
@ -495,37 +491,35 @@ int main(int argc, char **argv) {
int y2 = y / 2; int y2 = y / 2;
int y2r = y - y2; int y2r = y - y2;
int y4 = y2 / 2; int y4 = y / 4;
int y4r = y2 - y4; int y4r = y2 - y4;
int y2r4 = y2r / 2;
int y2r4r = y2r - y2r4;
int y6 = y2r / 3; int y6 = y2r / 3;
int y6r = y2r - 2 * y6; int y6r = y - (y2 + 2* y6);
Tel tel; Tel tel;
tel.speed = (StInt){0 , 0 , 200 , 3, 1, y2 , x3 , 0 , 0 , NULL, "speed (km/h)" }; tel.speed = (StInt){0 , 0 , 200 , 3, 1, y2 , x3 , 0 , 0 , NULL, "speed (km/h)" };
tel.rpm = (StInt){0 , 0 , 6000 , 4, 1, y2 , x3 , 0 , x3 , NULL, "rpm (tr/min)" }; tel.rpm = (StInt){0 , 0 , 6000 , 4, 1, y2 , x3 , 0 , x3 , NULL, "rpm (tr/min)" };
tel.tq = (StFlt){0.0f, 1.8f, 3.5f , 3, 1, y4r, x3r , y4 , x-x3r , NULL, "torque (N/m)" }; tel.power = (StInt){0 , 0 , 1300 , 4, 1, 2*y6 , 2*x3, y2 , 0 , NULL, "power (W)" };
tel.power = (StInt){0 , 0 , 1300 , 4, 1, y6 , 2*x3, y2 , 0 , NULL, "power (W)" };
tel.eff = (StFlt){0.0f, 0.0f, 300.0f, 5, 1, y6 , x3r , y2 , 2*x3 , NULL, "efficiency (Wh/Km)" };
tel.bat = (StInt){0 , 0 , 100 , 3, 0, y4 , x3r , 0 , x-x3r , NULL, "batteries (%)" }; tel.bat = (StInt){0 , 0 , 100 , 3, 0, y4 , x3r , 0 , x-x3r , NULL, "batteries (%)" };
tel.bat_temp = (StFlt){0.0f, 0.0f, 150.0f, 5, 1, y6 , x3 , y2+y6, 0 , NULL, "batteries temperature (deg C)" }; tel.eff = (StFlt){0.0f, 0.0f, 300.0f, 5, 0, y4r , x3r , y4 , x-x3r , NULL, "efficiency (Wh/Km)" };
tel.var_temp = (StFlt){0.0f, 0.0f, 150.0f, 5, 1, y6 , x3 , y2+y6, x3 , NULL, "variator temperature (deg C)" }; tel.tens = (StFlt){0.0f, 0.0f, 55.0f , 4, 1, y2r4 , x3r , y2 , x-x3r , NULL, "tension (V)" };
tel.mot_temp = (StFlt){0.0f, 0.0f, 150.0f, 5, 1, y6 , x3r , y2+y6, x-x3r , NULL, "motor temperature (deg C)" }; tel.amp = (StFlt){0.0f, 0.0f, 55.0f , 4, 1, y2r4r, x3r , y-y2r4r, x-x3r , NULL, "intensity (A)" };
tel.message = (StStr){ y6r, x , y-y6r, 0 , NULL, "warnings" }; tel.message = (StStr){ y6r , 2*x3, y-y6r , 0 , NULL, "warnings" };
win_init_int(&tel.speed); win_init_int(&tel.speed);
win_init_int(&tel.rpm); win_init_int(&tel.rpm);
win_init_flt(&tel.tq);
win_init_int(&tel.power); win_init_int(&tel.power);
win_init_flt(&tel.eff); win_init_flt(&tel.eff);
win_init_int(&tel.bat); win_init_int(&tel.bat);
win_init_flt(&tel.bat_temp); win_init_flt(&tel.tens);
win_init_flt(&tel.var_temp); win_init_flt(&tel.amp);
win_init_flt(&tel.mot_temp);
win_init_str(&tel.message); win_init_str(&tel.message);
bar_mark(tel.power.lwin); bar_mark(tel.power.lwin);
long t100 = 0, t1000 = 0; long t100 = 0;
int ch = ERR; int ch = ERR;
while(1) { while(1) {
@ -547,17 +541,12 @@ int main(int argc, char **argv) {
if (now - t100 >= 100 * delay) { if (now - t100 >= 100 * delay) {
win_int(&tel.speed, use_color); win_int(&tel.speed, use_color);
win_int(&tel.rpm, use_color); win_int(&tel.rpm, use_color);
win_float(&tel.tq, use_color);
win_bar(&tel.power, use_color); win_bar(&tel.power, use_color);
win_float(&tel.eff, use_color); win_float(&tel.eff, use_color);
t100 = now; win_float(&tel.tens, use_color);
} win_float(&tel.amp, use_color);
if (now - t1000 >= 1000 * delay) {
win_int(&tel.bat, use_color); win_int(&tel.bat, use_color);
win_float(&tel.bat_temp, use_color); t100 = now;
win_float(&tel.var_temp, use_color);
win_float(&tel.mot_temp, use_color);
t1000 = now;
} }
//message; //message;
napms(10); napms(10);
@ -565,13 +554,11 @@ int main(int argc, char **argv) {
end: end:
delwin(tel.speed.lwin); delwin(tel.speed.lwin);
delwin(tel.rpm.lwin); delwin(tel.rpm.lwin);
delwin(tel.tq.lwin);
delwin(tel.power.lwin); delwin(tel.power.lwin);
delwin(tel.eff.lwin); delwin(tel.eff.lwin);
delwin(tel.bat.lwin); delwin(tel.bat.lwin);
delwin(tel.bat_temp.lwin); delwin(tel.tens.lwin);
delwin(tel.var_temp.lwin); delwin(tel.amp.lwin);
delwin(tel.mot_temp.lwin);
delwin(tel.message.lwin); delwin(tel.message.lwin);
endwin(); endwin();
if (use_can) close(soc); if (use_can) close(soc);