diff --git a/examples/Makefile b/examples/Makefile index a423b64..d9c76ea 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -8,7 +8,7 @@ CFLAGS += -I$(INCLUDE_PATH) LDFLAGS = -L../src -lhexagram STATIC = ../src/libhexagram.a -EXAMPLES = capture convert pcapread replay view +EXAMPLES = capture convert duration pcapread replay view RM = /bin/rm diff --git a/examples/view.c b/examples/view.c index 7957ac1..3678c5e 100644 --- a/examples/view.c +++ b/examples/view.c @@ -57,17 +57,17 @@ int main(int argc, char **argv) { wprintw(win, "%6.1lf RPM", rpm); } else if (frame.can_id == 0x540) { - wmove(win, 5, 0); + wmove(win, 6, 0); if ((frame.data[7] & 0xc) == 0xc) { uint8_t gear = ((frame.data[7] & 0xf0) >> 4) - 2; wprintw(win, "1 2 3 4 5 6"); - wmove(win, 6, 0); + wmove(win, 7, 0); wprintw(win, " "); - wmove(win, 6, gear * 2); + wmove(win, 7, gear * 2); wprintw(win, "_"); } else { @@ -75,10 +75,10 @@ int main(int argc, char **argv) { wprintw(win, "P R N D S "); - wmove(win, 6, 0); + wmove(win, 7, 0); wprintw(win, " "); - wmove(win, 6, pos * 2); + wmove(win, 7, pos * 2); wprintw(win, "_"); } @@ -91,18 +91,24 @@ int main(int argc, char **argv) { double kph = (2.032 * rps * 3600) / 1000.0; - wmove(win, 2, 0); + double g = 0.01 * (((double)frame.data[0]) - 127.0); + wmove(win, 2, 0); wprintw(win, "%6.1lf kph", kph); + + wmove(win, 4, 0); + wprintw(win, "%6.1lf G lateral", g); } else if (frame.can_id == 0x420) { double temp = ((double)frame.data[1] - 100) / 2.0; wmove(win, 3, 0); - wprintw(win, "%6.1lf °C", temp); + wprintw(win, "%6.1lf °C ambient", temp); + } else if (frame.can_id == 0x4a0) { + } - if (((now.tv_sec * 1000000) + now.tv_usec) - ((last.tv_sec * 1000000) + last.tv_usec) > 500000) { + if (((now.tv_sec * 1000000) + now.tv_usec) - ((last.tv_sec * 1000000) + last.tv_usec) > 100000) { memcpy(&last, &now, sizeof(now)); wrefresh(win);