diff --git a/examples/replay.c b/examples/replay.c index 160779b..47d7e65 100644 --- a/examples/replay.c +++ b/examples/replay.c @@ -49,7 +49,7 @@ int main(int argc, char **argv) { goto error_can_if_open; } - if (hexagram_capture_replay(capture, can_if, 1) < 0) { + if (hexagram_capture_replay(capture, can_if, 1.0) < 0) { perror("hexagram_capture_replay()"); goto error_capture_replay; diff --git a/examples/view.c b/examples/view.c index b5739da..c7838e5 100644 --- a/examples/view.c +++ b/examples/view.c @@ -3,6 +3,7 @@ #include #include #include +#include #include @@ -28,6 +29,8 @@ int main(int argc, char **argv) { struct can_frame frame; uint8_t last_gear = 0; + struct timeval now, last; + if (argc != 2) { return usage(argc, argv, NULL); } @@ -38,32 +41,58 @@ int main(int argc, char **argv) { goto error_can_if_open; } + gettimeofday(&now, NULL); + memcpy(&last, &now, sizeof(now)); + initscr(); win = newwin(LINES, COLS, 0, 0); while (hexagram_can_if_read(can_if, &frame) >= 0) { + gettimeofday(&now, NULL); + char lever_states[16] = " PRNDS "; char manual_gears[16] = " 123456 "; if (frame.can_id == 0x280) { + double rpm = 0.25 * (double)(frame.data[2] | (frame.data[3] << 8)); + wmove(win, 1, 0); + + wprintw(win, "%6.1lf RPM\n", rpm); } else if (frame.can_id == 0x540) { if (frame.data[7] != last_gear) { - wmove(win, 0, 0); + wmove(win, 3, 8); if ((frame.data[7] & 0xc) == 0xc) { wprintw(win, " %c\n", manual_gears[(frame.data[7] & 0xf0) >> 4]); + } else { wprintw(win, "%c \n", lever_states[(frame.data[7] & 0xf0) >> 4]); } - wrefresh(win); - last_gear = frame.data[7]; } + } else if (frame.can_id == 0x5a0) { + /* + * Speed is expressed in units of 0.002 wheel cycles per second + */ + double rps = 0.001 * (double)(((uint16_t)frame.data[1] >> 1) + | ((uint16_t)frame.data[2] << 8)); + + double kph = (2.032 * rps * 3600) / 1000.0; + + wmove(win, 2, 0); + + wprintw(win, "%6.1lf kph", kph); + } + + if (((now.tv_sec * 1000000) + now.tv_usec) - ((last.tv_sec * 1000000) + last.tv_usec) > 100000) { + memcpy(&last, &now, sizeof(now)); + + wrefresh(win); } }