diff --git a/src/main.c b/src/main.c index 751dcdc..52f2e21 100644 --- a/src/main.c +++ b/src/main.c @@ -18,8 +18,7 @@ const int digit_bitmaps[10][5][3] = { {{1,1,1},{1,0,1},{1,1,1},{0,0,1},{1,1,1}} // 9 }; -void get_fake_data(int *speed, int *power, int *bat, float *tq, int *rpm, int *eff, float *bat_temp, float *var_temp, float *mot_temp) -{ +void get_fake_data(int *speed, int *power, int *bat, float *tq, int *rpm, int *eff, float *bat_temp, float *var_temp, float *mot_temp) { *speed = rand() % 201; *power = rand() % 1251; *bat = rand() % 101; @@ -31,8 +30,7 @@ void get_fake_data(int *speed, int *power, int *bat, float *tq, int *rpm, int *e *mot_temp = (float)rand() / (float)RAND_MAX * 150.0f; } -long now_ms(void) -{ +long now_ms(void) { struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); return ts.tv_sec * 1000 + ts.tv_nsec / 1000000; @@ -50,7 +48,7 @@ int smaller_of(int a, int b) { return (a < b) ? a : b; } -void win_int(WINDOW *lwin, int data, int digits){ +void win_int(WINDOW *lwin, int data, int digits) { int lwiny, lwinx, len; char buf[16]; getmaxyx(lwin, lwiny, lwinx); @@ -90,8 +88,7 @@ void win_int(WINDOW *lwin, int data, int digits){ wrefresh(lwin); } -void win_float(WINDOW *lwin, float data, int digits) -{ +void win_float(WINDOW *lwin, float data, int digits) { int lwiny, lwinx, len; char buf[16]; @@ -146,8 +143,7 @@ void win_float(WINDOW *lwin, float data, int digits) wrefresh(lwin); } -int main(int argc, char **argv) -{ +int main(int argc, char **argv) { int option; int delay = 1; int fake_data = 0; @@ -178,7 +174,7 @@ int main(int argc, char **argv) int y,x; getmaxyx(stdscr, y, x); - if (y < 42 || x < 100){ + if (y < 42 || x < 100) { return 1; } @@ -225,8 +221,7 @@ int main(int argc, char **argv) float tq = 0.0f, bat_temp = 0.0f, var_temp = 0.0f, mot_temp = 0.0f; long t100 = 0, t1000 = 0; int ch = ERR; - while(ch == ERR) - { + while(ch == ERR) { if (fake_data) { get_fake_data(&speed, &power, &bat, &tq, &rpm, &eff, &bat_temp, &var_temp, &mot_temp); } else { @@ -243,7 +238,7 @@ int main(int argc, char **argv) //win[5] t100 = now; } - if (now - t1000 >= 1000 * delay){ + if (now - t1000 >= 1000 * delay) { win_int(win[2], bat, 3); win_float(win[6], bat_temp, 5); win_float(win[7], var_temp, 5);