From 443c0ce724588688acfc4791c2c5dd7c37ee12dc Mon Sep 17 00:00:00 2001 From: David Lechner Date: Sun, 1 Jun 2014 03:06:04 +0000 Subject: [PATCH 01/11] inital empty commit From 1ce9d535c6b6c980cca2bd69d1dc23f12a3b9dd5 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Sun, 1 Jun 2014 03:07:25 +0000 Subject: [PATCH 02/11] Inital program. * Obtains next free console, activates it and switches to graphics mode * Uses glib for main application loop and m2tklib/u8glib for graphics * Allows console switching with CTRL+ALT+F(n) * Exits gracefully on SIGINT and SIGTERM * Uses udev to monitor input/event devices and reads input directly --- .gitignore | 3 + Makefile | 9 ++ brickdm.c | 184 ++++++++++++++++++++++++++++++ brickdm.h | 9 ++ brickdm_event.c | 290 ++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 495 insertions(+) create mode 100644 .gitignore create mode 100644 Makefile create mode 100644 brickdm.c create mode 100644 brickdm.h create mode 100644 brickdm_event.c diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f3b8ece --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +brickdm +*.o + diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..19d8731 --- /dev/null +++ b/Makefile @@ -0,0 +1,9 @@ + +CFLAGS = -Wall `pkg-config --cflags glib-2.0` `pkg-config --cflags dbus-glib-1` + +OBJ = brickdm.o brickdm_event.o + +all: brickdm + +brickdm: $(OBJ) + $(CC) -g -o $@ -lu8g -lm2tk -lglib-2.0 -ludev $? diff --git a/brickdm.c b/brickdm.c new file mode 100644 index 0000000..b1e0f2f --- /dev/null +++ b/brickdm.c @@ -0,0 +1,184 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include +#include +#include + +#include "brickdm.h" + +GMainLoop *loop; +u8g_t u8g; +uint8_t needs_redraw = TRUE; +int vtnum; +gboolean owns_vt = FALSE; + +gboolean brickdm_sigterm_handler(gpointer user_data) +{ + g_main_loop_quit(loop); + return TRUE; +} + +gboolean brickdm_sighup_handler(gpointer user_data) +{ + int vtfd = GPOINTER_TO_INT(user_data); + struct vt_stat vtstat; + + if (owns_vt) { + if (ioctl(vtfd, VT_RELDISP, 1) == 0) + owns_vt = FALSE; + } else { + if (ioctl(vtfd, VT_GETSTATE, &vtstat) == 0) { + if (vtstat.v_active == vtnum) { + ioctl(vtfd, VT_RELDISP, VT_ACKACQ); + needs_redraw = TRUE; + owns_vt = TRUE; + } + } + } + return TRUE; +} + +gboolean timer_handler(gpointer user_data) +{ + if (owns_vt) { + m2_CheckKey(); + needs_redraw |= m2_HandleKey(); + if (needs_redraw) + { + u8g_BeginDraw(&u8g); + m2_Draw(); + u8g_EndDraw(&u8g); + } + needs_redraw = 0; + } + return TRUE; +} + +M2_EXTERN_ALIGN(main_menu); + +M2_LABEL(battery_label, NULL, "Battery"); +M2_ROOT(goto_main, NULL, " Goto Main Menu ", &main_menu); +M2_LIST(battery_list) = { &battery_label, &goto_main }; +M2_VLIST(battery_dialog, NULL, battery_list); + +m2_menu_entry menu_data[] = { + { "Info", NULL }, + { ". Battery", &battery_dialog }, + { ". Network", &battery_dialog }, + { "Other", NULL }, + { NULL, NULL } +}; + +uint8_t main_menu_first = 0; +uint8_t main_menu_cnt = 6; + +M2_2LMENU(main_menu_menu, "l7e20W42", &main_menu_first, &main_menu_cnt, menu_data, '+', '-', '\0'); +M2_SPACE(main_menu_space, "W1h1"); +M2_VSB(main_menu_scroll, "l4W2r1", &main_menu_first, &main_menu_cnt); +M2_LIST(main_menu_list_data) = { &main_menu_menu, &main_menu_space, &main_menu_scroll }; +M2_HLIST(main_menu_hlist, NULL, main_menu_list_data); +M2_ALIGN(main_menu, "-1|1W64H64", &main_menu_hlist); + +int main(void) +{ + int vtfd; + char device[32]; + struct vt_stat vtstat; + int exit_value = 0; + struct vt_mode mode = { + .mode = VT_PROCESS, + .relsig = SIGHUP, + .acqsig = SIGHUP, + }; + + vtfd = open("/dev/tty0", O_RDWR, 0); + if (vtfd < 0) { + perror("could not open /dev/tty0"); + exit (1); + } + if (ioctl(vtfd, VT_GETSTATE, &vtstat) < 0) { + perror("tty is not virtual console"); + exit (1); + } + if (ioctl(vtfd, VT_OPENQRY, &vtnum) < 0) { + perror("no free virtual consoles"); + exit (1); + } + sprintf(device, "/dev/tty%d", vtnum); + if (access(device, (W_OK|R_OK)) < 0) { + perror("insufficient permission on tty"); + exit (1); + } + + ioctl(vtfd, VT_ACTIVATE, vtnum); + ioctl(vtfd, VT_WAITACTIVE, vtnum); + + close (vtfd); + vtfd = open(device, O_RDWR, 0); + do + { + if (ioctl(vtfd, KDSETMODE, KD_GRAPHICS) < 0) + { + perror("Could not set virtual console to KD_GRAPHICS mode."); + exit_value = 1; + break; + } + + owns_vt = TRUE; + if (ioctl(vtfd, VT_SETMODE, &mode) < 0) + { + perror("Could not set virtual console to VT_PROCESS mode."); + break; + } + + /* + * we are now free to directly access the framebuffer and take over the + * event subsystem. + */ + + u8g_Init(&u8g, &u8g_dev_linux_fb); + m2_Init(&main_menu, brickdm_event_source, m2_eh_6bs, m2_gh_u8g_bfs); + m2_SetU8g(&u8g, m2_u8g_box_icon); + m2_SetFont(0, u8g_font_7x13); + m2_SetFont(1, u8g_font_m2icon_9); + + loop = g_main_loop_new (NULL, FALSE); + g_timeout_add(100, timer_handler, NULL); + // TODO: glib >= 2.36 can handle user signals - this would be better as SIGUSR1 + g_unix_signal_add(SIGHUP, brickdm_sighup_handler, GINT_TO_POINTER(vtfd)); + g_unix_signal_add(SIGINT, brickdm_sigterm_handler, NULL); + g_unix_signal_add(SIGTERM, brickdm_sigterm_handler, NULL); + g_main_loop_run(loop); + brickdm_event_destroy(); + u8g_Stop(&u8g); + } while(FALSE); + + /* tear down and cleanup */ + mode.mode = VT_AUTO; + ioctl(vtfd, VT_SETMODE, &mode); + ioctl(vtfd, KDSETMODE, KD_TEXT); + if (owns_vt) { + ioctl(vtfd, VT_ACTIVATE, vtstat.v_active); + ioctl(vtfd, VT_WAITACTIVE, vtstat.v_active); + } + ioctl(vtfd, VT_DISALLOCATE, vtnum); + close(vtfd); + + return exit_value; +} diff --git a/brickdm.h b/brickdm.h new file mode 100644 index 0000000..bfea364 --- /dev/null +++ b/brickdm.h @@ -0,0 +1,9 @@ + +#ifndef __BRICKDM_H +#define __BRICKDM_H + +/* brickdm_input.c */ +extern uint8_t brickdm_event_source(m2_p ep, uint8_t msg); +extern void brickdm_event_destroy(void); + +#endif /* __BRICKDM_H */ \ No newline at end of file diff --git a/brickdm_event.c b/brickdm_event.c new file mode 100644 index 0000000..dbaae8e --- /dev/null +++ b/brickdm_event.c @@ -0,0 +1,290 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define BITS_PER_LONG (sizeof(long) * 8) + +struct udev *udev; +struct udev_monitor *udev_monitor; +GSList *event_device_list = NULL; +GSList *event_queue = NULL; +int ttyfd; + +struct event_device_info { + gchar *path; + int fd; +}; + +inline gboolean test_bit(int bit, const long unsigned *bytes) +{ + return bytes[bit / BITS_PER_LONG] & (1 << (bit % BITS_PER_LONG)); +} + +void destroy_event_device_info(gpointer data) +{ + struct event_device_info *info = data; + if (info) { + close(info->fd); + g_free(info->path); + g_free(data); + } +} + +void append_event_device(const gchar *path) +{ + struct event_device_info *info; + unsigned long evbit[(EV_CNT + BITS_PER_LONG + 1) / BITS_PER_LONG]; + + printf("Adding Device Node Path: %s\n", path); + info = g_try_new(struct event_device_info, 1); + if (!info) { + perror("Out of memory!"); + return; + } + + info->path = g_strdup(path); + info->fd = open(path, O_RDWR | O_NONBLOCK); + if (info->fd < 0) { + perror("Could not open file."); + destroy_event_device_info((gpointer)info); + return; + } + + /* check that device is a keyboard */ + ioctl(info->fd, EVIOCGBIT(0, sizeof(evbit)), evbit); + if (!test_bit(EV_KEY, evbit)) { + destroy_event_device_info((gpointer)info); + return; + } + + event_device_list = g_slist_append(event_device_list, (gpointer)info); +} + +gint compare_event_device_path(gconstpointer a, gconstpointer b) +{ + const struct event_device_info *info = a; + const char* path = b; + + return g_strcmp0(path, info->path); +} + +void remove_event_device(const char *path) +{ + GSList *item = + g_slist_find_custom(event_device_list, (gconstpointer)path, + compare_event_device_path); + struct event_device_info *info; + + if (!item) + return; + info = item->data; + if (info) { + printf("Removing Device Node Path: %s\n", path); + event_device_list = g_slist_remove(event_device_list, info); + destroy_event_device_info(info); + } +} + +void check_udev_monitor() +{ + int fd, ret; + fd_set fds; + struct timeval tv; + struct udev_device *dev; + const gchar *path, *action; + + fd = udev_monitor_get_fd(udev_monitor); + + FD_ZERO(&fds); + FD_SET(fd, &fds); + tv.tv_sec = 0; + tv.tv_usec = 0; + + ret = select(fd+1, &fds, NULL, NULL, &tv); + if (ret > 0 && FD_ISSET(fd, &fds)) { + dev = udev_monitor_receive_device(udev_monitor); + if (!dev) + return; + path = udev_device_get_devnode(dev); + if (!path) + return; + action = udev_device_get_action(dev); + if (!g_strcmp0(action, "add")) + append_event_device(path); + else if (!g_strcmp0(action, "remove")) + remove_event_device(path); + udev_device_unref(dev); + } +} + +void check_event_devices() +{ + GSList *dev = event_device_list; + struct event_device_info *info; + struct input_event event; + const int event_size = sizeof(struct input_event); + + event_queue = g_slist_reverse(event_queue); + while (dev) + { + info = dev->data; + while (read(info->fd, &event, event_size) == event_size) + { + /* only look at keyboard events */ + if (event.type != EV_KEY) + continue; + /* ignore key up event - other events are key down and autorepeat */ + if (event.value == 1) + continue; + event_queue = g_slist_prepend(event_queue, GINT_TO_POINTER(event.code)); + } + dev = g_slist_next(dev); + } + event_queue = g_slist_reverse(event_queue); +} + +/* + * Implements m2_es_fnptr (m2tklib event source) + */ +uint8_t brickdm_event_source(m2_p ep, uint8_t msg) +{ + struct udev_enumerate *udev_enum; + struct udev_list_entry *input_devices, *input_dev; + int code; + + switch(msg) + { + case M2_ES_MSG_GET_KEY: + check_udev_monitor(); + check_event_devices(); + if(!event_queue) + break; + code = GPOINTER_TO_INT(event_queue->data); + event_queue = g_slist_remove(event_queue, event_queue->data); + + switch (code) { + /* Actual keys on the EV3 */ + case KEY_UP: + return M2_KEY_EVENT(M2_KEY_DATA_UP); + case KEY_DOWN: + return M2_KEY_EVENT(M2_KEY_DATA_DOWN); + case KEY_LEFT: + return M2_KEY_EVENT(M2_KEY_PREV); + case KEY_RIGHT: + return M2_KEY_EVENT(M2_KEY_NEXT); + case KEY_ENTER: + return M2_KEY_EVENT(M2_KEY_SELECT); + case KEY_ESC: + return M2_KEY_EVENT(M2_KEY_EXIT); + + /* Other keys incase a keyboard or keypad is plugged in */ + case KEY_BACKSPACE: + return M2_KEY_EVENT(M2_KEY_EXIT); + case KEY_HOME: + return M2_KEY_EVENT(M2_KEY_HOME); + case KEY_F1: + return M2_KEY_EVENT(M2_KEY_Q1); + case KEY_F2: + return M2_KEY_EVENT(M2_KEY_Q2); + case KEY_F3: + return M2_KEY_EVENT(M2_KEY_Q3); + case KEY_F4: + return M2_KEY_EVENT(M2_KEY_Q4); + case KEY_F5: + return M2_KEY_EVENT(M2_KEY_Q5); + case KEY_F6: + return M2_KEY_EVENT(M2_KEY_Q6); + case KEY_0: + case KEY_KP0: + case KEY_NUMERIC_0: + return M2_KEY_EVENT(M2_KEY_0); + case KEY_1: + case KEY_KP1: + case KEY_NUMERIC_1: + return M2_KEY_EVENT(M2_KEY_1); + case KEY_2: + case KEY_KP2: + case KEY_NUMERIC_2: + return M2_KEY_EVENT(M2_KEY_2); + case KEY_3: + case KEY_KP3: + case KEY_NUMERIC_3: + return M2_KEY_EVENT(M2_KEY_3); + case KEY_4: + case KEY_KP4: + case KEY_NUMERIC_4: + return M2_KEY_EVENT(M2_KEY_4); + case KEY_5: + case KEY_KP5: + case KEY_NUMERIC_5: + return M2_KEY_EVENT(M2_KEY_5); + case KEY_6: + case KEY_KP6: + case KEY_NUMERIC_6: + return M2_KEY_EVENT(M2_KEY_6); + case KEY_7: + case KEY_KP7: + case KEY_NUMERIC_7: + return M2_KEY_EVENT(M2_KEY_7); + case KEY_8: + case KEY_KP8: + case KEY_NUMERIC_8: + return M2_KEY_EVENT(M2_KEY_8); + case KEY_9: + case KEY_KP9: + case KEY_NUMERIC_9: + return M2_KEY_EVENT(M2_KEY_9); + case KEY_NUMERIC_STAR: + return M2_KEY_EVENT(M2_KEY_STAR); + case KEY_NUMERIC_POUND: + return M2_KEY_EVENT(M2_KEY_HASH); + } + return M2_KEY_NONE; + case M2_ES_MSG_INIT: + udev = udev_new(); + if (!udev) { + perror("Can't create udev."); + return 1; + } + + udev_monitor = udev_monitor_new_from_netlink(udev, "udev"); + udev_monitor_filter_add_match_subsystem_devtype(udev_monitor, "input", NULL); + udev_monitor_enable_receiving(udev_monitor); + + udev_enum = udev_enumerate_new(udev); + if (udev_enumerate_add_match_subsystem(udev_enum, "input") < 0) { + perror("Could not enumerate udev input subsystem."); + } + udev_enumerate_scan_devices(udev_enum); + input_devices = udev_enumerate_get_list_entry(udev_enum); + udev_list_entry_foreach(input_dev, input_devices) { + struct udev_device *dev; + const char *path; + + path = udev_list_entry_get_name(input_dev); + dev = udev_device_new_from_syspath(udev, path); + path = udev_device_get_devnode(dev); + // only event devices have a dev node (i.e. /dev/input/event0). + if (!path) + continue; + append_event_device(path); + udev_device_unref(dev); + } + udev_enumerate_unref(udev_enum); + break; + } + return 0; +} + +void brickdm_event_destroy(void) +{ + udev_monitor_unref(udev_monitor); + udev_unref(udev); + g_slist_free_full(event_device_list, destroy_event_device_info); +} \ No newline at end of file From 292e89c46073afffbcf70d0ab481ffbb14941c2e Mon Sep 17 00:00:00 2001 From: David Lechner Date: Sun, 1 Jun 2014 18:07:58 +0000 Subject: [PATCH 03/11] Simplify makefile --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 19d8731..284c42f 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,10 @@ CFLAGS = -Wall `pkg-config --cflags glib-2.0` `pkg-config --cflags dbus-glib-1` - -OBJ = brickdm.o brickdm_event.o +LDLIBS = -lu8g -lm2tk -lglib-2.0 -ludev all: brickdm -brickdm: $(OBJ) - $(CC) -g -o $@ -lu8g -lm2tk -lglib-2.0 -ludev $? +brickdm: brickdm_event.o + +clean: + rm -f *.o \ No newline at end of file From b7a542fc1ca94a525c87bb4c711d012a349c1460 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Sun, 1 Jun 2014 18:09:48 +0000 Subject: [PATCH 04/11] try using tty for input instead of reading /dev/input/eventX --- brickdm_event.c | 367 +++++++++++++++++------------------------------- 1 file changed, 131 insertions(+), 236 deletions(-) diff --git a/brickdm_event.c b/brickdm_event.c index dbaae8e..5d11d8b 100644 --- a/brickdm_event.c +++ b/brickdm_event.c @@ -4,149 +4,30 @@ #include #include #include +#include +#include #include #include +#include #include -#define BITS_PER_LONG (sizeof(long) * 8) - -struct udev *udev; -struct udev_monitor *udev_monitor; -GSList *event_device_list = NULL; GSList *event_queue = NULL; int ttyfd; +struct termios term_old; +struct termios term_new; +int old_kbd_mode; -struct event_device_info { - gchar *path; - int fd; -}; - -inline gboolean test_bit(int bit, const long unsigned *bytes) -{ - return bytes[bit / BITS_PER_LONG] & (1 << (bit % BITS_PER_LONG)); -} - -void destroy_event_device_info(gpointer data) -{ - struct event_device_info *info = data; - if (info) { - close(info->fd); - g_free(info->path); - g_free(data); - } -} - -void append_event_device(const gchar *path) -{ - struct event_device_info *info; - unsigned long evbit[(EV_CNT + BITS_PER_LONG + 1) / BITS_PER_LONG]; - - printf("Adding Device Node Path: %s\n", path); - info = g_try_new(struct event_device_info, 1); - if (!info) { - perror("Out of memory!"); - return; - } - - info->path = g_strdup(path); - info->fd = open(path, O_RDWR | O_NONBLOCK); - if (info->fd < 0) { - perror("Could not open file."); - destroy_event_device_info((gpointer)info); - return; - } - - /* check that device is a keyboard */ - ioctl(info->fd, EVIOCGBIT(0, sizeof(evbit)), evbit); - if (!test_bit(EV_KEY, evbit)) { - destroy_event_device_info((gpointer)info); - return; - } - - event_device_list = g_slist_append(event_device_list, (gpointer)info); -} - -gint compare_event_device_path(gconstpointer a, gconstpointer b) -{ - const struct event_device_info *info = a; - const char* path = b; - - return g_strcmp0(path, info->path); -} - -void remove_event_device(const char *path) -{ - GSList *item = - g_slist_find_custom(event_device_list, (gconstpointer)path, - compare_event_device_path); - struct event_device_info *info; - - if (!item) - return; - info = item->data; - if (info) { - printf("Removing Device Node Path: %s\n", path); - event_device_list = g_slist_remove(event_device_list, info); - destroy_event_device_info(info); - } -} - -void check_udev_monitor() -{ - int fd, ret; - fd_set fds; - struct timeval tv; - struct udev_device *dev; - const gchar *path, *action; - - fd = udev_monitor_get_fd(udev_monitor); - - FD_ZERO(&fds); - FD_SET(fd, &fds); - tv.tv_sec = 0; - tv.tv_usec = 0; - - ret = select(fd+1, &fds, NULL, NULL, &tv); - if (ret > 0 && FD_ISSET(fd, &fds)) { - dev = udev_monitor_receive_device(udev_monitor); - if (!dev) - return; - path = udev_device_get_devnode(dev); - if (!path) - return; - action = udev_device_get_action(dev); - if (!g_strcmp0(action, "add")) - append_event_device(path); - else if (!g_strcmp0(action, "remove")) - remove_event_device(path); - udev_device_unref(dev); - } -} void check_event_devices() { - GSList *dev = event_device_list; - struct event_device_info *info; - struct input_event event; - const int event_size = sizeof(struct input_event); - + char c = 0; event_queue = g_slist_reverse(event_queue); - while (dev) - { - info = dev->data; - while (read(info->fd, &event, event_size) == event_size) - { - /* only look at keyboard events */ - if (event.type != EV_KEY) - continue; - /* ignore key up event - other events are key down and autorepeat */ - if (event.value == 1) - continue; - event_queue = g_slist_prepend(event_queue, GINT_TO_POINTER(event.code)); - } - dev = g_slist_next(dev); + while (read(ttyfd, &c, sizeof(char)) == sizeof(char)) { + event_queue = g_slist_prepend(event_queue, GINT_TO_POINTER(c)); } event_queue = g_slist_reverse(event_queue); + if (c) + printf("\n"); } /* @@ -154,129 +35,142 @@ void check_event_devices() */ uint8_t brickdm_event_source(m2_p ep, uint8_t msg) { - struct udev_enumerate *udev_enum; - struct udev_list_entry *input_devices, *input_dev; int code; + struct kbentry entry; switch(msg) { case M2_ES_MSG_GET_KEY: - check_udev_monitor(); check_event_devices(); if(!event_queue) break; code = GPOINTER_TO_INT(event_queue->data); event_queue = g_slist_remove(event_queue, event_queue->data); + if (code == '\e') { + do { + printf("%s\n", "parsing escape code"); + if(!event_queue) + break; + code = GPOINTER_TO_INT(event_queue->data); + if (code == '\e') + break; + printf("escape code: %c %d /0x%x\n", code, code, code); + event_queue = g_slist_remove(event_queue, event_queue->data); + if (code == '[') { + do { + printf("%s\n", "parsing CSI code"); + if(!event_queue) + break; + code = GPOINTER_TO_INT(event_queue->data); + if (code == '\e') + break; + event_queue = g_slist_remove(event_queue, event_queue->data); + printf("escape code: %c %d /0x%x\n", code, code, code); + switch (code) { + case 'A': + return M2_KEY_EVENT(M2_KEY_DATA_UP); + case 'B': + return M2_KEY_EVENT(M2_KEY_DATA_DOWN); + case 'C': + return M2_KEY_EVENT(M2_KEY_NEXT); + case 'D': + return M2_KEY_EVENT(M2_KEY_PREV); + } + return M2_KEY_NONE; + } while (0); + } + } while (0); + } + + printf("regular code: %c %d /0x%x %s\n", code & 0x7f, code & 0x7f, + code & 0x7f, code & 0x80 ? "released" : "pressed"); + entry.kb_table = K_NORMTAB; + entry.kb_index = code; + do { + ioctl(ttyfd, KDGKBENT, &entry); + printf("entry: %c %d /0x%x\n", entry.kb_value, entry.kb_value, entry.kb_value); + } while (entry.kb_table++ < K_ALTSHIFTTAB); switch (code) { /* Actual keys on the EV3 */ - case KEY_UP: - return M2_KEY_EVENT(M2_KEY_DATA_UP); - case KEY_DOWN: - return M2_KEY_EVENT(M2_KEY_DATA_DOWN); - case KEY_LEFT: - return M2_KEY_EVENT(M2_KEY_PREV); - case KEY_RIGHT: - return M2_KEY_EVENT(M2_KEY_NEXT); - case KEY_ENTER: + case'\n': return M2_KEY_EVENT(M2_KEY_SELECT); - case KEY_ESC: + case '\e': + case '\b': + case 127: return M2_KEY_EVENT(M2_KEY_EXIT); /* Other keys incase a keyboard or keypad is plugged in */ - case KEY_BACKSPACE: - return M2_KEY_EVENT(M2_KEY_EXIT); - case KEY_HOME: - return M2_KEY_EVENT(M2_KEY_HOME); - case KEY_F1: - return M2_KEY_EVENT(M2_KEY_Q1); - case KEY_F2: - return M2_KEY_EVENT(M2_KEY_Q2); - case KEY_F3: - return M2_KEY_EVENT(M2_KEY_Q3); - case KEY_F4: - return M2_KEY_EVENT(M2_KEY_Q4); - case KEY_F5: - return M2_KEY_EVENT(M2_KEY_Q5); - case KEY_F6: - return M2_KEY_EVENT(M2_KEY_Q6); - case KEY_0: - case KEY_KP0: - case KEY_NUMERIC_0: - return M2_KEY_EVENT(M2_KEY_0); - case KEY_1: - case KEY_KP1: - case KEY_NUMERIC_1: - return M2_KEY_EVENT(M2_KEY_1); - case KEY_2: - case KEY_KP2: - case KEY_NUMERIC_2: - return M2_KEY_EVENT(M2_KEY_2); - case KEY_3: - case KEY_KP3: - case KEY_NUMERIC_3: - return M2_KEY_EVENT(M2_KEY_3); - case KEY_4: - case KEY_KP4: - case KEY_NUMERIC_4: - return M2_KEY_EVENT(M2_KEY_4); - case KEY_5: - case KEY_KP5: - case KEY_NUMERIC_5: - return M2_KEY_EVENT(M2_KEY_5); - case KEY_6: - case KEY_KP6: - case KEY_NUMERIC_6: - return M2_KEY_EVENT(M2_KEY_6); - case KEY_7: - case KEY_KP7: - case KEY_NUMERIC_7: - return M2_KEY_EVENT(M2_KEY_7); - case KEY_8: - case KEY_KP8: - case KEY_NUMERIC_8: - return M2_KEY_EVENT(M2_KEY_8); - case KEY_9: - case KEY_KP9: - case KEY_NUMERIC_9: - return M2_KEY_EVENT(M2_KEY_9); - case KEY_NUMERIC_STAR: - return M2_KEY_EVENT(M2_KEY_STAR); - case KEY_NUMERIC_POUND: - return M2_KEY_EVENT(M2_KEY_HASH); + // case KEY_HOME: + // return M2_KEY_EVENT(M2_KEY_HOME); + // case KEY_F1: + // return M2_KEY_EVENT(M2_KEY_Q1); + // case KEY_F2: + // return M2_KEY_EVENT(M2_KEY_Q2); + // case KEY_F3: + // return M2_KEY_EVENT(M2_KEY_Q3); + // case KEY_F4: + // return M2_KEY_EVENT(M2_KEY_Q4); + // case KEY_F5: + // return M2_KEY_EVENT(M2_KEY_Q5); + // case KEY_F6: + // return M2_KEY_EVENT(M2_KEY_Q6); + // case KEY_0: + // case KEY_KP0: + // case KEY_NUMERIC_0: + // return M2_KEY_EVENT(M2_KEY_0); + // case KEY_1: + // case KEY_KP1: + // case KEY_NUMERIC_1: + // return M2_KEY_EVENT(M2_KEY_1); + // case KEY_2: + // case KEY_KP2: + // case KEY_NUMERIC_2: + // return M2_KEY_EVENT(M2_KEY_2); + // case KEY_3: + // case KEY_KP3: + // case KEY_NUMERIC_3: + // return M2_KEY_EVENT(M2_KEY_3); + // case KEY_4: + // case KEY_KP4: + // case KEY_NUMERIC_4: + // return M2_KEY_EVENT(M2_KEY_4); + // case KEY_5: + // case KEY_KP5: + // case KEY_NUMERIC_5: + // return M2_KEY_EVENT(M2_KEY_5); + // case KEY_6: + // case KEY_KP6: + // case KEY_NUMERIC_6: + // return M2_KEY_EVENT(M2_KEY_6); + // case KEY_7: + // case KEY_KP7: + // case KEY_NUMERIC_7: + // return M2_KEY_EVENT(M2_KEY_7); + // case KEY_8: + // case KEY_KP8: + // case KEY_NUMERIC_8: + // return M2_KEY_EVENT(M2_KEY_8); + // case KEY_9: + // case KEY_KP9: + // case KEY_NUMERIC_9: + // return M2_KEY_EVENT(M2_KEY_9); + // case KEY_NUMERIC_STAR: + // return M2_KEY_EVENT(M2_KEY_STAR); + // case KEY_NUMERIC_POUND: + // return M2_KEY_EVENT(M2_KEY_HASH); } return M2_KEY_NONE; case M2_ES_MSG_INIT: - udev = udev_new(); - if (!udev) { - perror("Can't create udev."); - return 1; - } - - udev_monitor = udev_monitor_new_from_netlink(udev, "udev"); - udev_monitor_filter_add_match_subsystem_devtype(udev_monitor, "input", NULL); - udev_monitor_enable_receiving(udev_monitor); - - udev_enum = udev_enumerate_new(udev); - if (udev_enumerate_add_match_subsystem(udev_enum, "input") < 0) { - perror("Could not enumerate udev input subsystem."); - } - udev_enumerate_scan_devices(udev_enum); - input_devices = udev_enumerate_get_list_entry(udev_enum); - udev_list_entry_foreach(input_dev, input_devices) { - struct udev_device *dev; - const char *path; - - path = udev_list_entry_get_name(input_dev); - dev = udev_device_new_from_syspath(udev, path); - path = udev_device_get_devnode(dev); - // only event devices have a dev node (i.e. /dev/input/event0). - if (!path) - continue; - append_event_device(path); - udev_device_unref(dev); - } - udev_enumerate_unref(udev_enum); + ttyfd = open("/dev/tty0", O_RDWR | O_NONBLOCK); + if (ttyfd < 0) + perror("Could not open /dev/tty"); + tcgetattr(ttyfd, &term_old); + memcpy(&term_new, &term_old, sizeof(struct termios)); + term_new.c_lflag &= ~(ECHO|ICANON); /* disable echo and canonization */ + tcsetattr(ttyfd, TCSANOW, &term_new); + ioctl(ttyfd, KDGKBMODE, &old_kbd_mode); + ioctl(ttyfd, KDSKBMODE, K_RAW); break; } return 0; @@ -284,7 +178,8 @@ uint8_t brickdm_event_source(m2_p ep, uint8_t msg) void brickdm_event_destroy(void) { - udev_monitor_unref(udev_monitor); - udev_unref(udev); - g_slist_free_full(event_device_list, destroy_event_device_info); + ioctl(ttyfd, KDSKBMODE, old_kbd_mode); + tcsetattr(ttyfd, TCSANOW, &term_old); + close(ttyfd); + g_slist_free(event_queue); } \ No newline at end of file From 07515a265ba4230d39e655d5ac075bd8b7d428a1 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Sun, 1 Jun 2014 21:04:43 +0000 Subject: [PATCH 05/11] use ncurses for keyboard input --- Makefile | 2 +- brickdm.c | 45 +++++++----- brickdm_event.c | 185 ------------------------------------------------ 3 files changed, 27 insertions(+), 205 deletions(-) delete mode 100644 brickdm_event.c diff --git a/Makefile b/Makefile index 284c42f..9430647 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ CFLAGS = -Wall `pkg-config --cflags glib-2.0` `pkg-config --cflags dbus-glib-1` -LDLIBS = -lu8g -lm2tk -lglib-2.0 -ludev +LDLIBS = -lu8g -lm2tk -lglib-2.0 -ludev -lncurses all: brickdm diff --git a/brickdm.c b/brickdm.c index b1e0f2f..84bc000 100644 --- a/brickdm.c +++ b/brickdm.c @@ -1,3 +1,4 @@ +#include #include #include #include @@ -26,7 +27,6 @@ GMainLoop *loop; u8g_t u8g; uint8_t needs_redraw = TRUE; int vtnum; -gboolean owns_vt = FALSE; gboolean brickdm_sigterm_handler(gpointer user_data) { @@ -38,25 +38,24 @@ gboolean brickdm_sighup_handler(gpointer user_data) { int vtfd = GPOINTER_TO_INT(user_data); struct vt_stat vtstat; - - if (owns_vt) { - if (ioctl(vtfd, VT_RELDISP, 1) == 0) - owns_vt = FALSE; - } else { + if (isendwin()) { if (ioctl(vtfd, VT_GETSTATE, &vtstat) == 0) { if (vtstat.v_active == vtnum) { ioctl(vtfd, VT_RELDISP, VT_ACKACQ); + refresh(); needs_redraw = TRUE; - owns_vt = TRUE; } } + } else { + if (ioctl(vtfd, VT_RELDISP, 1) == 0) + endwin(); } return TRUE; } gboolean timer_handler(gpointer user_data) { - if (owns_vt) { + if (!isendwin()) { m2_CheckKey(); needs_redraw |= m2_HandleKey(); if (needs_redraw) @@ -98,6 +97,8 @@ M2_ALIGN(main_menu, "-1|1W64H64", &main_menu_hlist); int main(void) { int vtfd; + FILE *in, *out; + SCREEN *term; char device[32]; struct vt_stat vtstat; int exit_value = 0; @@ -131,6 +132,11 @@ int main(void) close (vtfd); vtfd = open(device, O_RDWR, 0); + in = fdopen(vtfd, "r"); + out = fdopen(vtfd, "w"); + term = newterm("linux", in, out); + /* we are using ncurses for keyboard input only - see brickdm_event.c */ + do { if (ioctl(vtfd, KDSETMODE, KD_GRAPHICS) < 0) @@ -140,17 +146,14 @@ int main(void) break; } - owns_vt = TRUE; if (ioctl(vtfd, VT_SETMODE, &mode) < 0) { perror("Could not set virtual console to VT_PROCESS mode."); + exit_value = 1; break; } - /* - * we are now free to directly access the framebuffer and take over the - * event subsystem. - */ + /* we are now free to directly access the framebuffer */ u8g_Init(&u8g, &u8g_dev_linux_fb); m2_Init(&main_menu, brickdm_event_source, m2_eh_6bs, m2_gh_u8g_bfs); @@ -159,25 +162,29 @@ int main(void) m2_SetFont(1, u8g_font_m2icon_9); loop = g_main_loop_new (NULL, FALSE); - g_timeout_add(100, timer_handler, NULL); - // TODO: glib >= 2.36 can handle user signals - this would be better as SIGUSR1 + g_timeout_add(50, timer_handler, NULL); + // TODO: glib >= 2.36 can handle user signals + // This would be better as SIGUSR1 g_unix_signal_add(SIGHUP, brickdm_sighup_handler, GINT_TO_POINTER(vtfd)); g_unix_signal_add(SIGINT, brickdm_sigterm_handler, NULL); g_unix_signal_add(SIGTERM, brickdm_sigterm_handler, NULL); g_main_loop_run(loop); - brickdm_event_destroy(); u8g_Stop(&u8g); - } while(FALSE); + } while(0); /* tear down and cleanup */ + ioctl(vtfd, KDSETMODE, KD_TEXT); mode.mode = VT_AUTO; ioctl(vtfd, VT_SETMODE, &mode); - ioctl(vtfd, KDSETMODE, KD_TEXT); - if (owns_vt) { + if (!isendwin()) { + endwin(); ioctl(vtfd, VT_ACTIVATE, vtstat.v_active); ioctl(vtfd, VT_WAITACTIVE, vtstat.v_active); } ioctl(vtfd, VT_DISALLOCATE, vtnum); + delscreen(term); + fclose(in); + fclose(out); close(vtfd); return exit_value; diff --git a/brickdm_event.c b/brickdm_event.c deleted file mode 100644 index 5d11d8b..0000000 --- a/brickdm_event.c +++ /dev/null @@ -1,185 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -GSList *event_queue = NULL; -int ttyfd; -struct termios term_old; -struct termios term_new; -int old_kbd_mode; - - -void check_event_devices() -{ - char c = 0; - event_queue = g_slist_reverse(event_queue); - while (read(ttyfd, &c, sizeof(char)) == sizeof(char)) { - event_queue = g_slist_prepend(event_queue, GINT_TO_POINTER(c)); - } - event_queue = g_slist_reverse(event_queue); - if (c) - printf("\n"); -} - -/* - * Implements m2_es_fnptr (m2tklib event source) - */ -uint8_t brickdm_event_source(m2_p ep, uint8_t msg) -{ - int code; - struct kbentry entry; - - switch(msg) - { - case M2_ES_MSG_GET_KEY: - check_event_devices(); - if(!event_queue) - break; - code = GPOINTER_TO_INT(event_queue->data); - event_queue = g_slist_remove(event_queue, event_queue->data); - - if (code == '\e') { - do { - printf("%s\n", "parsing escape code"); - if(!event_queue) - break; - code = GPOINTER_TO_INT(event_queue->data); - if (code == '\e') - break; - printf("escape code: %c %d /0x%x\n", code, code, code); - event_queue = g_slist_remove(event_queue, event_queue->data); - if (code == '[') { - do { - printf("%s\n", "parsing CSI code"); - if(!event_queue) - break; - code = GPOINTER_TO_INT(event_queue->data); - if (code == '\e') - break; - event_queue = g_slist_remove(event_queue, event_queue->data); - printf("escape code: %c %d /0x%x\n", code, code, code); - switch (code) { - case 'A': - return M2_KEY_EVENT(M2_KEY_DATA_UP); - case 'B': - return M2_KEY_EVENT(M2_KEY_DATA_DOWN); - case 'C': - return M2_KEY_EVENT(M2_KEY_NEXT); - case 'D': - return M2_KEY_EVENT(M2_KEY_PREV); - } - return M2_KEY_NONE; - } while (0); - } - } while (0); - } - - printf("regular code: %c %d /0x%x %s\n", code & 0x7f, code & 0x7f, - code & 0x7f, code & 0x80 ? "released" : "pressed"); - entry.kb_table = K_NORMTAB; - entry.kb_index = code; - do { - ioctl(ttyfd, KDGKBENT, &entry); - printf("entry: %c %d /0x%x\n", entry.kb_value, entry.kb_value, entry.kb_value); - } while (entry.kb_table++ < K_ALTSHIFTTAB); - switch (code) { - /* Actual keys on the EV3 */ - case'\n': - return M2_KEY_EVENT(M2_KEY_SELECT); - case '\e': - case '\b': - case 127: - return M2_KEY_EVENT(M2_KEY_EXIT); - - /* Other keys incase a keyboard or keypad is plugged in */ - // case KEY_HOME: - // return M2_KEY_EVENT(M2_KEY_HOME); - // case KEY_F1: - // return M2_KEY_EVENT(M2_KEY_Q1); - // case KEY_F2: - // return M2_KEY_EVENT(M2_KEY_Q2); - // case KEY_F3: - // return M2_KEY_EVENT(M2_KEY_Q3); - // case KEY_F4: - // return M2_KEY_EVENT(M2_KEY_Q4); - // case KEY_F5: - // return M2_KEY_EVENT(M2_KEY_Q5); - // case KEY_F6: - // return M2_KEY_EVENT(M2_KEY_Q6); - // case KEY_0: - // case KEY_KP0: - // case KEY_NUMERIC_0: - // return M2_KEY_EVENT(M2_KEY_0); - // case KEY_1: - // case KEY_KP1: - // case KEY_NUMERIC_1: - // return M2_KEY_EVENT(M2_KEY_1); - // case KEY_2: - // case KEY_KP2: - // case KEY_NUMERIC_2: - // return M2_KEY_EVENT(M2_KEY_2); - // case KEY_3: - // case KEY_KP3: - // case KEY_NUMERIC_3: - // return M2_KEY_EVENT(M2_KEY_3); - // case KEY_4: - // case KEY_KP4: - // case KEY_NUMERIC_4: - // return M2_KEY_EVENT(M2_KEY_4); - // case KEY_5: - // case KEY_KP5: - // case KEY_NUMERIC_5: - // return M2_KEY_EVENT(M2_KEY_5); - // case KEY_6: - // case KEY_KP6: - // case KEY_NUMERIC_6: - // return M2_KEY_EVENT(M2_KEY_6); - // case KEY_7: - // case KEY_KP7: - // case KEY_NUMERIC_7: - // return M2_KEY_EVENT(M2_KEY_7); - // case KEY_8: - // case KEY_KP8: - // case KEY_NUMERIC_8: - // return M2_KEY_EVENT(M2_KEY_8); - // case KEY_9: - // case KEY_KP9: - // case KEY_NUMERIC_9: - // return M2_KEY_EVENT(M2_KEY_9); - // case KEY_NUMERIC_STAR: - // return M2_KEY_EVENT(M2_KEY_STAR); - // case KEY_NUMERIC_POUND: - // return M2_KEY_EVENT(M2_KEY_HASH); - } - return M2_KEY_NONE; - case M2_ES_MSG_INIT: - ttyfd = open("/dev/tty0", O_RDWR | O_NONBLOCK); - if (ttyfd < 0) - perror("Could not open /dev/tty"); - tcgetattr(ttyfd, &term_old); - memcpy(&term_new, &term_old, sizeof(struct termios)); - term_new.c_lflag &= ~(ECHO|ICANON); /* disable echo and canonization */ - tcsetattr(ttyfd, TCSANOW, &term_new); - ioctl(ttyfd, KDGKBMODE, &old_kbd_mode); - ioctl(ttyfd, KDSKBMODE, K_RAW); - break; - } - return 0; -} - -void brickdm_event_destroy(void) -{ - ioctl(ttyfd, KDSKBMODE, old_kbd_mode); - tcsetattr(ttyfd, TCSANOW, &term_old); - close(ttyfd); - g_slist_free(event_queue); -} \ No newline at end of file From 1aceef10926bb35fd6eac5b6413ac7e66a0806c0 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Sun, 1 Jun 2014 22:02:34 +0000 Subject: [PATCH 06/11] license --- COPYING | 674 ++++++++++++++++++++++++++++++++++++++++++++++ brickdm.c | 32 ++- brickdm.h | 19 +- brickdm_battery.c | 18 ++ brickdm_event.c | 113 ++++++++ 5 files changed, 853 insertions(+), 3 deletions(-) create mode 100644 COPYING create mode 100644 brickdm_battery.c create mode 100644 brickdm_event.c diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..94a9ed0 --- /dev/null +++ b/COPYING @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/brickdm.c b/brickdm.c index 84bc000..fcc771b 100644 --- a/brickdm.c +++ b/brickdm.c @@ -1,3 +1,33 @@ +/* + * brickdm -- Brick Display Manager for LEGO Mindstorms EV3/ev3dev + * + * Copyright (C) 2014 David Lechner + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/* + * brickdm.c: + * + * This is the main program. Functions in this file include: + * + * - Grabbing a free console for displaying graphics + * - Handling console switching + * - Initalizing library data structures + * - Processing the main event loop + */ + #include #include #include @@ -14,8 +44,6 @@ #include #include #include -#include -#include #include #include diff --git a/brickdm.h b/brickdm.h index bfea364..5d9945c 100644 --- a/brickdm.h +++ b/brickdm.h @@ -1,9 +1,26 @@ +/* + * brickdm -- Brick Display Manager for LEGO Mindstorms EV3/ev3dev + * + * Copyright (C) 2014 David Lechner + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ #ifndef __BRICKDM_H #define __BRICKDM_H /* brickdm_input.c */ extern uint8_t brickdm_event_source(m2_p ep, uint8_t msg); -extern void brickdm_event_destroy(void); #endif /* __BRICKDM_H */ \ No newline at end of file diff --git a/brickdm_battery.c b/brickdm_battery.c new file mode 100644 index 0000000..954e477 --- /dev/null +++ b/brickdm_battery.c @@ -0,0 +1,18 @@ +/* + * brickdm -- Brick Display Manager for LEGO Mindstorms EV3/ev3dev + * + * Copyright (C) 2014 David Lechner + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ \ No newline at end of file diff --git a/brickdm_event.c b/brickdm_event.c new file mode 100644 index 0000000..fa5a58c --- /dev/null +++ b/brickdm_event.c @@ -0,0 +1,113 @@ +/* + * brickdm -- Brick Display Manager for LEGO Mindstorms EV3/ev3dev + * + * Copyright (C) 2014 David Lechner + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/* + * brickdm_event.c: + * + * Implements an m2tk event source that gets keyboard input using the ncurses + * library. + */ + +#include +#include + +uint8_t brickdm_event_source(m2_p ep, uint8_t msg) +{ + switch(msg) + { + case M2_ES_MSG_GET_KEY: + switch (getch()) { + /* Actual keys on the EV3 */ + case KEY_DOWN: + return M2_KEY_EVENT(M2_KEY_DATA_DOWN); + case KEY_UP: + return M2_KEY_EVENT(M2_KEY_DATA_UP); + case KEY_LEFT: + return M2_KEY_EVENT(M2_KEY_PREV); + case KEY_RIGHT: + return M2_KEY_EVENT(M2_KEY_NEXT); + case '\n': + return M2_KEY_EVENT(M2_KEY_SELECT); + case KEY_BACKSPACE: + return M2_KEY_EVENT(M2_KEY_EXIT); + + /* Other keys incase a keyboard or keypad is plugged in */ + case KEY_BTAB: + case KEY_PREVIOUS: + return M2_KEY_EVENT(M2_KEY_PREV); + case KEY_NEXT: + return M2_KEY_EVENT(M2_KEY_NEXT); + case KEY_ENTER: + case KEY_COMMAND: + case KEY_OPEN: + return M2_KEY_EVENT(M2_KEY_SELECT); + case KEY_CANCEL: + case KEY_EXIT: + return M2_KEY_EVENT(M2_KEY_EXIT); + case KEY_HOME: + return M2_KEY_EVENT(M2_KEY_HOME); + case KEY_SHOME: + return M2_KEY_EVENT(M2_KEY_HOME2); + case KEY_F(1): + return M2_KEY_EVENT(M2_KEY_Q1); + case KEY_F(2): + return M2_KEY_EVENT(M2_KEY_Q2); + case KEY_F(3): + return M2_KEY_EVENT(M2_KEY_Q3); + case KEY_F(4): + return M2_KEY_EVENT(M2_KEY_Q4); + case KEY_F(5): + return M2_KEY_EVENT(M2_KEY_Q5); + case KEY_F(6): + return M2_KEY_EVENT(M2_KEY_Q6); + case '0': + return M2_KEY_EVENT(M2_KEY_0); + case '1': + return M2_KEY_EVENT(M2_KEY_1); + case '2': + return M2_KEY_EVENT(M2_KEY_2); + case '3': + return M2_KEY_EVENT(M2_KEY_3); + case '4': + return M2_KEY_EVENT(M2_KEY_4); + case '5': + return M2_KEY_EVENT(M2_KEY_5); + case '6': + return M2_KEY_EVENT(M2_KEY_6); + case '7': + return M2_KEY_EVENT(M2_KEY_7); + case '8': + return M2_KEY_EVENT(M2_KEY_8); + case '9': + return M2_KEY_EVENT(M2_KEY_9); + case '*': + return M2_KEY_EVENT(M2_KEY_STAR); + case '#': + return M2_KEY_EVENT(M2_KEY_HASH); + } + return M2_KEY_NONE; + case M2_ES_MSG_INIT: + cbreak(); + noecho(); + keypad(stdscr, TRUE); + nodelay(stdscr, TRUE); + break; + } + return 0; +} \ No newline at end of file From 98999a5d594dffc498bdd25eb702040725f82e43 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Mon, 2 Jun 2014 19:15:13 +0000 Subject: [PATCH 07/11] add basic support for battery status --- Makefile | 4 +- brickdm.c | 72 ++++++++++++------------ brickdm.h | 24 +++++++- brickdm_battery.c | 18 ------ brickdm_home.c | 47 ++++++++++++++++ brickdm_power.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 247 insertions(+), 56 deletions(-) delete mode 100644 brickdm_battery.c create mode 100644 brickdm_home.c create mode 100644 brickdm_power.c diff --git a/Makefile b/Makefile index 9430647..9c3cad7 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ CFLAGS = -Wall `pkg-config --cflags glib-2.0` `pkg-config --cflags dbus-glib-1` -LDLIBS = -lu8g -lm2tk -lglib-2.0 -ludev -lncurses +LDLIBS = -lu8g -lm2tk -lglib-2.0 -ludev -lncurses -lupower-glib all: brickdm -brickdm: brickdm_event.o +brickdm: brickdm_home.o brickdm_event.o brickdm_power.o clean: rm -f *.o \ No newline at end of file diff --git a/brickdm.c b/brickdm.c index fcc771b..0dc7600 100644 --- a/brickdm.c +++ b/brickdm.c @@ -41,19 +41,15 @@ #include #include -#include #include #include -#include -#include -#include - #include "brickdm.h" GMainLoop *loop; u8g_t u8g; -uint8_t needs_redraw = TRUE; +gboolean brickdm_needs_redraw = TRUE; +gboolean brickdm_show_statusbar = TRUE; int vtnum; gboolean brickdm_sigterm_handler(gpointer user_data) @@ -71,7 +67,7 @@ gboolean brickdm_sighup_handler(gpointer user_data) if (vtstat.v_active == vtnum) { ioctl(vtfd, VT_RELDISP, VT_ACKACQ); refresh(); - needs_redraw = TRUE; + brickdm_needs_redraw = TRUE; } } } else { @@ -85,42 +81,42 @@ gboolean timer_handler(gpointer user_data) { if (!isendwin()) { m2_CheckKey(); - needs_redraw |= m2_HandleKey(); - if (needs_redraw) + brickdm_needs_redraw |= m2_HandleKey(); + if (brickdm_needs_redraw) { u8g_BeginDraw(&u8g); m2_Draw(); + if (brickdm_show_statusbar) { + /* m2_draw can change colors on us */ + u8g_SetDefaultBackgroundColor(&u8g); + u8g_SetDefaultForegroundColor(&u8g); + brickdm_power_draw_battery_status(); + u8g_DrawLine(&u8g, 0, 15, u8g_GetWidth(&u8g), 15); + } u8g_EndDraw(&u8g); + brickdm_needs_redraw = FALSE; } - needs_redraw = 0; } return TRUE; } -M2_EXTERN_ALIGN(main_menu); - -M2_LABEL(battery_label, NULL, "Battery"); -M2_ROOT(goto_main, NULL, " Goto Main Menu ", &main_menu); -M2_LIST(battery_list) = { &battery_label, &goto_main }; -M2_VLIST(battery_dialog, NULL, battery_list); - -m2_menu_entry menu_data[] = { - { "Info", NULL }, - { ". Battery", &battery_dialog }, - { ". Network", &battery_dialog }, - { "Other", NULL }, - { NULL, NULL } -}; - -uint8_t main_menu_first = 0; -uint8_t main_menu_cnt = 6; - -M2_2LMENU(main_menu_menu, "l7e20W42", &main_menu_first, &main_menu_cnt, menu_data, '+', '-', '\0'); -M2_SPACE(main_menu_space, "W1h1"); -M2_VSB(main_menu_scroll, "l4W2r1", &main_menu_first, &main_menu_cnt); -M2_LIST(main_menu_list_data) = { &main_menu_menu, &main_menu_space, &main_menu_scroll }; -M2_HLIST(main_menu_hlist, NULL, main_menu_list_data); -M2_ALIGN(main_menu, "-1|1W64H64", &main_menu_hlist); +void brickdm_root_changed_callback(m2_rom_void_p new_root, + m2_rom_void_p old_root, uint8_t change_value) +{ + g_debug("%s: new_root: %p, old_root: %p, change_value: %d\n", __func__, + new_root, old_root, change_value); + /* This selects the previously selected item in the main menu */ + if (new_root == &brickdm_home_root) { + m2_menu_entry *entry = main_menu_data; + while (entry->label) { + if (entry->element == old_root) + break; + m2_SetKey(M2_KEY_NEXT); + m2_HandleKey(); + entry++; + } + } +} int main(void) { @@ -136,6 +132,8 @@ int main(void) .acqsig = SIGHUP, }; + g_type_init(); + vtfd = open("/dev/tty0", O_RDWR, 0); if (vtfd < 0) { perror("could not open /dev/tty0"); @@ -184,7 +182,8 @@ int main(void) /* we are now free to directly access the framebuffer */ u8g_Init(&u8g, &u8g_dev_linux_fb); - m2_Init(&main_menu, brickdm_event_source, m2_eh_6bs, m2_gh_u8g_bfs); + m2_Init(&brickdm_home_root, brickdm_event_source, m2_eh_6bs, m2_gh_u8g_bfs); + m2_SetRootChangeCallback(brickdm_root_changed_callback); m2_SetU8g(&u8g, m2_u8g_box_icon); m2_SetFont(0, u8g_font_7x13); m2_SetFont(1, u8g_font_m2icon_9); @@ -196,6 +195,9 @@ int main(void) g_unix_signal_add(SIGHUP, brickdm_sighup_handler, GINT_TO_POINTER(vtfd)); g_unix_signal_add(SIGINT, brickdm_sigterm_handler, NULL); g_unix_signal_add(SIGTERM, brickdm_sigterm_handler, NULL); + + brickdm_power_init(); + g_main_loop_run(loop); u8g_Stop(&u8g); } while(0); diff --git a/brickdm.h b/brickdm.h index 5d9945c..8b555fb 100644 --- a/brickdm.h +++ b/brickdm.h @@ -20,7 +20,29 @@ #ifndef __BRICKDM_H #define __BRICKDM_H -/* brickdm_input.c */ +#include +#include + +/* m2tk format string for root ALIGN elemets */ +#define BRICKDM_ROOT_FMT "-1|1W64H56" + +/* globals */ +extern u8g_t u8g; +extern gboolean brickdm_needs_redraw; + +/* brickdm_home.c */ +M2_EXTERN_ALIGN(brickdm_home_root); +extern m2_menu_entry main_menu_data[]; + +/* brickdm_power.c */ +M2_EXTERN_ALIGN(brickdm_battery_root); +extern void brickdm_power_init(void); +extern void brickdm_power_draw_battery_status(void); + +/* brickdm_event.c */ extern uint8_t brickdm_event_source(m2_p ep, uint8_t msg); +/* brickdm_graphcics.c */ +extern uint8_t brickdm_gh_bfs(m2_gfx_arg_p arg); + #endif /* __BRICKDM_H */ \ No newline at end of file diff --git a/brickdm_battery.c b/brickdm_battery.c deleted file mode 100644 index 954e477..0000000 --- a/brickdm_battery.c +++ /dev/null @@ -1,18 +0,0 @@ -/* - * brickdm -- Brick Display Manager for LEGO Mindstorms EV3/ev3dev - * - * Copyright (C) 2014 David Lechner - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ \ No newline at end of file diff --git a/brickdm_home.c b/brickdm_home.c new file mode 100644 index 0000000..6a4382f --- /dev/null +++ b/brickdm_home.c @@ -0,0 +1,47 @@ +/* + * brickdm -- Brick Display Manager for LEGO Mindstorms EV3/ev3dev + * + * Copyright (C) 2014 David Lechner + * + * based in part on GNOME Power Manager: + * Copyright (C) 2008-2011 Richard Hughes + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/* + * brickdm_home.c: + * + * The home sceen for brickdm. + */ + +#include "brickdm.h" + +m2_menu_entry main_menu_data[] = { + { "Info", NULL }, + { ". Battery", &brickdm_battery_root }, + { ". Network", &brickdm_battery_root }, + { NULL, NULL } +}; + +uint8_t main_menu_first = 0; +uint8_t main_menu_cnt = 6; + +M2_2LMENU(main_menu, "l7e20W42", &main_menu_first, &main_menu_cnt, + main_menu_data, '+', '-', '\0'); +M2_SPACE(main_menu_space, "W1h1"); +M2_VSB(main_menu_scroll, "l4w4r1", &main_menu_first, &main_menu_cnt); +M2_LIST(main_menu_list_data) = { &main_menu, &main_menu_space, &main_menu_scroll }; +M2_HLIST(main_menu_hlist, NULL, main_menu_list_data); +M2_ALIGN(brickdm_home_root, BRICKDM_ROOT_FMT, &main_menu_hlist); \ No newline at end of file diff --git a/brickdm_power.c b/brickdm_power.c new file mode 100644 index 0000000..169587d --- /dev/null +++ b/brickdm_power.c @@ -0,0 +1,138 @@ +/* + * brickdm -- Brick Display Manager for LEGO Mindstorms EV3/ev3dev + * + * Copyright (C) 2014 David Lechner + * + * based in part on GNOME Power Manager: + * Copyright (C) 2008-2011 Richard Hughes + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/* + * brickdm_power.c: + * + * Reads info from the battery and provide functions for displaying that info. + */ + +#include + +#include "brickdm.h" + +#define BRICKDM_POWER_EV3_BATTERY_PATH \ + "/org/freedesktop/UPower/devices/battery_legoev3_battery" +#define BATTERY_VOLTAGE_SIZE 6 +#define TECHNOLOGY_NAME_SIZE 30 + +gchar *current_device; +gchar battery_voltage[BATTERY_VOLTAGE_SIZE+1]; +gchar technology_name[TECHNOLOGY_NAME_SIZE+1]; + +M2_LABEL(battery_label, NULL, "Battery Info:"); +M2_BOX(battery_label_underline, "h1W48"); +M2_LABEL(technology_label, NULL, "Type:"); +M2_LABELP(technology_value, NULL, technology_name); +M2_LABEL(voltage_label, NULL, "Voltage:"); +M2_LABELP(voltage_value, NULL, battery_voltage); +M2_SPACE(grid_space, "w2"); +M2_LIST(data_grid_list_data) = { + &technology_label, &grid_space, &technology_value, + &voltage_label, &grid_space, &voltage_value, +}; +M2_GRIDLIST(data_gird_list, "c3", data_grid_list_data); +M2_ROOT(goto_stats_button, "f4", " Stats ", &brickdm_home_root); +M2_ROOT(goto_hist_button, "f4", " Hist ", &brickdm_home_root); +M2_ROOT(goto_main_button, "f4", " Back ", &brickdm_home_root); +M2_LIST(button_list_data) = { &goto_stats_button, &goto_hist_button, + &goto_main_button }; +M2_HLIST(button_hlist, NULL, button_list_data); +M2_SPACE(list_space, "h5"); +M2_LIST(battery_list_data) = { &battery_label, &battery_label_underline, + &list_space, &data_gird_list, &list_space, &button_hlist }; +M2_VLIST(battery_vlist, NULL, battery_list_data); +M2_ALIGN(brickdm_battery_root, BRICKDM_ROOT_FMT, &battery_vlist); + +void brickdm_power_draw_battery_status(void) +{ + const int batt_width = 20; + const int batt_height = 9; + const int end_y_ofs = 2; + const int end_width = 2; + const int x = u8g_GetWidth(&u8g) - batt_width - 5; + const int y = 5; + + u8g_DrawFrame(&u8g, x, y, batt_width, batt_height); + u8g_DrawBox(&u8g, x + batt_width, y + end_y_ofs, end_width, + batt_height - 2 * end_y_ofs); + + u8g_SetFont(&u8g, u8g_font_04b_03b); + u8g_DrawStr(&u8g, x + 2, y + batt_height - 2, battery_voltage); +} + +void brickdm_power_update_status(UpDevice *device) +{ + gdouble voltage; + UpDeviceTechnology technology; + + g_object_get(device, "voltage", &voltage, NULL); + g_snprintf(battery_voltage, BATTERY_VOLTAGE_SIZE, "%0.2f", voltage); + g_object_get(device, "technology", &technology, NULL); + g_strlcpy(technology_name, up_device_technology_to_string(technology), + TECHNOLOGY_NAME_SIZE); + brickdm_needs_redraw = TRUE; +} + +static void +brickdm_power_device_changed_cb (UpClient *client, UpDevice *device, + gpointer user_data) +{ + const gchar *object_path; + + object_path = up_device_get_object_path (device); + g_debug("changed: %s", object_path); + if (object_path == NULL) + return; + if (g_strcmp0(BRICKDM_POWER_EV3_BATTERY_PATH, object_path) == 0) + brickdm_power_update_status(device); +} + +void brickdm_power_init(void) +{ + UpClient *client; + GPtrArray *devices; + int ret, i; + + client = up_client_new(); + if (!client) { + g_warning("Could not get upower client."); + return; + } + ret = up_client_enumerate_devices_sync (client, NULL, NULL); + if (!ret) + return; + devices = up_client_get_devices (client); + for (i=0; i < devices->len; i++) { + UpDevice *device = g_ptr_array_index (devices, i); + UpDeviceKind kind; + const char* object_path; + + g_signal_connect(client, "device-changed", + G_CALLBACK(brickdm_power_device_changed_cb), NULL); + g_object_get(device, "kind", &kind, NULL); + object_path = up_device_get_object_path(device); + g_debug("Found %s at %s.\n", up_device_kind_to_string(kind), object_path); + if (g_strcmp0(BRICKDM_POWER_EV3_BATTERY_PATH, object_path) == 0) + brickdm_power_update_status(device); + } +} \ No newline at end of file From e378415e81f0c4b73c46a3654b995649cc25bb85 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Mon, 2 Jun 2014 22:03:26 +0000 Subject: [PATCH 08/11] better handling of navigation from screen to screen --- brickdm.c | 40 +++++++++++++++++++++---------- brickdm.h | 13 ++++++++-- brickdm_event.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++- brickdm_home.c | 10 ++++---- brickdm_power.c | 14 +++++++---- 5 files changed, 113 insertions(+), 27 deletions(-) diff --git a/brickdm.c b/brickdm.c index 0dc7600..8ad9913 100644 --- a/brickdm.c +++ b/brickdm.c @@ -48,6 +48,7 @@ GMainLoop *loop; u8g_t u8g; +GSList *root_stack = NULL; gboolean brickdm_needs_redraw = TRUE; gboolean brickdm_show_statusbar = TRUE; int vtnum; @@ -100,21 +101,33 @@ gboolean timer_handler(gpointer user_data) return TRUE; } +brickdm_root_info *brickdm_pop_root_stack(void) +{ + GSList *last_root = root_stack; + brickdm_root_info *info = NULL; + + if (last_root) { + GSList *dbg = last_root; + while(dbg) { + g_debug("root_stack:"); + g_debug("element: %p, value:%d", ((brickdm_root_info*)dbg->data)->element, + ((brickdm_root_info*)dbg->data)->value); + dbg = g_slist_next(dbg); + } + info = last_root->data; + root_stack = g_slist_delete_link(root_stack, last_root); + } + return info; +} + void brickdm_root_changed_callback(m2_rom_void_p new_root, m2_rom_void_p old_root, uint8_t change_value) { - g_debug("%s: new_root: %p, old_root: %p, change_value: %d\n", __func__, - new_root, old_root, change_value); - /* This selects the previously selected item in the main menu */ - if (new_root == &brickdm_home_root) { - m2_menu_entry *entry = main_menu_data; - while (entry->label) { - if (entry->element == old_root) - break; - m2_SetKey(M2_KEY_NEXT); - m2_HandleKey(); - entry++; - } + if (change_value != BRICKDM_MAX_USER_VALUE) { + brickdm_root_info *info = g_new(brickdm_root_info, 1); + info->element = old_root; + info->value = change_value; + root_stack = g_slist_prepend(root_stack, info); } } @@ -182,7 +195,8 @@ int main(void) /* we are now free to directly access the framebuffer */ u8g_Init(&u8g, &u8g_dev_linux_fb); - m2_Init(&brickdm_home_root, brickdm_event_source, m2_eh_6bs, m2_gh_u8g_bfs); + m2_Init(&brickdm_home_root, brickdm_event_source, brickdm_event_handler, + m2_gh_u8g_bfs); m2_SetRootChangeCallback(brickdm_root_changed_callback); m2_SetU8g(&u8g, m2_u8g_box_icon); m2_SetFont(0, u8g_font_7x13); diff --git a/brickdm.h b/brickdm.h index 8b555fb..76b131d 100644 --- a/brickdm.h +++ b/brickdm.h @@ -25,14 +25,21 @@ /* m2tk format string for root ALIGN elemets */ #define BRICKDM_ROOT_FMT "-1|1W64H56" +#define BRICKDM_MAX_USER_VALUE ((uint8_t)-1) -/* globals */ +struct _brickdm_root_info { + m2_rom_void_p element; + uint8_t value; +}; +typedef struct _brickdm_root_info brickdm_root_info; + +/* brickdm.c */ extern u8g_t u8g; extern gboolean brickdm_needs_redraw; +extern brickdm_root_info *brickdm_pop_root_stack(void); /* brickdm_home.c */ M2_EXTERN_ALIGN(brickdm_home_root); -extern m2_menu_entry main_menu_data[]; /* brickdm_power.c */ M2_EXTERN_ALIGN(brickdm_battery_root); @@ -41,6 +48,8 @@ extern void brickdm_power_draw_battery_status(void); /* brickdm_event.c */ extern uint8_t brickdm_event_source(m2_p ep, uint8_t msg); +extern uint8_t brickdm_event_handler(m2_p ep, uint8_t msg, uint8_t arg1, + uint8_t arg2); /* brickdm_graphcics.c */ extern uint8_t brickdm_gh_bfs(m2_gfx_arg_p arg); diff --git a/brickdm_event.c b/brickdm_event.c index fa5a58c..d11512d 100644 --- a/brickdm_event.c +++ b/brickdm_event.c @@ -3,6 +3,10 @@ * * Copyright (C) 2014 David Lechner * + * brickdm_event_handler() copied from m2eh6bs.c + * m2tklib = Mini Interative Interface Toolkit Library + * Copyright (C) 2011 olikraus@gmail.com + * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or @@ -27,6 +31,8 @@ #include #include +#include "brickdm.h" + uint8_t brickdm_event_source(m2_p ep, uint8_t msg) { switch(msg) @@ -110,4 +116,59 @@ uint8_t brickdm_event_source(m2_p ep, uint8_t msg) break; } return 0; -} \ No newline at end of file +} +#include +uint8_t brickdm_event_handler(m2_p ep, uint8_t msg, uint8_t arg1, uint8_t arg2) +{ + m2_nav_p nav = m2_get_nav(ep); + + switch(msg) { + case M2_EP_MSG_SELECT: + return m2_nav_user_down(nav, 1); + + case M2_EP_MSG_EXIT: + // if there is no valid parent, then go to the previous root + if (!m2_nav_user_up(nav)) { + brickdm_root_info *info = brickdm_pop_root_stack(); + if (info) { + m2_SetRootExtended(info->element, info->value, BRICKDM_MAX_USER_VALUE); + g_free(info); + } else { + // TODO: show shutdown dialog + } + } + return 1; + + case M2_EP_MSG_NEXT: + return m2_nav_user_next(nav); + + case M2_EP_MSG_PREV: + return m2_nav_user_prev(nav); + + case M2_EP_MSG_DATA_DOWN: + if ( m2_nav_data_down(nav) == 0 ) + return m2_nav_user_next(nav); + return 1; + + case M2_EP_MSG_DATA_UP: + if ( m2_nav_data_up(nav) == 0 ) + return m2_nav_user_prev(nav); + return 1; + } + + if (msg >= M2_KEY_Q1 && msg <= M2_KEY_LOOP_END) { + if (m2_nav_quick_key(nav, msg - M2_KEY_Q1 + 1) != 0) + { + if (m2_nav_is_data_entry(nav)) + return m2_nav_data_up(m2_get_nav(ep)); + return m2_nav_user_down(nav, 1); + } + } + + if (msg >= M2_EL_MSG_SPACE) { + m2_nav_prepare_fn_arg_current_element(nav); + m2_fn_arg_call(msg); // assign the char + return m2_nav_user_next(nav); // go to next position + } + return 0; +} diff --git a/brickdm_home.c b/brickdm_home.c index 6a4382f..8eb1e8d 100644 --- a/brickdm_home.c +++ b/brickdm_home.c @@ -28,18 +28,16 @@ #include "brickdm.h" -m2_menu_entry main_menu_data[] = { - { "Info", NULL }, - { ". Battery", &brickdm_battery_root }, - { ". Network", &brickdm_battery_root }, +m2_xmenu_entry main_menu_data[] = { + { "Battery", &brickdm_battery_root, NULL }, { NULL, NULL } }; uint8_t main_menu_first = 0; uint8_t main_menu_cnt = 6; -M2_2LMENU(main_menu, "l7e20W42", &main_menu_first, &main_menu_cnt, - main_menu_data, '+', '-', '\0'); +M2_X2LMENU(main_menu, "l7e20W42", &main_menu_first, &main_menu_cnt, + main_menu_data, '+', '-', '\0'); M2_SPACE(main_menu_space, "W1h1"); M2_VSB(main_menu_scroll, "l4w4r1", &main_menu_first, &main_menu_cnt); M2_LIST(main_menu_list_data) = { &main_menu, &main_menu_space, &main_menu_scroll }; diff --git a/brickdm_power.c b/brickdm_power.c index 169587d..ba201e6 100644 --- a/brickdm_power.c +++ b/brickdm_power.c @@ -39,6 +39,12 @@ gchar *current_device; gchar battery_voltage[BATTERY_VOLTAGE_SIZE+1]; gchar technology_name[TECHNOLOGY_NAME_SIZE+1]; +M2_LABEL(battery_hist_label, NULL, "History:"); +M2_ALIGN(brickdm_battery_hist_root, BRICKDM_ROOT_FMT, &battery_hist_label); + +M2_LABEL(battery_stats_label, NULL, "Statistics:"); +M2_ALIGN(brickdm_battery_stats_root, BRICKDM_ROOT_FMT, &battery_stats_label); + M2_LABEL(battery_label, NULL, "Battery Info:"); M2_BOX(battery_label_underline, "h1W48"); M2_LABEL(technology_label, NULL, "Type:"); @@ -51,11 +57,9 @@ M2_LIST(data_grid_list_data) = { &voltage_label, &grid_space, &voltage_value, }; M2_GRIDLIST(data_gird_list, "c3", data_grid_list_data); -M2_ROOT(goto_stats_button, "f4", " Stats ", &brickdm_home_root); -M2_ROOT(goto_hist_button, "f4", " Hist ", &brickdm_home_root); -M2_ROOT(goto_main_button, "f4", " Back ", &brickdm_home_root); -M2_LIST(button_list_data) = { &goto_stats_button, &goto_hist_button, - &goto_main_button }; +M2_ROOT(goto_hist_button, "f4", " Hist ", &brickdm_battery_hist_root); +M2_ROOT(goto_stats_button, "f4", " Stats ", &brickdm_battery_stats_root); +M2_LIST(button_list_data) = { &goto_hist_button, &goto_stats_button }; M2_HLIST(button_hlist, NULL, button_list_data); M2_SPACE(list_space, "h5"); M2_LIST(battery_list_data) = { &battery_label, &battery_label_underline, From 38e199fea1a17ce09f9ba1f6ad3896f40acf1f27 Mon Sep 17 00:00:00 2001 From: David Lechner Date: Mon, 2 Jun 2014 22:52:26 +0000 Subject: [PATCH 09/11] add shutdown and restart --- brickdm.c | 1 + brickdm.h | 1 + brickdm_home.c | 1 + brickdm_power.c | 31 ++++++++++++++++++++++++++++++- 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/brickdm.c b/brickdm.c index 8ad9913..cfd706d 100644 --- a/brickdm.c +++ b/brickdm.c @@ -201,6 +201,7 @@ int main(void) m2_SetU8g(&u8g, m2_u8g_box_icon); m2_SetFont(0, u8g_font_7x13); m2_SetFont(1, u8g_font_m2icon_9); + m2_SetU8gAdditionalTextXBorder(3); loop = g_main_loop_new (NULL, FALSE); g_timeout_add(50, timer_handler, NULL); diff --git a/brickdm.h b/brickdm.h index 76b131d..1dec0c5 100644 --- a/brickdm.h +++ b/brickdm.h @@ -43,6 +43,7 @@ M2_EXTERN_ALIGN(brickdm_home_root); /* brickdm_power.c */ M2_EXTERN_ALIGN(brickdm_battery_root); +M2_EXTERN_ALIGN(brickdm_shutdown_root); extern void brickdm_power_init(void); extern void brickdm_power_draw_battery_status(void); diff --git a/brickdm_home.c b/brickdm_home.c index 8eb1e8d..295ce40 100644 --- a/brickdm_home.c +++ b/brickdm_home.c @@ -30,6 +30,7 @@ m2_xmenu_entry main_menu_data[] = { { "Battery", &brickdm_battery_root, NULL }, + { "Shutdown", &brickdm_shutdown_root, NULL }, { NULL, NULL } }; diff --git a/brickdm_power.c b/brickdm_power.c index ba201e6..00ff0e8 100644 --- a/brickdm_power.c +++ b/brickdm_power.c @@ -39,6 +39,8 @@ gchar *current_device; gchar battery_voltage[BATTERY_VOLTAGE_SIZE+1]; gchar technology_name[TECHNOLOGY_NAME_SIZE+1]; +/* battery screen definitions */ + M2_LABEL(battery_hist_label, NULL, "History:"); M2_ALIGN(brickdm_battery_hist_root, BRICKDM_ROOT_FMT, &battery_hist_label); @@ -67,6 +69,17 @@ M2_LIST(battery_list_data) = { &battery_label, &battery_label_underline, M2_VLIST(battery_vlist, NULL, battery_list_data); M2_ALIGN(brickdm_battery_root, BRICKDM_ROOT_FMT, &battery_vlist); +/* shutdown screen definitions */ + +void shutdown_button_callback(m2_el_fnarg_p fnarg); +void restart_button_callback(m2_el_fnarg_p fnarg); + +M2_BUTTON(shutdown_button, "f12W32", "Shutdown", shutdown_button_callback); +M2_BUTTON(restart_button, "f12W32", "Restart", restart_button_callback); +M2_LIST(shutdown_list_data) = { &shutdown_button, &list_space, &restart_button }; +M2_VLIST(shutdown_vlist, NULL, shutdown_list_data); +M2_ALIGN(brickdm_shutdown_root, BRICKDM_ROOT_FMT, &shutdown_vlist); + void brickdm_power_draw_battery_status(void) { const int batt_width = 20; @@ -139,4 +152,20 @@ void brickdm_power_init(void) if (g_strcmp0(BRICKDM_POWER_EV3_BATTERY_PATH, object_path) == 0) brickdm_power_update_status(device); } -} \ No newline at end of file +} + +void run_command(const char *command) +{ + g_spawn_command_line_sync(command, NULL, NULL, NULL, NULL); + // TODO: would be nice to check for errors +} + +void shutdown_button_callback(m2_el_fnarg_p fnarg) +{ + run_command("poweroff"); +} + +void restart_button_callback(m2_el_fnarg_p fnarg) +{ + run_command("reboot"); +} From 579f842aa20b8ed5c60e1a415277f4da93aeff7c Mon Sep 17 00:00:00 2001 From: David Lechner Date: Tue, 3 Jun 2014 00:23:11 +0000 Subject: [PATCH 10/11] add shutdown and restart --- brickdm_power.c | 68 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 62 insertions(+), 6 deletions(-) diff --git a/brickdm_power.c b/brickdm_power.c index 00ff0e8..cb89766 100644 --- a/brickdm_power.c +++ b/brickdm_power.c @@ -34,19 +34,31 @@ "/org/freedesktop/UPower/devices/battery_legoev3_battery" #define BATTERY_VOLTAGE_SIZE 6 #define TECHNOLOGY_NAME_SIZE 30 +#define BATTERY_HIST_GRAPH_WIDTH 150 +#define BATTERY_HIST_GRAPH_HEIGHT 100 +#define BATTERY_HIST_GRAPH_FMT(width,height) "w"#width"h"#height gchar *current_device; gchar battery_voltage[BATTERY_VOLTAGE_SIZE+1]; gchar technology_name[TECHNOLOGY_NAME_SIZE+1]; +int battery_hist_data[BATTERY_HIST_GRAPH_WIDTH]; -/* battery screen definitions */ +/* battery history screen definitions */ + +void battery_hist_graph_callback(m2_el_fnargp_fnarg); M2_LABEL(battery_hist_label, NULL, "History:"); +M2_SPACECB(battery_hist_graph, BATTERY_HIST_GRAPH_FMT(BATTERY_HIST_GRAPH_WIDTH, + BATTERY_HIST_GRAPH_HEIGHT), battery_hist_graph_callback); M2_ALIGN(brickdm_battery_hist_root, BRICKDM_ROOT_FMT, &battery_hist_label); +/* battery screen definitions */ + M2_LABEL(battery_stats_label, NULL, "Statistics:"); M2_ALIGN(brickdm_battery_stats_root, BRICKDM_ROOT_FMT, &battery_stats_label); +/* battery statictics screen definitions */ + M2_LABEL(battery_label, NULL, "Battery Info:"); M2_BOX(battery_label_underline, "h1W48"); M2_LABEL(technology_label, NULL, "Type:"); @@ -59,7 +71,7 @@ M2_LIST(data_grid_list_data) = { &voltage_label, &grid_space, &voltage_value, }; M2_GRIDLIST(data_gird_list, "c3", data_grid_list_data); -M2_ROOT(goto_hist_button, "f4", " Hist ", &brickdm_battery_hist_root); +M2_BUTTON(goto_hist_button, "f4", " Hist ", battery_hist_button_callback); M2_ROOT(goto_stats_button, "f4", " Stats ", &brickdm_battery_stats_root); M2_LIST(button_list_data) = { &goto_hist_button, &goto_stats_button }; M2_HLIST(button_hlist, NULL, button_list_data); @@ -80,6 +92,45 @@ M2_LIST(shutdown_list_data) = { &shutdown_button, &list_space, &restart_button } M2_VLIST(shutdown_vlist, NULL, shutdown_list_data); M2_ALIGN(brickdm_shutdown_root, BRICKDM_ROOT_FMT, &shutdown_vlist); +gpm_point_obj_free + +void update_battery_hist_data(UpDevice *device) +{ + GPtrArray *array; + UpHistoryItem *item; + int i; + + array = up_device_get_history_sync(device, "rate", 3600, + BATTERY_HIST_GRAPH_WIDTH, NULL, NULL); + if(!array) { + g_debug("Failed to get history."); + // TODO: show error on screen + return; + } + for (i=0; ilen; i++) { + item = g_ptr_array_index(array, i); + battery_hist_data[i] = item->value; + } + brickdm_needs_redraw = TRUE; +} + +void battery_hist_button_callback(m2_el_fnarg_p fnarg) +{ + UpDevice *device = up_device_new(); + up_device_set_object_path_sync(device, BRICKDM_POWER_EV3_BATTERY_PATH, NULL, NULL); + update_battery_hist_data(device); + g_object_unref(device); + m2_SetRoot(&brickdm_battery_hist_root); +} + +void battery_hist_graph_callback(m2_el_fnarg_p fnarg) +{ + int i; + + for (i=0; i Date: Tue, 3 Jun 2014 18:38:18 +0000 Subject: [PATCH 11/11] add battery current and power display --- brickdm.c | 7 ------- brickdm.h | 1 + brickdm_power.c | 53 +++++++++++++++++++++++++++++++++---------------- 3 files changed, 37 insertions(+), 24 deletions(-) diff --git a/brickdm.c b/brickdm.c index cfd706d..301ba59 100644 --- a/brickdm.c +++ b/brickdm.c @@ -107,13 +107,6 @@ brickdm_root_info *brickdm_pop_root_stack(void) brickdm_root_info *info = NULL; if (last_root) { - GSList *dbg = last_root; - while(dbg) { - g_debug("root_stack:"); - g_debug("element: %p, value:%d", ((brickdm_root_info*)dbg->data)->element, - ((brickdm_root_info*)dbg->data)->value); - dbg = g_slist_next(dbg); - } info = last_root->data; root_stack = g_slist_delete_link(root_stack, last_root); } diff --git a/brickdm.h b/brickdm.h index 1dec0c5..847585d 100644 --- a/brickdm.h +++ b/brickdm.h @@ -36,6 +36,7 @@ typedef struct _brickdm_root_info brickdm_root_info; /* brickdm.c */ extern u8g_t u8g; extern gboolean brickdm_needs_redraw; +extern gboolean brickdm_show_statusbar; extern brickdm_root_info *brickdm_pop_root_stack(void); /* brickdm_home.c */ diff --git a/brickdm_power.c b/brickdm_power.c index cb89766..837a447 100644 --- a/brickdm_power.c +++ b/brickdm_power.c @@ -32,25 +32,30 @@ #define BRICKDM_POWER_EV3_BATTERY_PATH \ "/org/freedesktop/UPower/devices/battery_legoev3_battery" -#define BATTERY_VOLTAGE_SIZE 6 +#define BATTERY_STRING_SIZE 10 #define TECHNOLOGY_NAME_SIZE 30 #define BATTERY_HIST_GRAPH_WIDTH 150 #define BATTERY_HIST_GRAPH_HEIGHT 100 #define BATTERY_HIST_GRAPH_FMT(width,height) "w"#width"h"#height gchar *current_device; -gchar battery_voltage[BATTERY_VOLTAGE_SIZE+1]; +gchar battery_voltage[BATTERY_STRING_SIZE+1]; +gchar battery_voltage2[BATTERY_STRING_SIZE+1]; +gchar battery_current[BATTERY_STRING_SIZE+1]; +gchar battery_power[BATTERY_STRING_SIZE+1]; gchar technology_name[TECHNOLOGY_NAME_SIZE+1]; -int battery_hist_data[BATTERY_HIST_GRAPH_WIDTH]; +gdouble battery_hist_data[BATTERY_HIST_GRAPH_WIDTH]; /* battery history screen definitions */ -void battery_hist_graph_callback(m2_el_fnargp_fnarg); +void battery_hist_graph_callback(m2_el_fnarg_p fnarg); M2_LABEL(battery_hist_label, NULL, "History:"); M2_SPACECB(battery_hist_graph, BATTERY_HIST_GRAPH_FMT(BATTERY_HIST_GRAPH_WIDTH, BATTERY_HIST_GRAPH_HEIGHT), battery_hist_graph_callback); -M2_ALIGN(brickdm_battery_hist_root, BRICKDM_ROOT_FMT, &battery_hist_label); +M2_LIST(battery_hist_list_data) = { &battery_hist_label, &battery_hist_graph }; +M2_VLIST(battery_hist_vlist, NULL, battery_hist_list_data); +M2_ALIGN(brickdm_battery_hist_root, BRICKDM_ROOT_FMT, &battery_hist_vlist); /* battery screen definitions */ @@ -59,16 +64,24 @@ M2_ALIGN(brickdm_battery_stats_root, BRICKDM_ROOT_FMT, &battery_stats_label); /* battery statictics screen definitions */ +void battery_hist_button_callback(m2_el_fnarg_p fnarg); + M2_LABEL(battery_label, NULL, "Battery Info:"); M2_BOX(battery_label_underline, "h1W48"); M2_LABEL(technology_label, NULL, "Type:"); M2_LABELP(technology_value, NULL, technology_name); M2_LABEL(voltage_label, NULL, "Voltage:"); M2_LABELP(voltage_value, NULL, battery_voltage); +M2_LABEL(current_label, NULL, "Current:"); +M2_LABELP(current_value, NULL, battery_current); +M2_LABEL(power_label, NULL, "Power:"); +M2_LABELP(power_value, NULL, battery_power); M2_SPACE(grid_space, "w2"); M2_LIST(data_grid_list_data) = { &technology_label, &grid_space, &technology_value, &voltage_label, &grid_space, &voltage_value, + ¤t_label, &grid_space, ¤t_value, + &power_label, &grid_space, &power_value, }; M2_GRIDLIST(data_gird_list, "c3", data_grid_list_data); M2_BUTTON(goto_hist_button, "f4", " Hist ", battery_hist_button_callback); @@ -92,14 +105,13 @@ M2_LIST(shutdown_list_data) = { &shutdown_button, &list_space, &restart_button } M2_VLIST(shutdown_vlist, NULL, shutdown_list_data); M2_ALIGN(brickdm_shutdown_root, BRICKDM_ROOT_FMT, &shutdown_vlist); -gpm_point_obj_free - void update_battery_hist_data(UpDevice *device) { GPtrArray *array; UpHistoryItem *item; int i; + g_debug("Getting history."); array = up_device_get_history_sync(device, "rate", 3600, BATTERY_HIST_GRAPH_WIDTH, NULL, NULL); if(!array) { @@ -109,8 +121,11 @@ void update_battery_hist_data(UpDevice *device) } for (i=0; ilen; i++) { item = g_ptr_array_index(array, i); - battery_hist_data[i] = item->value; + battery_hist_data[i] = up_history_item_get_value (item); + g_debug("time: %d, state: %d, value: %.2f", up_history_item_get_time(item), + up_history_item_get_state (item), battery_hist_data[i]); } + g_ptr_array_unref (array); brickdm_needs_redraw = TRUE; } @@ -126,9 +141,9 @@ void battery_hist_button_callback(m2_el_fnarg_p fnarg) void battery_hist_graph_callback(m2_el_fnarg_p fnarg) { int i; - + g_debug("Drawing graph."); for (i=0; i