diff options
author | Olliver Schinagl <o.schinagl@ultimaker.com> | 2015-06-08 10:57:50 (GMT) |
---|---|---|
committer | Olliver Schinagl <o.schinagl@ultimaker.com> | 2015-06-12 05:30:15 (GMT) |
commit | b632373ddb4ab47f22d6d22665804efbb2bfe99d (patch) | |
tree | db86a500d14a30b3f7cb1793544675cf320c450e /src | |
parent | bdc5874629ac6987e8f9a91606604a7b4e18005c (diff) | |
download | eulogium-b632373ddb4ab47f22d6d22665804efbb2bfe99d.zip eulogium-b632373ddb4ab47f22d6d22665804efbb2bfe99d.tar.gz eulogium-b632373ddb4ab47f22d6d22665804efbb2bfe99d.tar.bz2 |
[griffin.display] add a bunch of empty menu items
Signed-off-by: Olliver Schinagl <o.schinagl@ultimaker.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/eulogium.c | 716 |
1 files changed, 695 insertions, 21 deletions
diff --git a/src/eulogium.c b/src/eulogium.c index b6d819a..ef97211 100644 --- a/src/eulogium.c +++ b/src/eulogium.c @@ -54,6 +54,11 @@ static void _but_settings_hotend_2_cb(void *data, Evas_Object *object EINA_UNUSE static void _but_change_hotend_1_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED); static void _but_change_hotend_2_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED); static void _but_network_stats_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_settings_network_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_settings_language_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_settings_hotend_1_offset_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_settings_hotend_2_offset_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_material_customize_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); /* Buttons */ static struct button_def but_return = { @@ -312,7 +317,7 @@ static struct menu_def menu_system_settings = { .end = NULL, .footer = "Change language", .footer_alt = NULL, - .func = NULL, + .func = &_but_settings_language_cb, .toggle_timer = NULL, .data = NULL, }, { @@ -321,7 +326,7 @@ static struct menu_def menu_system_settings = { .end = NULL, .footer = "Manage connectivity", .footer_alt = "WiFi & Ethernet", - .func = &_but_network_stats_cb, + .func = &_but_settings_network_cb, .toggle_timer = NULL, .data = NULL, }, { @@ -330,7 +335,7 @@ static struct menu_def menu_system_settings = { .end = NULL, .footer = "Adjust offset", .footer_alt = NULL, - .func = NULL, + .func = &_but_settings_hotend_1_offset_cb, .toggle_timer = NULL, .data = NULL, /* hot end 1 pointer? */ }, { @@ -339,7 +344,7 @@ static struct menu_def menu_system_settings = { .end = NULL, .footer = "Adjust offset", .footer_alt = NULL, - .func = NULL, + .func = &_but_settings_hotend_2_offset_cb, .toggle_timer = NULL, .data = NULL, /* hot end 2 pointer? */ }, { @@ -445,6 +450,7 @@ static struct menu_def menu_settings_network = { .label = "Network info", .end = NULL, .footer = NULL, + .footer_alt = NULL, .func = &_but_network_stats_cb, .toggle_timer = NULL, .data = NULL, @@ -452,7 +458,8 @@ static struct menu_def menu_settings_network = { .icon = NULL, .label = "Manage WiFi", .end = NULL, - .footer = NULL, + .footer = "Connect or forget", + .footer_alt = NULL, .func = NULL, .toggle_timer = NULL, .data = NULL, @@ -461,6 +468,7 @@ static struct menu_def menu_settings_network = { .label = "WiFi", .end = NULL, .footer = NULL, + .footer_alt = NULL, .func = NULL, .toggle_timer = NULL, .data = NULL, @@ -469,13 +477,323 @@ static struct menu_def menu_settings_network = { .label = "Ethernet", .end = NULL, .footer = NULL, + .footer_alt = NULL, .func = NULL, .toggle_timer = NULL, .data = NULL, }, { + .icon = NULL, .label = "Hotspot", .footer = NULL, + .footer_alt = NULL, + .end = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { NULL }, /* sentinel */ + }, + .data = NULL, +}; + +/* TODO: generate this table based on available/installed PO's */ +static struct menu_def menu_settings_language = { + .title = "LANGUAGE", + .type = LIST_MENU, + .entry = { + { + .icon = "user-home", + .label = "Return", + .end = NULL, + .footer = "Return to Main menu", + .footer_alt = NULL, + .func = &_cb_content_prev_set, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "English", + .end = NULL, + .footer = "Change to English", + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { NULL }, /* sentinel */ + }, + .data = NULL, +}; + +static struct menu_def menu_settings_hotend_1_offset = { + .title = "HOTEND 1 OFFSET", + .type = LIST_MENU, + .entry = { + { + .icon = "user-home", + .label = "Return", + .end = NULL, + .footer = "Return to Main menu", + .footer_alt = NULL, + .func = &_cb_content_prev_set, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Calibrate", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "X Offset - 0.02", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Y Offset - 0.02", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Z Offset - 0.02", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Load from Hotend", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Reset", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { NULL }, /* sentinel */ + }, + .data = NULL, +}; + +static struct menu_def menu_settings_hotend_2_offset = { + .title = "HOTEND 2 OFFSET", + .type = LIST_MENU, + .entry = { + { + .icon = "user-home", + .label = "Return", + .end = NULL, + .footer = "Return to Main menu", + .footer_alt = NULL, + .func = &_cb_content_prev_set, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Calibrate", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "X Offset - 0.02", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Y Offset - 0.02", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Z Offset - 0.02", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Load from Hotend", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Reset", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { NULL }, /* sentinel */ + }, + .data = NULL, +}; + +static struct menu_def menu_system_maintenance = { + .title = "MAINTENANCE", + .type = LIST_MENU, + .entry = { + { + .icon = "user-home", + .label = "Return", + .end = NULL, + .footer = "Return to Main menu", + .footer_alt = NULL, + .func = &_cb_content_prev_set, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Run network wizard", + .end = NULL, + .footer = "Connect to WiFi", + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Level buildplate", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Heatup buildplate", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Lower buildplate", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Raise buildplate", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Home head", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Printhead tray", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Heatup hotend 1", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Heatup hotend 2", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Set fan speed", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Move material", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Runtime stats", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Factory reset", .end = NULL, + .footer = "Reset all settings", + .footer_alt = "to their defaults", .func = NULL, .toggle_timer = NULL, .data = NULL, @@ -484,6 +802,307 @@ static struct menu_def menu_settings_network = { .data = NULL, }; +/* TODO this menu probably will be way more dynamic and will likely get replaced */ +static struct menu_def menu_material_1 = { + .title = "MATERIAL 1", + .type = LIST_MENU, + .entry = { + { + .icon = "user-home", + .label = "Return", + .end = NULL, + .footer = "Return to Main menu", + .footer_alt = NULL, + .func = &_cb_content_prev_set, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "PLA", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "ABS", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "UPET", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "CUSTOM", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "CUSTOM3", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "CUSTOMIZE", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = &_but_material_customize_cb, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "EXPORT", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "IMPORT", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { NULL }, /* sentinel */ + }, + .data = NULL, +}; + +static struct menu_def menu_material_2 = { + .title = "MATERIAL 2", + .type = LIST_MENU, + .entry = { + { + .icon = "user-home", + .label = "Return", + .end = NULL, + .footer = "Return to Main menu", + .footer_alt = NULL, + .func = &_cb_content_prev_set, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "PLA", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "ABS", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "UPET", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "CUSTOM", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "CUSTOM3", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "CUSTOMIZE", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "EXPORT", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "IMPORT", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { NULL }, /* sentinel */ + }, + .data = NULL, +}; + +static struct menu_def menu_material_customize = { + .title = "CUSTOM MATERIALS", + .type = LIST_MENU, + .entry = { + { + .icon = "user-home", + .label = "Return", + .end = NULL, + .footer = "Return to Main menu", + .footer_alt = NULL, + .func = &_cb_content_prev_set, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Temperature", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Heated buildplate", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Diameter", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Cooling fan", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Flow rate", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Color", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Brand", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Save as preset", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { NULL }, /* sentinel */ + }, + .data = NULL, +}; + +#if 0 +menu template; TODO make nice macro for entries +static struct menu_def menu_ = { + .title = "", + .type = LIST_MENU, + .entry = { + { + .icon = "user-home", + .label = "Return", + .end = NULL, + .footer = "Return to Main menu", + .footer_alt = NULL, + .func = &_cb_content_prev_set, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { NULL }, /* sentinel */ + }, + .data = NULL, +}; +#endif + static void eulogium_print_data_clear(struct eulogium_data *eulogium) { if (eulogium->progress_data_refresh) @@ -550,21 +1169,16 @@ static void _print_abort_cb(void *data, Evas_Object *obj EINA_UNUSED, void *even eldbus_proxy_call(eulogium->dbus.proxy[HARMA], "abortPrint", _on_print_abort_ret, eulogium, -1, ""); } -static void _on_blink_ret(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED) -{ - const char *errname, *errmsg; - - if (eldbus_message_error_get(msg, &errname, &errmsg)) { - EINA_LOG_ERR("%s %s", errname, errmsg); - return; - } -} - static void _but_system_maintenance_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { struct eulogium_data *eulogium = data; - printf("But build-plate\n"); -eldbus_proxy_call(eulogium->dbus.proxy[LED], "blink", _on_blink_ret, NULL, -1, ""); + Evas_Object *content; + + printf("But sys maint\n"); + content = menu_widget_list(eulogium, eulogium->navi, &menu_system_maintenance); + if (!content) + return; + elm_naviframe_item_simple_push(eulogium->navi, content); } static void _but_material_change_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) @@ -705,6 +1319,17 @@ static void _cb_button_main_print(void *data, Evas_Object *object EINA_UNUSED, v return; elm_naviframe_item_simple_push(eulogium->navi, content); } +} + + +/* TODO Make macro for all the simple entries */ +static void _but_settings_network_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + struct eulogium_data *eulogium = data; + Evas_Object *content = NULL; + + printf("But settings network settings\n"); + content = menu_widget_list(eulogium, eulogium->navi, &menu_settings_network); if (!content) return; elm_naviframe_item_simple_push(eulogium->navi, content); @@ -722,6 +1347,42 @@ static void _but_system_settings_cb(void *data, Evas_Object *obj EINA_UNUSED, vo elm_naviframe_item_simple_push(eulogium->navi, content); } +static void _but_settings_hotend_1_offset_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + struct eulogium_data *eulogium = data; + Evas_Object *content = NULL; + + printf("But settings hotend 1 offset settings\n"); + content = menu_widget_list(eulogium, eulogium->navi, &menu_settings_hotend_1_offset); + if (!content) + return; + elm_naviframe_item_simple_push(eulogium->navi, content); +} + +static void _but_settings_hotend_2_offset_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + struct eulogium_data *eulogium = data; + Evas_Object *content = NULL; + + printf("But settings hotend 2 offset settings\n"); + content = menu_widget_list(eulogium, eulogium->navi, &menu_settings_hotend_2_offset); + if (!content) + return; + elm_naviframe_item_simple_push(eulogium->navi, content); +} + +static void _but_settings_language_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + struct eulogium_data *eulogium = data; + Evas_Object *content = NULL; + + printf("But menu language settings\n"); + content = menu_widget_list(eulogium, eulogium->navi, &menu_settings_language); + if (!content) + return; + elm_naviframe_item_simple_push(eulogium->navi, content); +} + static void _but_network_stats_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { struct eulogium_data *eulogium = data; @@ -766,7 +1427,7 @@ static void _but_settings_material_1_cb(void *data, Evas_Object *object EINA_UNU printf("Button matts settings 1 pressed\n"); - content = eulogium_tripple_button_menu(eulogium->navi, &but_return, &but_return, &but_return); + content = menu_widget_list(eulogium, eulogium->navi, &menu_material_1); if (!content) return; elm_naviframe_item_simple_push(eulogium->navi, content); @@ -779,7 +1440,20 @@ static void _but_settings_material_2_cb(void *data, Evas_Object *object EINA_UNU printf("Button matts settings 2 pressed\n"); - content = eulogium_tripple_button_menu(eulogium->navi, &but_return, &but_return, &but_return); + content = menu_widget_list(eulogium, eulogium->navi, &menu_material_2); + if (!content) + return; + elm_naviframe_item_simple_push(eulogium->navi, content); +} + +static void _but_material_customize_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED) +{ + struct eulogium_data *eulogium = data; + Evas_Object *content; + + printf("Button matts customize pressed\n"); + + content = menu_widget_list(eulogium, eulogium->navi, &menu_material_customize); if (!content) return; elm_naviframe_item_simple_push(eulogium->navi, content); @@ -844,7 +1518,7 @@ static void _but_settings_hotend_1_cb(void *data, Evas_Object *object EINA_UNUSE printf("Button hotend settings 1 pressed\n"); - content = eulogium_tripple_button_menu(eulogium->navi, &but_return, &but_return, &but_return); + content = menu_widget_list(eulogium, eulogium->navi, &menu_settings_hotend_1_offset); if (!content) return; elm_naviframe_item_simple_push(eulogium->navi, content); @@ -857,7 +1531,7 @@ static void _but_settings_hotend_2_cb(void *data, Evas_Object *object EINA_UNUSE printf("Button hotend settings 2 pressed\n"); - content = eulogium_tripple_button_menu(eulogium->navi, &but_return, &but_return, &but_return); + content = menu_widget_list(eulogium, eulogium->navi, &menu_settings_hotend_1_offset); if (!content) return; elm_naviframe_item_simple_push(eulogium->navi, content); |