diff options
Diffstat (limited to 'src/eulogium.c')
| -rw-r--r-- | src/eulogium.c | 2241 |
1 files changed, 1403 insertions, 838 deletions
diff --git a/src/eulogium.c b/src/eulogium.c index 280e204..973965e 100644 --- a/src/eulogium.c +++ b/src/eulogium.c @@ -16,40 +16,26 @@ #include "dbus_common.h" #include "eulogium.h" #include "eulogium_item_list.h" -#include "eulogium_private.h" #include "gettext.h" +#include "network.h" +#include "print_data.h" #include "procedures.h" +#include "settings_data.h" +#include "ui_input.h" #include "ui_widgets.h" #define COPYRIGHT "Copyright © 2015 Olliver Schinagl <o.schinagl@ultimaker.com> and various contributors (see AUTHORS)." -#define SECOND 1UL -#define MINUTE (60UL * SECOND) -#define HOUR (60UL * MINUTE) -#define DAY (24UL * HOUR) -#define WEEK (7UL * DAY) -#define MONTH (4UL * WEEK) -#define YEAR (52UL * WEEK) - -int INPUT_MOUSE_WHEEL_UP = 0; /* For custom ecore_event handling */ -int INPUT_MOUSE_WHEEL_DOWN = 0; /* For custom ecore_event handling */ - -/* TODO this LUT can be much improved */ -char *griffin_print_status[] = { - gettext_noop("Unknown"), - gettext_noop("Disconnected"), - gettext_noop("Error"), - gettext_noop("First Run Wizard"), - gettext_noop("IDLE"), - gettext_noop("Slicing"), - gettext_noop("Heating"), - gettext_noop("Printing"), - gettext_noop("Cooling down"), - gettext_noop("Wait for Removal"), - gettext_noop("Paused"), -}; +#define SECOND 1L +#define MINUTE (60L * SECOND) +#define HOUR (60L * MINUTE) +#define DAY (24L * HOUR) +#define WEEK (7L * DAY) +#define MONTH (4L * WEEK) +#define YEAR (52L * WEEK) /* TODO Create def for a menu/screen to house all the buttons */ +/* BTN is better then but-sex. */ static void _on_print_abort_ret(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED); static void _cb_content_prev_set(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); @@ -82,6 +68,7 @@ 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_info_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_software_version_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); @@ -89,13 +76,39 @@ static void _but_settings_hotend_2_offset_cb(void *data, Evas_Object *obj EINA_U static void _but_material_customize_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); static void _but_print_tune_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); static void _but_settings_led_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_led_hue_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_led_saturation_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); static void _but_led_brightness_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_bed_heatup_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_hotend_heatup_0_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_hotend_heatup_1_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_print_speed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_fan_speed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_flow_rate_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_retraction_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_retraction_length_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_retraction_speed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_retraction_zhop_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_bed_level_auto_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_bed_raise_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_bed_move_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_bed_home_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_head_home_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_material_move_0_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_material_move_1_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_motion_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_jerk_xy_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_jerk_z_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_current_xy_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_current_z_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_current_e_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); +static void _but_hotend_active_set_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED); /* Buttons */ static struct button_def but_return = { - .text = gettext_noop("RETURN"), + .text = N_("RETURN"), .cb = { - .func = _cb_content_prev_set, + .func = &_cb_content_prev_set, .data = NULL, .info = "return button pressed", }, @@ -105,7 +118,7 @@ static struct button_def but_return = { static struct button_def but_print_abort_confirm = { .text = "ABORT", .cb = { - .func = _print_abort_confirm_cb, + .func = &_print_abort_confirm_cb, .data = NULL, .info = "print abort confirm button pressed", }, @@ -115,7 +128,7 @@ static struct button_def but_print_abort_confirm = { static struct button_def but_print_abort = { .text = "Yes", .cb = { - .func = _print_abort_cb, + .func = &_print_abort_cb, .data = NULL, .info = "print abort button pressed", }, @@ -125,7 +138,7 @@ static struct button_def but_print_abort = { static struct button_def but_print_tune = { .text = "TUNE", .cb = { - .func = _but_print_tune_cb, + .func = &_but_print_tune_cb, .data = NULL, .info = "tune progress button pressed", }, @@ -135,7 +148,7 @@ static struct button_def but_print_tune = { static struct button_def but_main_print = { .text = "PRINT", .cb = { - .func = _cb_button_main_print, + .func = &_cb_button_main_print, .data = NULL, .info = "print button pressed", }, @@ -145,7 +158,7 @@ static struct button_def but_main_print = { static struct button_def but_print_ignore = { .text = "IGNORE THIS JOB", .cb = { - .func = _print_ignore_cb, + .func = &_print_ignore_cb, .data = NULL, .info = "print ignore button pressed", }, @@ -155,7 +168,7 @@ static struct button_def but_print_ignore = { static struct button_def but_print_local = { .text = "LOCAL", .cb = { - .func = _but_print_local_cb, + .func = &_but_print_local_cb, .data = NULL, .info = "local storage button pressed", }, @@ -165,7 +178,7 @@ static struct button_def but_print_local = { static struct button_def but_print_mmc = { .text = "SD", .cb = { - .func = _but_print_usb_cb, + .func = &_but_print_usb_cb, .data = NULL, .info = "usb storage button pressed", }, @@ -175,7 +188,7 @@ static struct button_def but_print_mmc = { static struct button_def but_print_usb = { .text = "USB", .cb = { - .func = _but_print_usb_cb, + .func = &_but_print_usb_cb, .data = NULL, .info = "usb storage button pressed", }, @@ -185,7 +198,7 @@ static struct button_def but_print_usb = { static struct button_def but_main_mathot = { .text = "MATERIAL<br>/HOT END", .cb = { - .func = _but_main_mathot_cb, + .func = &_but_main_mathot_cb, .data = NULL, .info = "material / hot-end button pressed", }, @@ -195,7 +208,7 @@ static struct button_def but_main_mathot = { static struct button_def but_mathot_material = { .text = "MATERIAL", .cb = { - .func = _but_mathot_material_cb, + .func = &_but_mathot_material_cb, .data = NULL, .info = "material button pressed", }, @@ -205,7 +218,7 @@ static struct button_def but_mathot_material = { static struct button_def but_mathot_hotend = { .text = "HOT END", .cb = { - .func = _but_mathot_hotend_cb, + .func = &_but_mathot_hotend_cb, .data = NULL, .info = "hot-end button pressed", }, @@ -215,7 +228,7 @@ static struct button_def but_mathot_hotend = { static struct button_def but_main_system = { .text = "SYSTEM", .cb = { - .func = _but_main_system_cb, + .func = &_but_main_system_cb, .data = NULL, .info = "system button pressed", }, @@ -225,7 +238,7 @@ static struct button_def but_main_system = { static struct button_def but_system_maintenance = { .text = "MAINTE-<br>NANCE", .cb = { - .func = _but_system_maintenance_cb, + .func = &_but_system_maintenance_cb, .data = NULL, .info = "maintenance button pressed", }, @@ -235,7 +248,7 @@ static struct button_def but_system_maintenance = { static struct button_def but_system_settings = { .text = "SETTINGS", .cb = { - .func = _but_system_settings_cb, + .func = &_but_system_settings_cb, .data = NULL, }, .data = NULL, @@ -244,7 +257,7 @@ static struct button_def but_system_settings = { static struct button_def but_material_change = { .text = "CHANGE", .cb = { - .func = _but_material_change_cb, + .func = &_but_material_change_cb, .data = NULL, }, .data = NULL, @@ -253,7 +266,7 @@ static struct button_def but_material_change = { static struct button_def but_material_settings = { .text = "SETTINGS", .cb = { - .func = _but_material_settings_cb, + .func = &_but_material_settings_cb, .data = NULL, }, .data = NULL, @@ -262,7 +275,7 @@ static struct button_def but_material_settings = { static struct button_def but_settings_material_1 = { .text = "MATERIAL 1", .cb = { - .func = _but_settings_material_1_cb, /* XXX we should make 1/2 a var */ + .func = &_but_settings_material_1_cb, /* XXX we should make 1/2 a var */ .data = NULL, }, .data = NULL, @@ -271,7 +284,7 @@ static struct button_def but_settings_material_1 = { static struct button_def but_settings_material_2 = { .text = "MATERIAL 2", .cb = { - .func = _but_settings_material_2_cb, /* XXX we should make 1/2 a var */ + .func = &_but_settings_material_2_cb, /* XXX we should make 1/2 a var */ .data = NULL, }, .data = NULL, @@ -280,7 +293,7 @@ static struct button_def but_settings_material_2 = { static struct button_def but_change_material_1 = { .text = "MATERIAL 1", .cb = { - .func = _but_change_material_1_cb, /* XXX we should make 1/2 a var */ + .func = &_but_change_material_1_cb, /* XXX we should make 1/2 a var */ .data = NULL, }, .data = NULL, @@ -289,7 +302,7 @@ static struct button_def but_change_material_1 = { static struct button_def but_change_material_2 = { .text = "MATERIAL 2", .cb = { - .func = _but_change_material_2_cb, /* XXX we should make 1/2 a var */ + .func = &_but_change_material_2_cb, /* XXX we should make 1/2 a var */ .data = NULL, }, .data = NULL, @@ -298,7 +311,7 @@ static struct button_def but_change_material_2 = { static struct button_def but_hotend_change = { .text = "CHANGE", .cb = { - .func = _but_hotend_change_cb, + .func = &_but_hotend_change_cb, .data = NULL, }, .data = NULL, @@ -307,7 +320,7 @@ static struct button_def but_hotend_change = { static struct button_def but_hotend_settings = { .text = "SETTINGS", .cb = { - .func = _but_hotend_settings_cb, + .func = &_but_hotend_settings_cb, .data = NULL, }, .data = NULL, @@ -316,7 +329,7 @@ static struct button_def but_hotend_settings = { static struct button_def but_settings_hotend_1 = { .text = "HOT END 1", .cb = { - .func = _but_settings_hotend_1_cb, /* XXX we should make 1/2 a var */ + .func = &_but_settings_hotend_1_cb, /* XXX we should make 1/2 a var */ .data = NULL, }, .data = NULL, @@ -325,7 +338,7 @@ static struct button_def but_settings_hotend_1 = { static struct button_def but_settings_hotend_2 = { .text = "HOT END 2", .cb = { - .func = _but_settings_hotend_2_cb, /* XXX we should make 1/2 a var */ + .func = &_but_settings_hotend_2_cb, /* XXX we should make 1/2 a var */ .data = NULL, }, .data = NULL, @@ -334,7 +347,7 @@ static struct button_def but_settings_hotend_2 = { static struct button_def but_change_hotend_1 = { .text = "HOT END 1", .cb = { - .func = _but_change_hotend_1_cb, /* XXX we should make 1/2 a var */ + .func = &_but_change_hotend_1_cb, /* XXX we should make 1/2 a var */ .data = NULL, }, .data = NULL, @@ -343,7 +356,7 @@ static struct button_def but_change_hotend_1 = { static struct button_def but_change_hotend_2 = { .text = "HOT END 2", .cb = { - .func = _but_change_hotend_2_cb, /* XXX we should make 1/2 a var */ + .func = &_but_change_hotend_2_cb, /* XXX we should make 1/2 a var */ .data = NULL, }, .data = NULL, @@ -355,11 +368,11 @@ static struct menu_def menu_system_settings = { .entry = { { .icon = "user-home", - .label = gettext_noop("Return"), + .label = N_("Return"), .item = {.type = LIST_ITEM_BUTTON}, - .footer = gettext_noop("Return to Main menu"), + .footer = N_("Return to Main menu"), .footer_alt = NULL, - .func = _cb_content_prev_set, + .func = &_cb_content_prev_set, .toggle_timer = NULL, .data = NULL, }, { @@ -368,7 +381,7 @@ static struct menu_def menu_system_settings = { .item = {.type = LIST_ITEM_BUTTON}, .footer = "Change language", .footer_alt = NULL, - .func = _but_settings_language_cb, + .func = &_but_settings_language_cb, .toggle_timer = NULL, .data = NULL, }, { @@ -377,7 +390,7 @@ static struct menu_def menu_system_settings = { .item = {.type = LIST_ITEM_BUTTON}, .footer = "Manage connectivity", .footer_alt = "WiFi & Ethernet", - .func = _but_settings_network_cb, + .func = &_but_settings_network_cb, .toggle_timer = NULL, .data = NULL, }, { @@ -386,7 +399,7 @@ static struct menu_def menu_system_settings = { .item = {.type = LIST_ITEM_BUTTON}, .footer = "Adjust offset", .footer_alt = NULL, - .func = _but_settings_hotend_1_offset_cb, + .func = &_but_settings_hotend_1_offset_cb, .toggle_timer = NULL, .data = NULL, /* hot end 1 pointer? */ }, { @@ -395,19 +408,10 @@ static struct menu_def menu_system_settings = { .end = NULL, .footer = "Adjust offset", .footer_alt = NULL, - .func = _but_settings_hotend_2_offset_cb, + .func = &_but_settings_hotend_2_offset_cb, .toggle_timer = NULL, .data = NULL, /* hot end 2 pointer? */ - }, { - .icon = NULL, - .label = "Feeder power", - .end = NULL, - .footer = "Adjust power ", - .footer_alt = NULL, - .func = NULL, - .toggle_timer = NULL, - .data = NULL, - }, { + }, {/* .icon = NULL, .label = "Filament detection", .end = NULL, @@ -416,16 +420,16 @@ static struct menu_def menu_system_settings = { .func = NULL, .toggle_timer = NULL, .data = NULL, - }, { + }, {*/ .icon = NULL, .label = "Camera", .end = NULL, .footer = NULL, .footer_alt = NULL, - .func = NULL, + .func = NULL, /* Menu to rfkill */ .toggle_timer = NULL, .data = NULL, - }, { + }, {/* .icon = NULL, .label = "Internal storage", .end = NULL, @@ -434,13 +438,13 @@ static struct menu_def menu_system_settings = { .func = NULL, .toggle_timer = NULL, .data = NULL, - }, { + }, {*/ .icon = NULL, .label = "LED settings", .end = NULL, .footer = NULL, .footer_alt = NULL, - .func = _but_settings_led_cb, + .func = &_but_settings_led_cb, .toggle_timer = NULL, .data = NULL, }, { @@ -449,16 +453,16 @@ static struct menu_def menu_system_settings = { .end = NULL, .footer = NULL, .footer_alt = NULL, - .func = NULL, + .func = &_but_retraction_cb, .toggle_timer = NULL, .data = NULL, }, { .icon = NULL, - .label = "Motion", + .label = "Motion settings", .end = NULL, .footer = NULL, .footer_alt = NULL, - .func = NULL, + .func = &_but_motion_cb, .data = NULL, }, { .icon = NULL, @@ -466,7 +470,7 @@ static struct menu_def menu_system_settings = { .end = NULL, .footer = NULL, .footer_alt = NULL, - .func = NULL, + .func = &_but_software_version_cb, .toggle_timer = NULL, .data = NULL, }, { @@ -493,25 +497,25 @@ static struct menu_def menu_settings_network = { .item = {.type = LIST_ITEM_BUTTON}, .footer = "Return to Main menu", .footer_alt = NULL, - .func = _cb_content_prev_set, + .func = &_cb_content_prev_set, .toggle_timer = NULL, .data = NULL, }, { .icon = NULL, .label = "Network info", - .end = NULL, + .item = {.type = LIST_ITEM_BUTTON}, .footer = NULL, .footer_alt = NULL, - .func = _but_network_info_cb, + .func = &_but_network_info_cb, .toggle_timer = NULL, .data = NULL, }, { .icon = NULL, .label = "Manage WiFi", - .end = NULL, + .item = {.type = LIST_ITEM_BUTTON}, .footer = "Connect or forget", .footer_alt = NULL, - .func = _network_wifi_manage_cb, + .func = &_network_wifi_manage_cb, .toggle_timer = NULL, .data = NULL, }, { @@ -525,16 +529,16 @@ static struct menu_def menu_settings_network = { .dbus = { /* .proxy = NULL; TODO keep a link to the proxy that is responsible for this item. */ .signal = "EthernetPowerChanged", - .sig_cb = on_signal_network_power_changed_ret, + .sig_cb = &on_signal_network_power_changed_ret, .get = "isEthernetPowered", - .get_cb = on_method_is_network_powered_ret, + .get_cb = &on_method_is_network_powered_ret, .set = "setEthernetPower", - .set_cb = on_method_generic_ret, + .set_cb = &on_method_generic_ret, }, .end = NULL, .footer = NULL, .footer_alt = NULL, - .func = _set_ethernet_power_cb, /* TODO _set_network_power can be possible */ + .func = &_set_ethernet_power_cb, /* TODO _set_network_power can be possible */ .toggle_timer = NULL, .data = NULL, }, { @@ -547,16 +551,16 @@ static struct menu_def menu_settings_network = { }, .dbus = { .signal = "WifiPowerChanged", - .sig_cb = on_signal_network_power_changed_ret, + .sig_cb = &on_signal_network_power_changed_ret, .get = "isWifiPowered", - .get_cb = on_method_is_network_powered_ret, + .get_cb = &on_method_is_network_powered_ret, .set = "setWifiPower", - .set_cb = on_method_generic_ret, + .set_cb = &on_method_generic_ret, }, .end = NULL, .footer = NULL, .footer_alt = NULL, - .func = _set_wifi_power_cb, + .func = &_set_wifi_power_cb, .toggle_timer = NULL, .data = NULL, }, { @@ -568,17 +572,17 @@ static struct menu_def menu_settings_network = { ._widget = NULL, }, .dbus = { - .signal = "HotspotPowerChanged", - .sig_cb = on_signal_network_power_changed_ret, - .get = "isHotspotPowered", - .get_cb = on_method_is_network_powered_ret, - .set = "setHotspotPower", - .set_cb = on_method_generic_ret, + .signal = "HotspotEnabledChanged", + .sig_cb = &on_signal_network_power_changed_ret, + .get = "isHotspotEnabled", + .get_cb = &on_method_is_network_powered_ret, + .set = "setHotspotEnable", + .set_cb = &on_method_generic_ret, }, .footer = NULL, .footer_alt = NULL, .end = NULL, - .func = _set_hotspot_power_cb, + .func = &_set_hotspot_power_cb, .toggle_timer = NULL, .data = NULL, }, { NULL }, /* sentinel */ @@ -594,21 +598,129 @@ static struct menu_def menu_settings_language = { { .icon = "user-home", .label = "Return", - .end = NULL, + .item = {.type = LIST_ITEM_BUTTON}, .footer = "Return to Main menu", .footer_alt = NULL, - .func = _cb_content_prev_set, + .func = &_cb_content_prev_set, .toggle_timer = NULL, .data = NULL, }, { .icon = NULL, .label = "English", - .end = NULL, + .item = {.type = LIST_ITEM_BUTTON}, .footer = "Welcome", .footer_alt = NULL, .func = NULL, .toggle_timer = NULL, .data = NULL, + }, { + .icon = NULL, + .label = "Nederlands", + .item = {.type = LIST_ITEM_BUTTON}, + .footer = "Welkom", + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Turkish", + .item = {.type = LIST_ITEM_BUTTON}, + .footer = "Hoşgeldin", + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Croatian", + .item = {.type = LIST_ITEM_BUTTON}, + .footer = "dobrodošli", + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Hungarian", + .item = {.type = LIST_ITEM_BUTTON}, + .footer = "Üdvözöljük", + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Russian", + .item = {.type = LIST_ITEM_BUTTON}, + .footer = "добро пожаловать", + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Greek", + .item = {.type = LIST_ITEM_BUTTON}, + .footer = "καλωσόρισμα", + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Hebrew", + .item = {.type = LIST_ITEM_BUTTON}, + .footer = "ברוכים הבאים", + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Arabic", + .item = {.type = LIST_ITEM_BUTTON}, + .footer = "أهلا بك", + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Hindi", + .item = {.type = LIST_ITEM_BUTTON}, + .footer = "स्वागत", + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Chinese (traditional)", + .item = {.type = LIST_ITEM_BUTTON}, + .footer = "歡迎", + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Thai", + .item = {.type = LIST_ITEM_BUTTON}, + .footer = "ยินดีต้อนรับ", + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Georgian", + .item = {.type = LIST_ITEM_BUTTON}, + .footer = "კეთილი", + .footer_alt = NULL, + .func = NULL, + .toggle_timer = NULL, + .data = NULL, }, { NULL }, /* sentinel */ }, .data = NULL, @@ -624,7 +736,7 @@ static struct menu_def menu_settings_hotend_1_offset = { .end = NULL, .footer = "Return to Main menu", .footer_alt = NULL, - .func = _cb_content_prev_set, + .func = &_cb_content_prev_set, .toggle_timer = NULL, .data = NULL, }, { @@ -696,7 +808,7 @@ static struct menu_def menu_settings_hotend_2_offset = { .end = NULL, .footer = "Return to Main menu", .footer_alt = NULL, - .func = _cb_content_prev_set, + .func = &_cb_content_prev_set, .toggle_timer = NULL, .data = NULL, }, { @@ -768,7 +880,7 @@ static struct menu_def menu_system_maintenance = { .end = NULL, .footer = "Return to Main menu", .footer_alt = NULL, - .func = _cb_content_prev_set, + .func = &_cb_content_prev_set, .toggle_timer = NULL, .data = NULL, }, { @@ -782,11 +894,20 @@ static struct menu_def menu_system_maintenance = { .data = NULL, }, { .icon = NULL, - .label = "Level buildplate", + .label = "Speed", + .end = NULL, + .footer = "100 %", + .footer_alt = NULL, + .func = &_but_print_speed_cb, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Auto Level buildplate", .end = NULL, .footer = NULL, .footer_alt = NULL, - .func = NULL, + .func = &_but_bed_level_auto_cb, .toggle_timer = NULL, .data = NULL, }, { @@ -795,7 +916,7 @@ static struct menu_def menu_system_maintenance = { .end = NULL, .footer = NULL, .footer_alt = NULL, - .func = NULL, + .func = &_but_bed_heatup_cb, .toggle_timer = NULL, .data = NULL, }, { @@ -804,7 +925,7 @@ static struct menu_def menu_system_maintenance = { .end = NULL, .footer = NULL, .footer_alt = NULL, - .func = NULL, + .func = &_but_bed_home_cb, .toggle_timer = NULL, .data = NULL, }, { @@ -813,25 +934,25 @@ static struct menu_def menu_system_maintenance = { .end = NULL, .footer = NULL, .footer_alt = NULL, - .func = NULL, + .func = &_but_bed_raise_cb, .toggle_timer = NULL, .data = NULL, }, { .icon = NULL, - .label = "Home head", + .label = "Move buildplate", .end = NULL, .footer = NULL, .footer_alt = NULL, - .func = NULL, + .func = &_but_bed_move_cb, .toggle_timer = NULL, .data = NULL, }, { .icon = NULL, - .label = "Printhead tray", + .label = "Home head", .end = NULL, .footer = NULL, .footer_alt = NULL, - .func = NULL, + .func = &_but_head_home_cb, .toggle_timer = NULL, .data = NULL, }, { @@ -840,7 +961,7 @@ static struct menu_def menu_system_maintenance = { .end = NULL, .footer = NULL, .footer_alt = NULL, - .func = NULL, + .func = &_but_hotend_heatup_0_cb, .toggle_timer = NULL, .data = NULL, }, { @@ -849,25 +970,69 @@ static struct menu_def menu_system_maintenance = { .end = NULL, .footer = NULL, .footer_alt = NULL, - .func = NULL, + .func = &_but_hotend_heatup_1_cb, .toggle_timer = NULL, .data = NULL, }, { .icon = NULL, - .label = "Set fan speed", + .label = "Switch active hotend", + .end = NULL, + .footer = "Hotend 1 active", + .footer_alt = NULL, + .func = &_but_hotend_active_set_cb, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Fan speed", .end = NULL, .footer = NULL, .footer_alt = NULL, - .func = NULL, + .func = &_but_fan_speed_cb, .toggle_timer = NULL, .data = NULL, }, { .icon = NULL, - .label = "Move material", + .label = "Material flow", .end = NULL, .footer = NULL, .footer_alt = NULL, - .func = NULL, + .func = &_but_flow_rate_cb, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Retraction material", + .end = NULL, + .footer = "Length/Speed/ZHop", + .footer_alt = NULL, + .func = &_but_retraction_cb, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Motion settings", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = &_but_motion_cb, + .data = NULL, + }, { + .icon = NULL, + .label = "Move material left feeder", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = &_but_material_move_0_cb, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Move material right feeder", + .end = NULL, + .footer = NULL, + .footer_alt = NULL, + .func = &_but_material_move_1_cb, .toggle_timer = NULL, .data = NULL, }, { @@ -904,7 +1069,7 @@ static struct menu_def menu_material_1 = { .end = NULL, .footer = "Return to Main menu", .footer_alt = NULL, - .func = _cb_content_prev_set, + .func = &_cb_content_prev_set, .toggle_timer = NULL, .data = NULL, }, { @@ -994,7 +1159,7 @@ static struct menu_def menu_material_2 = { .end = NULL, .footer = "Return to Main menu", .footer_alt = NULL, - .func = _cb_content_prev_set, + .func = &_cb_content_prev_set, .toggle_timer = NULL, .data = NULL, }, { @@ -1084,7 +1249,7 @@ static struct menu_def menu_material_customize = { .end = NULL, .footer = "Return to Main menu", .footer_alt = NULL, - .func = _cb_content_prev_set, + .func = &_cb_content_prev_set, .toggle_timer = NULL, .data = NULL, }, { @@ -1174,7 +1339,7 @@ static struct menu_def menu_settings_led = { .item = {.type = LIST_ITEM_BUTTON}, .footer = "Return to Main menu", .footer_alt = NULL, - .func = _cb_content_prev_set, + .func = &_cb_content_prev_set, .toggle_timer = NULL, .data = NULL, }, { @@ -1183,7 +1348,7 @@ static struct menu_def menu_settings_led = { .item = {.type = LIST_ITEM_BUTTON}, .footer = "100%", .footer_alt = NULL, - .func = _but_led_brightness_cb, + .func = _but_led_hue_cb, .toggle_timer = NULL, .data = NULL, }, { @@ -1192,7 +1357,7 @@ static struct menu_def menu_settings_led = { .item = {.type = LIST_ITEM_BUTTON}, .footer = "100%", .footer_alt = NULL, - .func = _but_led_brightness_cb, + .func = _but_led_saturation_cb, .toggle_timer = NULL, .data = NULL, }, { @@ -1255,19 +1420,19 @@ static struct menu_def menu_print_tune = { { .icon = "user-home", .label = "Return", - .end = NULL, + .item = {.type = LIST_ITEM_BUTTON}, .footer = "Return to print", .footer_alt = NULL, - .func = _cb_content_prev_set, + .func = &_cb_content_prev_set, .toggle_timer = NULL, .data = NULL, }, { .icon = NULL, .label = "Networking", - .end = NULL, + .item = {.type = LIST_ITEM_BUTTON}, .footer = "IP: ", .footer_alt = NULL, - .func = _but_settings_network_cb, + .func = &_but_settings_network_cb, .toggle_timer = NULL, .data = NULL, }, { @@ -1276,16 +1441,25 @@ static struct menu_def menu_print_tune = { .end = NULL, .footer = "100 %", .footer_alt = NULL, - .func = NULL, + .func = &_but_print_speed_cb, .toggle_timer = NULL, .data = NULL, }, { .icon = NULL, - .label = "Hotend temperature", + .label = "Hotend 1 temperature", .end = NULL, .footer = "210 °C", .footer_alt = NULL, - .func = NULL, + .func = &_but_hotend_heatup_0_cb, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Hotend 2 temperature", + .end = NULL, + .footer = "210 °C", + .footer_alt = NULL, + .func = &_but_hotend_heatup_1_cb, .toggle_timer = NULL, .data = NULL, }, { @@ -1294,7 +1468,7 @@ static struct menu_def menu_print_tune = { .end = NULL, .footer = "60 °C", .footer_alt = NULL, - .func = NULL, + .func = &_but_bed_heatup_cb, .toggle_timer = NULL, .data = NULL, }, { @@ -1303,7 +1477,7 @@ static struct menu_def menu_print_tune = { .end = NULL, .footer = "100 %", .footer_alt = NULL, - .func = NULL, + .func = &_but_fan_speed_cb, .toggle_timer = NULL, .data = NULL, }, { @@ -1312,34 +1486,133 @@ static struct menu_def menu_print_tune = { .end = NULL, .footer = "100 %", .footer_alt = NULL, - .func = NULL, + .func = &_but_flow_rate_cb, .toggle_timer = NULL, .data = NULL, }, { .icon = NULL, - .label = "Retraction hotend", + .label = "Retraction material", .end = NULL, - .footer = "Up", + .footer = "Length/Speed", .footer_alt = NULL, - .func = NULL, + .func = &_but_retraction_cb, .toggle_timer = NULL, .data = NULL, }, { .icon = NULL, - .label = "LED Brightness", + .label = "LED Settings", .end = NULL, - .footer = "100 %", + .footer = "Change led settings", .footer_alt = NULL, - .func = NULL, + .func = &_but_settings_led_cb, + .toggle_timer = NULL, + .data = NULL, + }, { NULL }, /* sentinel */ + }, + .data = NULL, +}; + +static struct menu_def menu_retraction = { + .title = "RETRACTION", + .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 = "Material/Nozzle", + .label = "Retraction length", .end = NULL, - .footer = "PLA | PVA", - .footer_alt = "RVS | Bronze", - .func = NULL, + .footer = " mm", + .footer_alt = NULL, + .func = &_but_retraction_length_cb, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Retraction speed", + .end = NULL, + .footer = " mm / sec", + .footer_alt = NULL, + .func = &_but_retraction_speed_cb, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Retraction Z-hop", + .end = NULL, + .footer = " mm", + .footer_alt = NULL, + .func = &_but_retraction_zhop_cb, + .toggle_timer = NULL, + .data = NULL, + }, { NULL }, /* sentinel */ + }, + .data = NULL, +}; + +static struct menu_def menu_motion = { + .title = "MOTION", + .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 = "X/Y Jerk", + .end = NULL, + .footer = " mm", + .footer_alt = NULL, + .func = &_but_jerk_xy_cb, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Z Jerk", + .end = NULL, + .footer = " mm", + .footer_alt = NULL, + .func = &_but_jerk_z_cb, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "X/Y axis current", + .end = NULL, + .footer = " mA", + .footer_alt = NULL, + .func = &_but_current_xy_cb, /* TODO needs bitwise id for x/y/z */ + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Z axis current", + .end = NULL, + .footer = " mA", + .footer_alt = NULL, + .func = &_but_current_z_cb, + .toggle_timer = NULL, + .data = NULL, + }, { + .icon = NULL, + .label = "Extruder current", + .end = NULL, + .footer = " mA", + .footer_alt = NULL, + .func = &_but_current_e_cb, /* XXX needs field with bitwise id for hotend/extruder */ .toggle_timer = NULL, .data = NULL, }, { NULL }, /* sentinel */ @@ -1359,7 +1632,7 @@ static struct menu_def menu_ = { .end = NULL, .footer = "Return to Main menu", .footer_alt = NULL, - .func = _cb_content_prev_set, + .func = &_cb_content_prev_set, .toggle_timer = NULL, .data = NULL, }, { @@ -1377,7 +1650,315 @@ static struct menu_def menu_ = { }; #endif -static void eulogium_print_data_clear(struct eulogium_data *eulogium) +static struct settings_dial_data dial_led_hue = { + .label = N_("Hue"), + .step = 1.0, + .min = 0.0, + .max = 100.0, + .value = 12.3, + .value_end = 25.0, + .format = "%1.0f", + .format_end = " | %1.0f%s", + .unit = "%", + //.method_set = "SetHue", + //.method_get = "GetHue", +}; + +static struct settings_dial_data dial_led_saturation = { + .label = N_("Saturation"), + .step = 1.0, + .min = 0.0, + .max = 100.0, + .value = 4.56, + .value_end = 25.0, + .format = "%1.0f", + .format_end = " | %1.0f%s", + .unit = "%", + //.method_set = "SetSaturation", + //.method_get = "GetSaturation", +}; + +static struct settings_dial_data dial_led_brightness = { + .label = N_("Brightness"), + .step = 1.0, + .min = 0.0, + .max = 100.0, + .value = 7.89, + .value_end = 25.0, + .format = "%1.0f", + .format_end = " | %1.0f%s", + .unit = "%", + //.method_set = "SetBrightness", + //.method_get = "GetBrightness", +}; + +static struct print_data progressbars[] = { + [PROC_PRINT] = { + .title = LABEL_PROC_PRINT, + .status = NULL, + .jobname = NULL, + .time = 0, + .total_time = 0, + .value = 0.0, + .proc_key = PROC_PRINT, + }, + [PROC_FIRMWARE_UPDATE] = { + .title = LABEL_PROC_FIRMWARE_UPDATE, + .status = NULL, + .jobname = NULL, + .time = 0, + .total_time = 0, + .value = 0.0, + .proc_key = PROC_FIRMWARE_UPDATE, + }, +}; + +static struct settings_dial_data dials[] = { + /* TODO maybe use a title and label, where label is generally NULL */ + [PROC_BED_MOVE] = { + .label = LABEL_PROC_BED_MOVE, + .help = N_("Rotate the knob<br>CW to down<br>CCW to go up"), + .step = 1.0, + .min = 0.0, /* Unused with this dial */ + .max = 0.0, /* Unused with this dial */ + .value = 0.0, + .value_end = 0.0, /* Unused with this dial */ + .format = "", /* Unused with this dial */ + .format_end = "", /* Unused with this dial */ + .unit = "", /* Unused with this dial */ + .method_set = &procedure_target_set, + .method_get = &procedure_metadata_key_get, + .proc_key = PROC_BED_MOVE, + }, + [PROC_BED_HEATUP] = { + .label = N_("Buildplate temperature"), + .step = 1.0, + .min = 0.0, + .max = 60.0, + .value = 0.0, + .value_end = 0.0, + .format = "%1.1f", + .format_end = " | %1.0f%s", + .unit = " °C", + .method_set = &procedure_target_set, + .method_get = &procedure_metadata_key_get, + .proc_key = PROC_BED_HEATUP, + }, + [PROC_HOTEND_HEATUP_0] = { + .label = N_("Hotend 1 temperature"), + .step = 1.0, + .min = 0.0, + .max = 300.0, + .value = 0.0, + .value_end = 0.0, + .format = "%1.1f", + .format_end = " | %1.0f%s", + .unit = " °C", + .method_set = &procedure_target_set, /* XXX use ampersant improve of functions */ + .method_get = &procedure_metadata_key_get, + .proc_key = PROC_HOTEND_HEATUP_0, + }, + [PROC_HOTEND_HEATUP_1] = { + .label = N_("Hotend 2 temperature"), + .step = 1.0, + .min = 0.0, + .max = 300.0, + .value = 0.0, + .value_end = 0.0, + .format = "%1.1f", + .format_end = " | %1.0f%s", + .unit = " °C", + .method_set = &procedure_target_set, /* XXX use ampersant improve of functions */ + .method_get = &procedure_metadata_key_get, + .proc_key = PROC_HOTEND_HEATUP_1, + }, + [PROC_PRINT_SPEED] = { + .label = N_("Print speed"), + .step = 10.0, + .min = 10.0, + .max = 1000.0, + .value = 0.0, + .value_end = 0.0, + .format = "%1.1f", + .format_end = " | %1.0f%s", + .unit = "%", + .method_set = &procedure_target_set, + .method_get = &procedure_metadata_key_get, + .proc_key = PROC_PRINT_SPEED, + }, + [PROC_FAN_SPEED] = { + .label = N_("Fan speed"), + .step = 1.0, + .min = 0.0, + .max = 100.0, + .value = 0.0, + .value_end = 0.0, + .format = "%1.0f", + .format_end = " | %1.0f%s", + .unit = "%", + .method_set = &procedure_target_set, + .method_get = &procedure_metadata_key_get, + .proc_key = PROC_FAN_SPEED, + }, + [PROC_FLOW_RATE] = { + .label = N_("Material flow rate"), + .step = 1.0, + .min = 0.0, + .max = 100.0, + .value = 0.0, + .value_end = 0.0, + .format = "%1.0f", + .format_end = " | %1.0f%s", + .unit = "%", + .method_set = &procedure_target_set, + .method_get = &procedure_metadata_key_get, + .proc_key = PROC_FLOW_RATE, + }, + [PROC_RETRACTION_LENGTH] = { + .label = N_("Retraction length"), + .step = 0.1, + .min = 3.0, + .max = 20.0, + .value = 0.0, + .value_end = 0.0, + .format = "%1.1f", + .format_end = " | %1.0f%s", + .unit = " mm", + .method_set = &procedure_target_set, + .method_get = &procedure_metadata_key_get, + .proc_key = PROC_RETRACTION_LENGTH, + }, + [PROC_RETRACTION_SPEED] = { + .label = N_("Retraction speed"), + .step = 1.0, + .min = 1.0, + .max = 150.0, + .value = 0.0, + .value_end = 0.0, + .format = "%1.1f", + .format_end = " | %1.0f%s", + .unit = " mm / s", + .method_set = &procedure_target_set, + .method_get = &procedure_metadata_key_get, + .proc_key = PROC_RETRACTION_SPEED, + }, + [PROC_RETRACTION_ZHOP] = { + .label = N_("Retraction Z-hop"), + .step = 0.1, + .min = 0.0, + .max = 10.0, + .value = 0.0, + .value_end = 0.0, + .format = "%1.1f", + .format_end = " | %1.0f%s", + .unit = " mm", + .method_set = &procedure_target_set, + .method_get = &procedure_metadata_key_get, + .proc_key = PROC_RETRACTION_ZHOP, + }, + [PROC_MATERIAL_MOVE_0] = { + /* TODO maybe use a title and label, where label is generally NULL */ + .label = N_("Move material<br>Rotate the knob<br>CW to feed<br>CCW to retract"), + .step = 1.0, + .min = 0.0, /* Unused with this dial */ + .max = 0.0, /* Unused with this dial */ + .value = 0.0, + .value_end = 0.0, /* Unused with this dial */ + .format = "", /* Unused with this dial */ + .format_end = "", /* Unused with this dial */ + .unit = "", /* Unused with this dial */ + .method_set = &procedure_target_set, + .method_get = NULL, + .proc_key = PROC_MATERIAL_MOVE_0, + }, + [PROC_MATERIAL_MOVE_1] = { + /* TODO maybe use a title and label, where label is generally NULL */ + .label = N_("Move material<br>Rotate the knob<br>CW to feed<br>CCW to retract"), + .step = 1.0, + .min = 0.0, /* Unused with this dial */ + .max = 0.0, /* Unused with this dial */ + .value = 0.0, + .value_end = 0.0, /* Unused with this dial */ + .format = "", /* Unused with this dial */ + .format_end = "", /* Unused with this dial */ + .unit = "", /* Unused with this dial */ + .method_set = &procedure_target_set, + .method_get = NULL, + .proc_key = PROC_MATERIAL_MOVE_1, + }, + [PROC_JERK_XY] = { + .label = N_("X/Y jerk"), + .step = 1.0, + .min = 0.0, + .max = 100.0, + .value = 0.0, + .value_end = 0.0, + .format = "%1.0f", + .format_end = " | %1.0f%s", + .unit = " mm", + .method_set = &procedure_target_set, + .method_get = &procedure_metadata_key_get, + .proc_key = PROC_JERK_XY, + }, + [PROC_JERK_Z] = { + .label = N_("Z jerk"), + .step = 1.0, + .min = 0.0, + .max = 100.0, + .value = 0.0, + .value_end = 0.0, + .format = "%1.0f", + .format_end = " | %1.0f%s", + .unit = " mm", + .method_set = &procedure_target_set, + .method_get = &procedure_metadata_key_get, + .proc_key = PROC_JERK_Z, + }, + [PROC_CURRENT_XY] = { + .label = N_("X/Y axis current"), + .step = 1.0, + .min = 0.0, + .max = 100.0, + .value = 0.0, + .value_end = 0.0, + .format = "%1.0f", + .format_end = " | %1.0f%s", + .unit = " mm", + .method_set = &procedure_target_set, + .method_get = &procedure_metadata_key_get, + .proc_key = PROC_CURRENT_XY, + }, + [PROC_CURRENT_Z] = { + .label = N_("Z axis current"), + .step = 1.0, + .min = 0.0, + .max = 100.0, + .value = 0.0, + .value_end = 0.0, + .format = "%1.0f", + .format_end = " | %1.0f%s", + .unit = " mm", + .method_set = &procedure_target_set, + .method_get = &procedure_metadata_key_get, + .proc_key = PROC_CURRENT_Z, + }, + [PROC_CURRENT_E] = { + .label = N_("Extruder current"), + .step = 1.0, + .min = 0.0, + .max = 100.0, + .value = 0.0, + .value_end = 0.0, + .format = "%1.0f", + .format_end = " | %1.0f%s", + .unit = " mm", + .method_set = &procedure_target_set, + .method_get = &procedure_metadata_key_get, + .proc_key = PROC_CURRENT_E, + }, { NULL }, /* sentinel */ +}; + +void eulogium_print_data_clear(struct eulogium_data *eulogium) { if (eulogium->progress_data_refresh) ecore_timer_del(eulogium->progress_data_refresh); @@ -1389,15 +1970,12 @@ static void eulogium_print_data_clear(struct eulogium_data *eulogium) // if (eulogium->print.name) // free(eulogium->print.name); - eulogium->print.name = NULL; - eulogium->print.name_changed = EINA_FALSE; + eulogium->print.jobname = NULL; + print_clear(eulogium->procedures[PROC_PRINT].meta); // if (eulogium->print.file) // free(eulogium->print.file); eulogium->print.url = NULL; - eulogium->print.time = 0; - eulogium->print.material = 0; - eulogium->print.progress = 0; eulogium->print.flags = ""; } @@ -1425,15 +2003,7 @@ static void _on_print_abort_ret(void *data, const Eldbus_Message *msg, Eldbus_Pe static void _cb_content_prev_set(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { - struct eulogium_data *eulogium = data; - uint_fast8_t list_size; - - printf("prev ret\n"); - list_size = eina_list_count(elm_naviframe_items_get(eulogium->navi)); - if (list_size < 2) - printf("Not popping last item cowboy\n"); /* TODO, use proper debug construct */ - else - elm_naviframe_item_pop(eulogium->navi); + ui_stack_pop_cb(data, obj, event_info); /* XXX replace content_prev calls with ui_stack_pop */ } static void _print_abort_confirm_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) @@ -1441,10 +2011,8 @@ static void _print_abort_confirm_cb(void *data, Evas_Object *obj EINA_UNUSED, vo struct eulogium_data *eulogium = data; Evas_Object *content; - content = eulogium_menu_confirm(eulogium->navi, gettext_noop("<br>Abort the print?"), "No", &but_print_abort); - if (!content) - return; - elm_naviframe_item_simple_push(eulogium->navi, content); + content = eulogium_menu_confirm(eulogium->navi, N_("<br>Abort the print?"), "No", &but_print_abort); + ui_stack_push(eulogium, content, PAGE_NORMAL); } static void _print_abort_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) @@ -1470,9 +2038,7 @@ static void _but_system_maintenance_cb(void *data, Evas_Object *obj EINA_UNUSED, 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); + ui_stack_push(eulogium, content, PAGE_NORMAL); } static void _but_material_change_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) @@ -1482,9 +2048,7 @@ static void _but_material_change_cb(void *data EINA_UNUSED, Evas_Object *obj EIN printf("But material change\n"); content = eulogium_tripple_button_menu(eulogium->navi, &but_change_material_1, &but_change_material_2, &but_return); - if (!content) - return; - elm_naviframe_item_simple_push(eulogium->navi, content); + ui_stack_push(eulogium, content, PAGE_NORMAL); } static void _but_material_settings_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) @@ -1494,9 +2058,7 @@ static void _but_material_settings_cb(void *data EINA_UNUSED, Evas_Object *obj E printf("But material settings\n"); content = eulogium_tripple_button_menu(eulogium->navi, &but_settings_material_1, &but_settings_material_2, &but_return); - if (!content) - return; - elm_naviframe_item_simple_push(eulogium->navi, content); + ui_stack_push(eulogium, content, PAGE_NORMAL); } static void _but_hotend_change_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) @@ -1506,9 +2068,7 @@ static void _but_hotend_change_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_ printf("But hotend change\n"); content = eulogium_tripple_button_menu(eulogium->navi, &but_change_hotend_1, &but_change_hotend_2, &but_return); - if (!content) - return; - elm_naviframe_item_simple_push(eulogium->navi, content); + ui_stack_push(eulogium, content, PAGE_NORMAL); } static void _but_hotend_settings_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) @@ -1518,9 +2078,7 @@ static void _but_hotend_settings_cb(void *data EINA_UNUSED, Evas_Object *obj EIN printf("But hotend settings\n"); content = eulogium_tripple_button_menu(eulogium->navi, &but_settings_hotend_1, &but_settings_hotend_2, &but_return); - if (!content) - return; - elm_naviframe_item_simple_push(eulogium->navi, content); + ui_stack_push(eulogium, content, PAGE_NORMAL); } static void _but_main_system_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED) @@ -1530,45 +2088,38 @@ static void _but_main_system_cb(void *data, Evas_Object *object EINA_UNUSED, voi printf("Button system pressed\n"); content = eulogium_tripple_button_menu(eulogium->navi, &but_system_settings, &but_system_maintenance, &but_return); - if (!content) - return; - elm_naviframe_item_simple_push(eulogium->navi, content); -} - -static void menu_widget_list_push(struct eulogium_data *eulogium, struct menu_def *file) -{ - Evas_Object *content; - - content = menu_widget_list(eulogium, eulogium->navi, file); - if (!content) - return; - elm_naviframe_item_simple_push(eulogium->navi, content); + ui_stack_push(eulogium, content, PAGE_NORMAL); } static void menu_wifi_list(struct eulogium_data *eulogium) { + Evas_Object *content; struct menu_def *wifi_list; wifi_list = malloc(sizeof(struct menu_def)); /* XXX memleak here. free on pop */ wifi_list->title = _("Wifi Networks"); wifi_list->type = LIST_WIFI; - menu_widget_list_push(eulogium, wifi_list); + content = menu_widget_list(eulogium, eulogium->navi, wifi_list); + ui_stack_push(eulogium, content, PAGE_NORMAL); } static void menu_internal_storage(struct eulogium_data *eulogium) { + Evas_Object *content; struct menu_def *menu_internal_storage; menu_internal_storage = malloc(sizeof(struct menu_def)); /* XXX meamleak here. This needs to be free-ed when we pop this screen */ menu_internal_storage->title = "Internal storage"; menu_internal_storage->type = LIST_FILE; menu_internal_storage->dir.path = "/home"; /* TODO, use variable for internal storage */ - menu_widget_list_push(eulogium, menu_internal_storage); + content = menu_widget_list(eulogium, eulogium->navi, menu_internal_storage); + ui_stack_push(eulogium, content, PAGE_NORMAL); } static void menu_usb_storage(struct eulogium_data *eulogium) { + Evas_Object *content; struct menu_def *menu_usb_storage; struct mount_data *mount; char *mount_point; @@ -1589,7 +2140,8 @@ static void menu_usb_storage(struct eulogium_data *eulogium) menu_usb_storage->type = LIST_FILE; menu_usb_storage->dir.path = malloc(mount_len); strncpy(menu_usb_storage->dir.path, mount_point, mount_len); - menu_widget_list_push(eulogium, menu_usb_storage); + content = menu_widget_list(eulogium, eulogium->navi, menu_usb_storage); + ui_stack_push(eulogium, content, PAGE_USB); } static void _network_wifi_manage_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED) @@ -1625,9 +2177,7 @@ static void _cb_button_main_print(void *data, Evas_Object *object EINA_UNUSED, v content = eulogium_tripple_button_menu(eulogium->navi, &but_print_local, &but_print_mmc, &but_return); if (eeze_disk_type_get(mount->disk) == EEZE_DISK_TYPE_USB) content = eulogium_tripple_button_menu(eulogium->navi, &but_print_local, &but_print_usb, &but_return); - if (!content) - return; - elm_naviframe_item_simple_push(eulogium->navi, content); + ui_stack_push(eulogium, content, PAGE_NORMAL); } } @@ -1639,9 +2189,7 @@ static void _but_settings_network_cb(void *data, Evas_Object *obj EINA_UNUSED, v 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); + ui_stack_push(eulogium, content, PAGE_NORMAL); } static void _but_system_settings_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) @@ -1651,9 +2199,7 @@ static void _but_system_settings_cb(void *data, Evas_Object *obj EINA_UNUSED, vo printf("But system settings settings\n"); content = menu_widget_list(eulogium, eulogium->navi, &menu_system_settings); - if (!content) - return; - elm_naviframe_item_simple_push(eulogium->navi, content); + ui_stack_push(eulogium, content, PAGE_NORMAL); } static void _but_settings_hotend_1_offset_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) @@ -1663,9 +2209,7 @@ static void _but_settings_hotend_1_offset_cb(void *data, Evas_Object *obj EINA_U 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); + ui_stack_push(eulogium, content, PAGE_NORMAL); } static void _but_settings_hotend_2_offset_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) @@ -1675,9 +2219,7 @@ static void _but_settings_hotend_2_offset_cb(void *data, Evas_Object *obj EINA_U 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); + ui_stack_push(eulogium, content, PAGE_NORMAL); } static void _but_settings_language_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) @@ -1687,9 +2229,7 @@ static void _but_settings_language_cb(void *data, Evas_Object *obj EINA_UNUSED, 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); + ui_stack_push(eulogium, content, PAGE_NORMAL); } static void _but_settings_led_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) @@ -1702,13 +2242,253 @@ static void _but_settings_led_cb(void *data, Evas_Object *obj EINA_UNUSED, void ui_stack_push(eulogium, content, PAGE_NORMAL); } +static void _but_led_hue_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED) +{ + struct eulogium_data *eulogium = data; + Evas_Object *content; + + printf("Button led_hue pressed\n"); + content = ui_widget_dial(eulogium->navi, eulogium, &dial_led_hue); + ui_stack_push(eulogium, content, PAGE_NORMAL); +} + +static void _but_led_saturation_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED) +{ + struct eulogium_data *eulogium = data; + Evas_Object *content; + + printf("Button led_saturation pressed\n"); + content = ui_widget_dial(eulogium->navi, eulogium, &dial_led_saturation); + ui_stack_push(eulogium, content, PAGE_NORMAL); +} + static void _but_led_brightness_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED) { struct eulogium_data *eulogium = data; Evas_Object *content; printf("Button led_brightness pressed\n"); - content = eulogium_settings_dial(eulogium->navi, eulogium); + content = ui_widget_dial(eulogium->navi, eulogium, &dial_led_brightness); + ui_stack_push(eulogium, content, PAGE_PRINTING); +} + +static void _but_bed_heatup_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED) +{ + struct eulogium_data *eulogium = data; + Evas_Object *content; + + printf("Button bed temperature pressed\n"); + content = ui_widget_dial(eulogium->navi, eulogium, &dials[PROC_BED_HEATUP]); + ui_stack_push(eulogium, content, PAGE_NORMAL); +} + +static void _but_hotend_heatup_0_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED) +{ + struct eulogium_data *eulogium = data; + Evas_Object *content; + + printf("Button hotend 1 temperature pressed\n"); + content = ui_widget_dial(eulogium->navi, eulogium, &dials[PROC_HOTEND_HEATUP_0]); + ui_stack_push(eulogium, content, PAGE_NORMAL); +} + +static void _but_hotend_heatup_1_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED) +{ + struct eulogium_data *eulogium = data; + Evas_Object *content; + + printf("Button hotend 2 temperature pressed\n"); + content = ui_widget_dial(eulogium->navi, eulogium, &dials[PROC_HOTEND_HEATUP_1]); + ui_stack_push(eulogium, content, PAGE_NORMAL); +} + +static void _but_hotend_active_set_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + printf("But hotend_active_set\n"); + procedure_start_simple(PROC_HOTEND_ACTIVE_SET); +} + +static void _but_print_speed_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED) +{ + struct eulogium_data *eulogium = data; + Evas_Object *content; + + printf("Button print speed pressed\n"); + content = ui_widget_dial(eulogium->navi, eulogium, &dials[PROC_PRINT_SPEED]); + ui_stack_push(eulogium, content, PAGE_PRINTING); +} + +static void _but_fan_speed_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED) +{ + struct eulogium_data *eulogium = data; + Evas_Object *content; + + printf("Button fan speed pressed\n"); + content = ui_widget_dial(eulogium->navi, eulogium, &dials[PROC_FAN_SPEED]); + ui_stack_push(eulogium, content, PAGE_NORMAL); +} + +static void _but_flow_rate_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED) +{ + struct eulogium_data *eulogium = data; + Evas_Object *content; + + printf("Button material flow pressed\n"); + content = ui_widget_dial(eulogium->navi, eulogium, &dials[PROC_FLOW_RATE]); + ui_stack_push(eulogium, content, PAGE_NORMAL); +} + +static void _but_retraction_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 retraction\n"); + content = menu_widget_list(eulogium, eulogium->navi, &menu_retraction); + ui_stack_push(eulogium, content, PAGE_NORMAL); +} + +static void _but_retraction_length_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + struct eulogium_data *eulogium = data; + Evas_Object *content = NULL; + + printf("But retraction length\n"); + content = ui_widget_dial(eulogium->navi, eulogium, &dials[PROC_RETRACTION_LENGTH]); + ui_stack_push(eulogium, content, PAGE_NORMAL); +} + +static void _but_retraction_speed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + struct eulogium_data *eulogium = data; + Evas_Object *content = NULL; + + printf("But retraction speed\n"); + content = ui_widget_dial(eulogium->navi, eulogium, &dials[PROC_RETRACTION_SPEED]); + ui_stack_push(eulogium, content, PAGE_NORMAL); +} + +static void _but_retraction_zhop_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + struct eulogium_data *eulogium = data; + Evas_Object *content = NULL; + + printf("But retraction zhop\n"); + content = ui_widget_dial(eulogium->navi, eulogium, &dials[PROC_RETRACTION_ZHOP]); + ui_stack_push(eulogium, content, PAGE_NORMAL); +} + +static void _but_bed_level_auto_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + printf("But bed level auto\n"); + procedure_start_simple(PROC_BED_LEVEL_AUTO); +} + +static void _but_bed_raise_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + printf("But bed raise\n"); + procedure_start_simple(PROC_BED_RAISE); +} + +static void _but_bed_home_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + printf("But bed home\n"); + procedure_start_simple(PROC_BED_HOME); +} + +static void _but_head_home_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + printf("But head home\n"); + procedure_start_simple(PROC_HEAD_HOME); +} + +static void _but_bed_move_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + struct eulogium_data *eulogium = data; + Evas_Object *content = NULL; + + printf("But bed move\n"); + content = ui_widget_rotator(eulogium->navi, eulogium, &dials[PROC_BED_MOVE]); + ui_stack_push(eulogium, content, PAGE_NORMAL); +} + +static void _but_material_move_0_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + struct eulogium_data *eulogium = data; + Evas_Object *content = NULL; + + printf("But move material 0\n"); + content = ui_widget_rotator(eulogium->navi, eulogium, &dials[PROC_MATERIAL_MOVE_0]); + ui_stack_push(eulogium, content, PAGE_NORMAL); +} + +static void _but_material_move_1_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + struct eulogium_data *eulogium = data; + Evas_Object *content = NULL; + + printf("But move material 1\n"); + content = ui_widget_rotator(eulogium->navi, eulogium, &dials[PROC_MATERIAL_MOVE_1]); + ui_stack_push(eulogium, content, PAGE_NORMAL); +} + +static void _but_motion_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 motion\n"); + content = menu_widget_list(eulogium, eulogium->navi, &menu_motion); + ui_stack_push(eulogium, content, PAGE_NORMAL); +} + +static void _but_jerk_xy_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + struct eulogium_data *eulogium = data; + Evas_Object *content = NULL; + + printf("But jerk xy\n"); + content = ui_widget_dial(eulogium->navi, eulogium, &dials[PROC_JERK_XY]); + ui_stack_push(eulogium, content, PAGE_NORMAL); +} + +static void _but_jerk_z_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + struct eulogium_data *eulogium = data; + Evas_Object *content = NULL; + + printf("But jerk z\n"); + content = ui_widget_dial(eulogium->navi, eulogium, &dials[PROC_JERK_Z]); + ui_stack_push(eulogium, content, PAGE_NORMAL); +} + +static void _but_current_xy_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + struct eulogium_data *eulogium = data; + Evas_Object *content = NULL; + + printf("But current xy\n"); + content = ui_widget_dial(eulogium->navi, eulogium, &dials[PROC_CURRENT_XY]); + ui_stack_push(eulogium, content, PAGE_NORMAL); +} + +static void _but_current_z_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + struct eulogium_data *eulogium = data; + Evas_Object *content = NULL; + + printf("But current z\n"); + content = ui_widget_dial(eulogium->navi, eulogium, &dials[PROC_CURRENT_Z]); + ui_stack_push(eulogium, content, PAGE_NORMAL); +} + +static void _but_current_e_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + struct eulogium_data *eulogium = data; + Evas_Object *content = NULL; + + printf("But current e\n"); + content = ui_widget_dial(eulogium->navi, eulogium, &dials[PROC_CURRENT_E]); ui_stack_push(eulogium, content, PAGE_NORMAL); } @@ -1721,10 +2501,11 @@ static char *parse_networks_for_display(struct network_data *networks) if (!networks) return NULL; - for (i = 0; networks[i].obj_path; i++) { - buf = realloc(buf, pos + 34 * sizeof(char *)); - pos += sprintf(buf + pos, "%s%s IP: %s", i == 0 ? "": "<br>", (networks[i].tech == TECH_ETHERNET) ? "Ethernet" : (networks[i].tech == TECH_WIFI) ? "WiFi" : "", networks[i].ipv4); - } + for (i = 0; networks[i].obj_path; i++) + if (networks[i].ipv4) { // TODO || networks[i].ipv6) /* XXX if ipv4 exists, but is '', this will still print an empty field. */ + buf = realloc(buf, pos + 34 * sizeof(char *)); + pos += sprintf(buf + pos, "%s%s IP: %s", i == 0 ? "": "<br>", (networks[i].tech == TECH_ETHERNET) ? "Ethernet" : (networks[i].tech == TECH_WIFI) ? "WiFi" : "", networks[i].ipv4); + } return buf; } @@ -1735,11 +2516,7 @@ static void _but_network_info_cb(void *data, Evas_Object *obj EINA_UNUSED, void Evas_Object *content, *_top, *_bottom; char *buf; - /* XXX Quick hack to make the adv feature a little more useful, this needs to be made much better! */ - _top = elm_box_add(eulogium->navi); - evas_object_show(_top); - - _top = elm_label_add(eulogium->navi); /* TODO, dynamically update IPs */ + _top = elm_label_add(eulogium->navi); /* TODO, dynamically update IPs, requires 'redrawing' of some sort */ buf = parse_networks_for_display(eulogium->networks); elm_object_text_set(_top, buf); free(buf); @@ -1750,10 +2527,26 @@ static void _but_network_info_cb(void *data, Evas_Object *obj EINA_UNUSED, void evas_object_smart_callback_add(_bottom, "clicked", but_return.cb.func, but_return.cb.data); evas_object_show(_bottom); -// elm_naviframe_item_simple_push(eulogium->navi, box); content = eulogium_split_screen(eulogium->navi, _top, _bottom); - if (content) - elm_naviframe_item_simple_push(eulogium->navi, content); + ui_stack_push(eulogium, content, PAGE_NORMAL); +} + +static void _but_software_version_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +{ + struct eulogium_data *eulogium = data; + Evas_Object *content, *_top, *_bottom; + + _top = elm_label_add(eulogium->navi); /* TODO, dynamically update IPs, requires 'redrawing' of some sort */ + elm_object_text_set(_top, PACKAGE_VERSION); + evas_object_show(_top); + + _bottom = elm_button_add(eulogium->navi); + elm_object_text_set(_bottom, _(but_return.text)); /* not pretty using the global XXX */ + evas_object_smart_callback_add(_bottom, "clicked", but_return.cb.func, but_return.cb.data); + evas_object_show(_bottom); + + content = eulogium_split_screen(eulogium->navi, _top, _bottom); + ui_stack_push(eulogium, content, PAGE_NORMAL); } static void _but_main_mathot_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED) @@ -1764,9 +2557,7 @@ static void _but_main_mathot_cb(void *data, Evas_Object *object EINA_UNUSED, voi printf("Button matts pressed\n"); content = eulogium_tripple_button_menu(eulogium->navi, &but_mathot_material, &but_mathot_hotend, &but_return); - if (!content) - return; - elm_naviframe_item_simple_push(eulogium->navi, content); + ui_stack_push(eulogium, content, PAGE_NORMAL); } static void _but_settings_material_1_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED) @@ -1777,9 +2568,7 @@ static void _but_settings_material_1_cb(void *data, Evas_Object *object EINA_UNU printf("Button matts settings 1 pressed\n"); content = menu_widget_list(eulogium, eulogium->navi, &menu_material_1); - if (!content) - return; - elm_naviframe_item_simple_push(eulogium->navi, content); + ui_stack_push(eulogium, content, PAGE_NORMAL); } static void _but_settings_material_2_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED) @@ -1790,9 +2579,7 @@ static void _but_settings_material_2_cb(void *data, Evas_Object *object EINA_UNU printf("Button matts settings 2 pressed\n"); content = menu_widget_list(eulogium, eulogium->navi, &menu_material_2); - if (!content) - return; - elm_naviframe_item_simple_push(eulogium->navi, content); + ui_stack_push(eulogium, content, PAGE_NORMAL); } static void _but_material_customize_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED) @@ -1803,9 +2590,7 @@ static void _but_material_customize_cb(void *data, Evas_Object *object EINA_UNUS 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); + ui_stack_push(eulogium, content, PAGE_NORMAL); } static void _but_print_tune_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED) @@ -1816,9 +2601,7 @@ static void _but_print_tune_cb(void *data, Evas_Object *object EINA_UNUSED, void printf("Button print tune pressed\n"); content = menu_widget_list(eulogium, eulogium->navi, &menu_print_tune); - if (!content) - return; - elm_naviframe_item_simple_push(eulogium->navi, content); + ui_stack_push(eulogium, content, PAGE_PRINTING); } static void _but_change_material_1_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED) @@ -1829,9 +2612,7 @@ static void _but_change_material_1_cb(void *data, Evas_Object *object EINA_UNUSE printf("Button matts change 1 pressed\n"); content = eulogium_tripple_button_menu(eulogium->navi, &but_return, &but_return, &but_return); - if (!content) - return; - elm_naviframe_item_simple_push(eulogium->navi, content); + ui_stack_push(eulogium, content, PAGE_NORMAL); } static void _but_change_material_2_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED) @@ -1842,9 +2623,7 @@ static void _but_change_material_2_cb(void *data, Evas_Object *object EINA_UNUSE printf("Button matts change 2 pressed\n"); content = eulogium_tripple_button_menu(eulogium->navi, &but_return, &but_return, &but_return); - if (!content) - return; - elm_naviframe_item_simple_push(eulogium->navi, content); + ui_stack_push(eulogium, content, PAGE_NORMAL); } static void _but_mathot_material_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED) @@ -1855,9 +2634,7 @@ static void _but_mathot_material_cb(void *data, Evas_Object *object EINA_UNUSED, printf("Button mathot material pressed\n"); content = eulogium_tripple_button_menu(eulogium->navi, &but_material_change, &but_material_settings, &but_return); - if (!content) - return; - elm_naviframe_item_simple_push(eulogium->navi, content); + ui_stack_push(eulogium, content, PAGE_NORMAL); } static void _but_mathot_hotend_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED) @@ -1868,9 +2645,7 @@ static void _but_mathot_hotend_cb(void *data, Evas_Object *object EINA_UNUSED, v printf("Button mathot hotend pressed\n"); content = eulogium_tripple_button_menu(eulogium->navi, &but_hotend_change, &but_hotend_settings, &but_return); - if (!content) - return; - elm_naviframe_item_simple_push(eulogium->navi, content); + ui_stack_push(eulogium, content, PAGE_NORMAL); } static void _but_settings_hotend_1_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED) @@ -1881,9 +2656,7 @@ static void _but_settings_hotend_1_cb(void *data, Evas_Object *object EINA_UNUSE printf("Button hotend settings 1 pressed\n"); content = menu_widget_list(eulogium, eulogium->navi, &menu_settings_hotend_1_offset); - if (!content) - return; - elm_naviframe_item_simple_push(eulogium->navi, content); + ui_stack_push(eulogium, content, PAGE_NORMAL); } static void _but_settings_hotend_2_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED) @@ -1894,9 +2667,7 @@ static void _but_settings_hotend_2_cb(void *data, Evas_Object *object EINA_UNUSE printf("Button hotend settings 2 pressed\n"); content = menu_widget_list(eulogium, eulogium->navi, &menu_settings_hotend_1_offset); - if (!content) - return; - elm_naviframe_item_simple_push(eulogium->navi, content); + ui_stack_push(eulogium, content, PAGE_NORMAL); } static void _but_change_hotend_1_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED) @@ -1907,9 +2678,7 @@ static void _but_change_hotend_1_cb(void *data, Evas_Object *object EINA_UNUSED, printf("Button hotend change 1 pressed\n"); content = eulogium_tripple_button_menu(eulogium->navi, &but_return, &but_return, &but_return); - if (!content) - return; - elm_naviframe_item_simple_push(eulogium->navi, content); + ui_stack_push(eulogium, content, PAGE_NORMAL); } static void _but_change_hotend_2_cb(void *data, Evas_Object *object EINA_UNUSED, void *event_info EINA_UNUSED) @@ -1920,9 +2689,7 @@ static void _but_change_hotend_2_cb(void *data, Evas_Object *object EINA_UNUSED, printf("Button matts change 2 pressed\n"); content = eulogium_tripple_button_menu(eulogium->navi, &but_return, &but_return, &but_return); - if (!content) - return; - elm_naviframe_item_simple_push(eulogium->navi, content); + ui_stack_push(eulogium, content, PAGE_NORMAL); } void eulogium_button_cb_set(struct button_def *button, struct button_cb *cb) @@ -1955,29 +2722,12 @@ void eulogium_print_data_set(struct eulogium_data *eulogium, char *filepath) buf = malloc(buf_size); /* TODO: remember to free this later! */ snprintf(buf, buf_size, "file://%s", filepath); eulogium->print.url = buf; - eulogium->print.name = ecore_file_strip_ext(ecore_file_file_get(filepath)); + eulogium->print.jobname = ecore_file_strip_ext(ecore_file_file_get(filepath)); eulogium->print.flags = ""; eulogium->print.material = 100.23; /* TODO */ eulogium->print.time = 12; } -/* Function to make the Z-axis of any wheel focus the next/previous focusable widget */ -static void _cb_eulogium_input_wheel(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info) -{ - Evas_Event_Mouse_Wheel *ev = event_info; - Ecore_Event *event = NULL; - - if (ev->z > 0) { - elm_object_focus_next((Evas_Object *)data, ELM_FOCUS_NEXT); - event = ecore_event_add(INPUT_MOUSE_WHEEL_DOWN, NULL, NULL, NULL); - } else { - elm_object_focus_next((Evas_Object *)data, ELM_FOCUS_PREVIOUS); - event = ecore_event_add(INPUT_MOUSE_WHEEL_UP, NULL, NULL, NULL); - } - if (!event) - EINA_LOG_ERR("Wheel event failed to queue."); -} - static void _cb_eulogium_exit(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { elm_exit(); @@ -2015,117 +2765,33 @@ struct _status_msg { char *s; }; -static void eulogium_printer_status_set(struct eulogium_data *eulogium, struct _status_msg *status); - -static void _on_get_status_ret(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED) -{ - const char *errname, *errmsg; - struct eulogium_data *eulogium = data; - char *state; - struct _status_msg status; - - if (eldbus_message_error_get(msg, &errname, &errmsg)) { - EINA_LOG_ERR("%s %s", errname, errmsg); - status.i = ERROR; - status.s = griffin_print_status[ERROR]; - } else if (!eldbus_message_arguments_get(msg, "s", &state)) { - EINA_LOG_ERR("Message content does not match expected \"s\" signature."); - status.i = ERROR; - status.s = griffin_print_status[ERROR]; - } else if (!strncmp(state, "DISCONNECTED", 12)) { /* XXX replace this with something better and maintainable, function, LUT etc */ - status.i = DISCONNECTED; - status.s = griffin_print_status[DISCONNECTED]; - } else if (!strncmp(state, "ERROR", 5)) { - status.i = ERROR; - status.s = griffin_print_status[ERROR]; - } else if (!strncmp(state, "FIRST_RUN_WIZZARD", 17)) { - status.i = FIRST_RUN_WIZZARD; - status.s = griffin_print_status[FIRST_RUN_WIZZARD]; - } else if (!strncmp(state, "IDLE", 4)) { - status.i = IDLE; - status.s = griffin_print_status[IDLE]; - } else if (!strncmp(state, "SLICING", 7)) { - status.i = SLICING; - status.s = griffin_print_status[SLICING]; - } else if (!strncmp(state, "HEATING", 7)) { - status.i = HEATING; - status.s = griffin_print_status[HEATING]; - } else if (!strncmp(state, "PRINTING", 8)) { - status.i = PRINTING; - status.s = griffin_print_status[PRINTING]; - } else if (!strncmp(state, "COOLING", 7)) { - status.i = COOLING; - status.s = griffin_print_status[COOLING]; - } else if (!strncmp(state, "WAIT_FOR_REMOVAL", 16)) { - status.i = WAIT_FOR_REMOVAL; - status.s = griffin_print_status[WAIT_FOR_REMOVAL]; - } else if (!strncmp(state, "PAUSED", 6)) { - status.i = PAUSED; - status.s = griffin_print_status[PAUSED]; - } else { - status.i = UNKNOWN; - status.s = griffin_print_status[UNKNOWN]; - } - eulogium_printer_status_set(eulogium, &status); -} - -static void _on_get_progress_ret(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED) -{ - const char *errname, *errmsg; - double *progress = data; - - if (eldbus_message_error_get(msg, &errname, &errmsg)) { - EINA_LOG_ERR("%s %s", errname, errmsg); - return; - } - if (!eldbus_message_arguments_get(msg, "d", progress)) { - EINA_LOG_ERR("Failed to get print progress."); - return; - } -} - -static void _on_get_time_ret(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED) -{ - const char *errname, *errmsg; - uint_fast32_t *time = data; - - if (eldbus_message_error_get(msg, &errname, &errmsg)) { - EINA_LOG_ERR("%s %s", errname, errmsg); - return; - } - if (!eldbus_message_arguments_get(msg, "u", time)) { - EINA_LOG_ERR("Failed to get remaining print time."); - return; - } -} - static Eina_Bool _timer_progress_data_update_cb(void *data) { struct eulogium_data *eulogium = data; static enum printer_status status = -1; - static double progress = 0; + static double value = 0; static double time = -1; - //eldbus_proxy_call(eulogium->dbus.proxy[PRINTER], "getProgress", _on_get_progress_ret, &eulogium->print.progress, 2, ""); - //eldbus_proxy_call(eulogium->dbus.proxy[PRINTER], "getTime", _on_get_time_ret, &eulogium->print.time, 2, ""); + procedure_metadata_key_get(PROC_PRINT); + /* XXX This is an ugly hack that doesn't even work to abort the timer, we need to refactor this into something sensible + * Basically we want to stop this time whenever the item gets removed from the stack via the + * clean/free callback. */ + if ((!eulogium->status) && (!eulogium->progress) && (!eulogium->name) && (!eulogium->time)) + return ECORE_CALLBACK_CANCEL; if (eulogium->printer.status != status) { - elm_object_text_set(eulogium->status, _(griffin_print_status[eulogium->printer.status])); + elm_object_text_set(eulogium->status, "TODO (step key)"); if (eulogium->printer.status == COOLING) elm_progressbar_inverted_set(eulogium->progress, EINA_TRUE); status = eulogium->printer.status; } - if (eulogium->print.progress != progress) { - elm_progressbar_value_set(eulogium->progress, eulogium->print.progress); - progress = eulogium->print.progress; - } - if (eulogium->print.name_changed == EINA_TRUE) { - elm_object_text_set(eulogium->name, _(eulogium->print.name)); - eulogium->print.name_changed = EINA_FALSE; + if (eulogium->print.value != value) { + elm_progressbar_value_set(eulogium->progress, eulogium->print.value); + value = eulogium->print.value; } if (eulogium->print.time != time) { char buf[255], *str; - uint_fast32_t time = 0; + int_fast32_t time = 0; if (eulogium->print.time < 1) { str = "Print time unknown"; @@ -2195,7 +2861,7 @@ static Eina_Bool _timer_print_unblock_cb(void *data) } } -Evas_Object *eulogium_print_ignore(struct eulogium_data *eulogium) +Evas_Object *eulogium_print_ignore(struct eulogium_data *eulogium) /* TODO pass print_data struct */ { Evas_Object *_top, *_bottom; @@ -2218,7 +2884,7 @@ Evas_Object *eulogium_print_ignore(struct eulogium_data *eulogium) evas_object_show(eulogium->time); elm_box_pack_end(_top, eulogium->time); - eulogium->progress = elm_progressbar_add(_top); /* TODO: depending on i18n sig, change inverted */ + eulogium->progress = elm_progressbar_add(_top); elm_progressbar_horizontal_set(eulogium->progress, EINA_TRUE); elm_progressbar_pulse_set(eulogium->progress, EINA_FALSE); elm_progressbar_pulse(eulogium->progress, EINA_FALSE); @@ -2238,17 +2904,52 @@ Evas_Object *eulogium_print_ignore(struct eulogium_data *eulogium) return eulogium_split_screen(eulogium->navi, _top, _bottom); } -Evas_Object *eulogium_print_progress(struct eulogium_data *eulogium) +Evas_Object *eulogium_pre_print(Evas_Object *parent, struct eulogium_data *eulogium) +{ + Evas_Object *_top, *_bottom, *obj; + + _top = elm_box_add(parent); + evas_object_size_hint_weight_set(_top, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(_top, EVAS_HINT_FILL, EVAS_HINT_FILL); + elm_box_homogeneous_set(_top, EINA_FALSE); + evas_object_show(_top); + + obj = elm_label_add(_top); + elm_object_text_set(obj, _("Preparing printer ...")); + elm_label_slide_mode_set(obj, ELM_LABEL_SLIDE_MODE_NONE); + evas_object_size_hint_align_set(obj, EVAS_HINT_FILL, EVAS_HINT_FILL); + evas_object_show(obj); + elm_box_pack_end(_top, obj); + + /* Pulse progress */ + + _bottom = eulogium_dual_button_add(eulogium->navi, &but_print_tune, &but_print_abort_confirm); + _bottom = elm_button_add(parent); + evas_object_size_hint_weight_set(_bottom, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(_bottom, EVAS_HINT_FILL, EVAS_HINT_FILL); + elm_object_text_set(_bottom, _(but_print_abort_confirm.text)); + evas_object_smart_callback_add(_bottom, "clicked", but_print_abort_confirm.cb.func, but_print_abort_confirm.cb.data); + evas_object_show(obj); + evas_object_show(_bottom); + + return eulogium_split_screen(eulogium->navi, _top, _bottom); +} + +Evas_Object *eulogium_print_progress(Evas_Object *parent, struct eulogium_data *eulogium, const struct print_data *print) /* TODO pass timer var to store timer in */ { Evas_Object *_top, *_bottom; + /* TODO maybe this timer needs to be split into twofold update the widgets locally here, + * emit a signal/tell the metadata cb to start gathering meta data */ + /* this needs to be done, so that we can pass the proper parameters. For now, just hackishly split them. + */ eulogium->progress_data_refresh = ecore_timer_add(0.5, _timer_progress_data_update_cb, eulogium); if (!eulogium->progress_data_refresh) { /* TODO make define for the timeout */ EINA_LOG_CRIT("Unable to create progress update timer"); return NULL; } - _top = elm_box_add(eulogium->navi); + _top = elm_box_add(parent); evas_object_size_hint_weight_set(_top, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(_top, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_box_homogeneous_set(_top, EINA_FALSE); @@ -2269,7 +2970,7 @@ Evas_Object *eulogium_print_progress(struct eulogium_data *eulogium) elm_box_pack_end(_top, eulogium->status); eulogium->name = elm_label_add(_top); - elm_object_text_set(eulogium->name, eulogium->print.name); + elm_object_text_set(eulogium->name, print->jobname); elm_label_slide_mode_set(eulogium->name, ELM_LABEL_SLIDE_MODE_AUTO); //elm_label_slide_speed_set(object, 2); elm_label_slide_go(eulogium->name); @@ -2282,74 +2983,57 @@ Evas_Object *eulogium_print_progress(struct eulogium_data *eulogium) elm_progressbar_horizontal_set(eulogium->progress, EINA_TRUE); elm_progressbar_pulse_set(eulogium->progress, EINA_FALSE); /* TODO: pulse = time-unknown/pause */ elm_progressbar_pulse(eulogium->progress, EINA_FALSE); - elm_progressbar_value_set(eulogium->progress, eulogium->print.progress); + elm_progressbar_value_set(eulogium->progress, print->value); elm_progressbar_unit_format_set(eulogium->progress, "%1.1f %%"); evas_object_size_hint_align_set(eulogium->progress, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(eulogium->progress); elm_box_pack_end(_top, eulogium->progress); - _bottom = eulogium_dual_button_add(eulogium->navi, &but_print_tune, &but_print_abort_confirm); + _bottom = eulogium_dual_button_add(parent, &but_print_tune, &but_print_abort_confirm); evas_object_show(_bottom); - return eulogium_split_screen(eulogium->navi, _top, _bottom); + return eulogium_split_screen(parent, _top, _bottom); } -Evas_Object *eulogium_generic_error(struct eulogium_data *eulogium, uint8_t eulogium_error) +void eulogium_generic_error(struct eulogium_data *eulogium, uint_fast16_t error_code, const char *error_msg) { - Evas_Object *box, *object; - char buf[] = "Printer error -255.<br>Please contact support via<br>http://ultimaker.com/support."; + Evas_Object *content, *object; + char buf[250]; /* 250 characters should be enough for everyone XXX (find the max number of chars we can actually print) */ /* TODO, replace with define of strings to collect all strings centrally */ - box = elm_box_add(eulogium->navi); - evas_object_show(box); + content = elm_box_add(eulogium->navi); + evas_object_show(content); object = elm_label_add(eulogium->navi); - snprintf(buf, sizeof(buf), "Printer error %d.<br>Please contact support via<br>http://ultimaker.com/support.", eulogium_error); + snprintf(buf, sizeof(buf), "Printer error %u.<br>%s", (unsigned int)error_code, + strlen(error_msg) > 0 ? error_msg : "Please contact support via<br>http://ultimaker.com/support."); elm_object_text_set(object, _(buf)); evas_object_show(object); - elm_box_pack_end(box, object); + elm_box_pack_end(content, object); -#if 0 +#if 1 /* XXX what to do here, reboot? make support notice via wget? */ object = elm_button_add(eulogium->navi); - elm_object_text_set(object, _("ABORT")); /* TODO create abort button */ - evas_object_size_hint_align_set(object, EVAS_HINT_FILL, EVAS_HINT_FILL); + elm_object_text_set(object, _("IGNORE")); /* TODO create abort button */ + evas_object_size_hint_align_set(object, EVAS_HINT_FILL, 1.0); evas_object_size_hint_weight_set(object, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_smart_callback_add(object, "clicked", _print_abort_cb, eulogium); /* TODO what button to use here? */ + evas_object_smart_callback_add(object, "clicked", &_cb_content_prev_set, eulogium); /* TODO what button to use here? */ evas_object_show(object); - elm_box_pack_end(box, object); + elm_box_pack_end(content, object); #endif - return box; + ui_stack_push(eulogium, content, PAGE_ERROR); } -static void _on_cleared_printer_ret(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED) -{ - const char *errname, *errmsg; - Eina_Bool cleared_bed = EINA_FALSE; - - if (eldbus_message_error_get(msg, &errname, &errmsg)) { - EINA_LOG_ERR("%s %s", errname, errmsg); - return; - } - if (!eldbus_message_arguments_get(msg, "b", &cleared_bed)) { - EINA_LOG_ERR("Failed to get bed clear status."); - return; - } - if (cleared_bed == EINA_TRUE) - EINA_LOG_INFO("Bed has been successfully Cleared"); - else - EINA_LOG_WARN("Unable to clear printer bed"); -} - -static void _cleared_bed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +static void _cleaned_bed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { struct eulogium_data *eulogium = data; - //eldbus_proxy_call(eulogium->dbus.proxy[PRINTER], "clearedPrinter", _on_cleared_printer_ret, eulogium, -1, ""); + procedure_print_printer_cleaned(); + _cb_content_prev_set(eulogium, obj, event_info); /* replace with ui_pop_stack */ } -Evas_Object *eulogium_clear_print_bed(struct eulogium_data *eulogium) +Evas_Object *eulogium_clean_print_bed(struct eulogium_data *eulogium) { Evas_Object *_top, *_bottom, *obj; @@ -2363,12 +3047,17 @@ Evas_Object *eulogium_clear_print_bed(struct eulogium_data *eulogium) _bottom = elm_button_add(eulogium->navi); elm_object_text_set(_bottom, _("Print removed")); - evas_object_smart_callback_add(_bottom, "clicked", _cleared_bed_cb, eulogium); + evas_object_smart_callback_add(_bottom, "clicked", _cleaned_bed_cb, eulogium); evas_object_show(_bottom); return eulogium_split_screen(eulogium->navi, _top, _bottom); } +struct _wifilist_data { + struct eulogium_data *eulogium; + struct network_data *network; +}; + struct _filelist_data { struct eulogium_data *eulogium; struct dir_entry_def *dir; @@ -2380,6 +3069,39 @@ struct _filelist_entry_data { char *filepath; }; +static void _cb_select_wifi(void *data, Evas_Object *eo EINA_UNUSED, void *event_info EINA_UNUSED) +{ + struct eulogium_data *eulogium = ((struct _wifilist_data *)data)->eulogium; + Evas_Object *navi = eulogium->navi; + const struct network_data *network = ((struct _wifilist_data *)data)->network; + Evas_Object *content, *_top, *_bottom, *obj; + + /* TODO replace with generic dialog code */ + _top = elm_box_add(navi); + evas_object_show(_top); + + obj = elm_label_add(_top); + elm_object_text_set(obj, _("Attempting to connect to Wifi:")); + evas_object_show(obj); + elm_box_pack_end(_top, obj); + + obj = elm_label_add(_top); + elm_object_text_set(obj, network->ssid); + evas_object_show(obj); + elm_box_pack_end(_top, obj); + /* TODO add animation and 'connection finished' signal handler */ + + _bottom = elm_button_add(navi); + elm_object_text_set(_bottom, _("Ok")); + evas_object_smart_callback_add(_bottom, "clicked", _cb_content_prev_set, eulogium); + evas_object_show(_bottom); + + content = eulogium_split_screen(navi, _top, _bottom); + ui_stack_push(eulogium, content, PAGE_NORMAL); + + network_connect_wifi(network); +}; + static void _cb_select_file(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { struct eulogium_data *eulogium = ((struct _filelist_entry_data *)data)->filelist->eulogium; @@ -2387,6 +3109,7 @@ static void _cb_select_file(void *data, Evas_Object *obj EINA_UNUSED, void *even if (filepath) { if (ecore_file_is_dir(filepath)) { + Evas_Object *content; struct menu_def *new_dir; uint_fast16_t new_dir_len; @@ -2396,10 +3119,15 @@ static void _cb_select_file(void *data, Evas_Object *obj EINA_UNUSED, void *even new_dir->type = LIST_FILE; new_dir->dir.path = malloc(new_dir_len); /* XXX memleak, but by copying we can free _filelist_data without worry */ strncpy(new_dir->dir.path, filepath, new_dir_len); - menu_widget_list_push(eulogium, new_dir); + content = menu_widget_list(eulogium, eulogium->navi, new_dir); + ui_stack_push(eulogium, content, PAGE_NORMAL); /* XXX We need to set the correct page type here */ } else { + Evas_Object *content; + eulogium_print_data_set(eulogium, filepath); - procedure_start_print(eulogium->dbus.proxy[PRINTER], &eulogium->print); + procedure_print_start(&eulogium->print); + content = eulogium_pre_print(eulogium->navi, eulogium); + ui_stack_push(eulogium, content, PAGE_PRINTING); } } } @@ -2465,10 +3193,10 @@ static void _cb_populate_filelist(const char *name, const char *path, void *data ext = ecore_file_ext_get(name); if (!ext) return; - if (!filelist->eulogium->printer.file_handlers) - return; - for (i = 0; filelist->eulogium->printer.file_handlers[i] != NULL; i++) - if (strncmp(ext, filelist->eulogium->printer.file_handlers[i], strlen(ext)) == 0) +// if (!filelist->eulogium->printer.file_handlers) +// return; +// for (i = 0; filelist->eulogium->printer.file_handlers[i] != NULL; i++) + if (strncmp(ext, /*filelist->eulogium->printer.file_handlers[i] */"gcode", strlen(ext)) == 0) valid_ext++; if (!valid_ext) return; @@ -2483,7 +3211,7 @@ static void _cb_populate_filelist(const char *name, const char *path, void *data elm_image_resizable_set(icon, EINA_FALSE, EINA_FALSE); evas_object_show(icon); - filelist_entry = malloc(sizeof(struct _filelist_entry_data)); + filelist_entry = malloc(sizeof(struct _filelist_entry_data)); /* XXX free on destroy */ filelist_entry->filelist = filelist; filelist_entry->filepath = filepath; eulogium_item_list_sorted_insert(filelist->list, icon, name, NULL, _cb_select_file, filelist_entry, _cb_dirfile_sort); @@ -2555,12 +3283,38 @@ static void _set_hotspot_power_cb(void *data, Evas_Object *obj, void *event_info { struct eulogium_data *eulogium = data; - eldbus_proxy_call(eulogium->dbus.proxy[NETWORK], "setHotspotPower", on_method_generic_ret, NULL, -1, "b", elm_check_state_get(obj)); + eldbus_proxy_call(eulogium->dbus.proxy[NETWORK], "setHotspotEnabled", on_method_generic_ret, NULL, -1, "b", elm_check_state_get(obj)); } -static void _menu_generate_wifilist(struct eulogium_data *eulogium, Evas_Object *list, struct wifi_def *wifi) +static void network_wifi_list(struct eulogium_data *eulogium, Evas_Object *list, struct network_data *networks) { Evas_Object *icon; + uint_fast16_t i = 0; + + if (!networks) + return; + + + icon = elm_icon_add(list); + elm_icon_standard_set(icon, "wifi-wpa-icon"); + evas_object_show(icon); + for (i = 0; networks[i].obj_path; i++) + if (networks[i].tech == TECH_WIFI) { + struct _wifilist_data *wifilist; + + wifilist = malloc(sizeof(struct _wifilist_data)); /* XXX free on destroy */ + wifilist->eulogium = eulogium; + wifilist->network = &networks[i]; + + eulogium_item_list_append(list, NULL, networks[i].ssid, NULL, _cb_select_wifi, wifilist); + } +} + +static void _menu_generate_wifilist(struct eulogium_data *eulogium, Evas_Object *list, struct network_data *networks) +{ + Evas_Object *icon; + + network_wifi_list(eulogium, list, networks); icon = elm_icon_add(list); elm_icon_standard_set(icon, "user-home"); @@ -2621,6 +3375,8 @@ Evas_Object *menu_widget_list(struct eulogium_data *eulogium, Evas_Object *paren obj = elm_label_add(box); elm_object_text_set(obj, _(menu->title)); /* XXX THIS IS NOT ALWAYS IN DATA! */ + elm_object_style_set(obj, "title"); + evas_object_anti_alias_set(obj, EINA_FALSE); evas_object_size_hint_align_set(obj, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(obj); elm_box_pack_start(box, obj); @@ -2637,7 +3393,7 @@ Evas_Object *menu_widget_list(struct eulogium_data *eulogium, Evas_Object *paren if (menu->type == LIST_FILE) _menu_generate_filelist(eulogium, list, &menu->dir); if (menu->type == LIST_WIFI) - _menu_generate_wifilist(eulogium, list, NULL); + _menu_generate_wifilist(eulogium, list, eulogium->networks); eulogium_item_list_go(list); evas_object_show(list); elm_box_pack_end(box, list); @@ -2657,157 +3413,11 @@ Evas_Object *menu_widget_list(struct eulogium_data *eulogium, Evas_Object *paren return box; } -struct _multi_screen_next_cb_data { - struct eulogium_data *eulogium; - struct multi_screen_data *screen_data; - uint_fast8_t pagenum; - Eina_Bool pageindex; -}; - -static void _eulogium_multi_screen_next_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) -{ - Evas_Object *content; - struct eulogium_data *eulogium = ((struct _multi_screen_next_cb_data *)data)->eulogium; - uint_fast8_t pagenum = ((struct _multi_screen_next_cb_data *)data)->pagenum; - Eina_Bool pageindex = ((struct _multi_screen_next_cb_data *)data)->pageindex; - struct multi_screen_data *screen_data = ((struct _multi_screen_next_cb_data *)data)->screen_data; - - if (pagenum >= screen_data->count) { - Elm_Object_Item *item; - - item = elm_naviframe_bottom_item_get(eulogium->navi); - if (item) - elm_naviframe_item_pop_to(item); - /* XXX what else? */ - } else { - content = eulogium_multi_screen_menu(eulogium, eulogium->navi, screen_data, pagenum, pageindex); - if (content) - elm_naviframe_item_simple_push(eulogium->navi, content); - /* XXX what else? */ - } - free(data); -} - static void _cb_material_set(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { printf("Material: %s selected\n", (char *)data); } -Evas_Object *eulogium_multi_screen_menu(struct eulogium_data *eulogium, Evas_Object *parent, struct multi_screen_data *screen_data, uint_fast8_t pagenum, Eina_Bool pageindex) /* TODO swap parent/eulogium */ -{ - Evas_Object *object; - Evas_Object *_top, *_bottom; - struct _multi_screen_next_cb_data *multi_screen_next_cb_data; - char buf[6]; - - _top = elm_box_add(parent); - evas_object_show(_top); - - if (screen_data->count == 0) { - EINA_LOG_WARN("Tut tut, we can't have a count of 0!\n"); - return NULL; - } - - if (pagenum >= screen_data->count) - pagenum = screen_data->count - 1; - - if (pageindex) { - object = elm_label_add(_top); - snprintf(buf, sizeof(buf), "%d/%d", pagenum + 1, screen_data->count); - elm_object_text_set(object, _(buf)); - evas_object_show(object); - evas_object_size_hint_weight_set(object, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(object, 1.0, 0); - elm_box_pack_end(_top, object); - } - - if (screen_data->screen[pagenum].text) { - object = elm_label_add(_top); - elm_object_text_set(object, _(screen_data->screen[pagenum].text)); - evas_object_size_hint_align_set(object, 0.5, 0.5); - evas_object_show(object); - elm_box_pack_end(_top, object); - } - - switch (screen_data->screen[pagenum].type) { - Evas_Object *box; /* TODO rename to 'type' or something */ - - case MATERIAL: - box = elm_box_add(_top); - elm_box_horizontal_set(box, EINA_TRUE); - evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_show(box); - - object = elm_button_add(box); - evas_object_size_hint_align_set(object, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_weight_set(object, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_object_text_set(object, "PLA"); /* Materials need to be handled differently */ - evas_object_smart_callback_add(object, "clicked", _cb_material_set, "PLA"); - evas_object_show(object); - elm_box_pack_end(box, object); - - object = elm_button_add(box); - evas_object_size_hint_align_set(object, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_weight_set(object, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_object_text_set(object, "ABS"); - evas_object_smart_callback_add(object, "clicked", _cb_material_set, "ABS"); - evas_object_show(object); - elm_box_pack_end(box, object); - - elm_box_pack_end(_top, box); - break; - case PROGRESS: - box = elm_progressbar_add(_top); - elm_progressbar_horizontal_set(box, EINA_TRUE); - elm_progressbar_pulse_set(box, EINA_FALSE); /* TODO: pulse = time-unknown/pause */ - elm_progressbar_pulse(box, EINA_FALSE); - elm_progressbar_value_set(box, 0.5); - elm_progressbar_unit_format_set(box, "%1.0f%%"); - evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_show(box); - elm_box_pack_end(_top, box); - break; - case FUNC: - /* call function pointer from screen_data.func */ - break; - case END: /* fall through */ - default: - break; - } - - _bottom = elm_box_add(parent); - elm_box_horizontal_set(_bottom, EINA_TRUE); - evas_object_show(_bottom); - - multi_screen_next_cb_data = malloc(sizeof(struct _multi_screen_next_cb_data)); - multi_screen_next_cb_data->eulogium = eulogium; - multi_screen_next_cb_data->screen_data = screen_data; - multi_screen_next_cb_data->pagenum = pagenum + 1; - multi_screen_next_cb_data->pageindex = EINA_TRUE; - - if (screen_data->screen[pagenum].prev_button) { - object = elm_button_add(parent); - evas_object_size_hint_align_set(object, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_weight_set(object, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_object_text_set(object, _(screen_data->screen[pagenum].prev_button)); - evas_object_smart_callback_add(object, "clicked", _cb_content_prev_set, eulogium); - evas_object_show(object); - elm_box_pack_end(_bottom, object); - } - if (screen_data->screen[pagenum].next_button) { - object = elm_button_add(parent); - evas_object_size_hint_align_set(object, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_size_hint_weight_set(object, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_object_text_set(object, _(screen_data->screen[pagenum].next_button)); - evas_object_smart_callback_add(object, "clicked", _eulogium_multi_screen_next_cb, multi_screen_next_cb_data); - evas_object_show(object); - elm_box_pack_end(_bottom, object); - } - - return eulogium_split_screen(parent, _top, _bottom); -} - Evas_Object *eulogium_menu_confirm(Evas_Object *parent, const char *msg, const char *prev, const struct button_def *next) { @@ -2911,130 +3521,6 @@ Evas_Object *eulogium_tripple_button_menu(Evas_Object *parent, const struct butt return eulogium_split_screen(parent, _top, _bottom); } -static Eina_Bool _dial_change_delay(void *data) -{ - Evas_Object *dial = data; - Ecore_Timer *delay; - - evas_object_data_set(dial, "delay", NULL); - evas_object_smart_callback_call(dial, "delay,changed", NULL); - - return ECORE_CALLBACK_CANCEL; -} - -static Eina_Bool _dial_change(void *data, int type, void *event_info EINA_UNUSED) -{ - Evas_Object *dial = data; - Ecore_Timer *delay; - double value, step; - -/* TODO XXX we call this dirty little hack because debian's v1.8 of elm does not offer us to actually call drag,left - * evas_object_smart_callback_call(dial, "drag,left", NULL); would have been much cleaner and we didn't need to do - * the val+step get/set thing and thus also benefit from delay,changed which we now 'fake' badly. - */ - value = elm_slider_value_get(dial); - step = elm_slider_step_get(dial); - if (type == INPUT_MOUSE_WHEEL_UP) - elm_slider_value_set(dial, value + step); - if (type == INPUT_MOUSE_WHEEL_DOWN) - elm_slider_value_set(dial, value - step); - evas_object_smart_callback_call(dial, "changed", NULL); - delay = evas_object_data_get(dial, "delay"); - ecore_timer_del(delay); - delay = ecore_timer_add(0.5, _dial_change_delay, dial); /* TODO make define for delay */ - evas_object_data_set(dial, "delay", delay); - - return ECORE_CALLBACK_PASS_ON; -} - -static void _dial_send_update(void *data, Evas_Object *eo, void *event_info EINA_UNUSED) -{ - Eldbus_Proxy *proxy = data; - - eldbus_proxy_call(proxy, "setBrightness", NULL, NULL, -1, "d", elm_slider_value_get(eo)); -} - -Evas_Object *eulogium_settings_dial(Evas_Object *parent, struct eulogium_data *eulogium) -{ - Evas_Object *_top, *_bottom, *obj; - - /* if type is tar/cur do something different TODO */ - _top = elm_slider_add(parent); - elm_object_text_set(_top, "Brightness:"); - elm_object_focus_allow_set(_top, EINA_FALSE); - elm_slider_unit_format_set(_top, "%1.0f%"); - elm_slider_min_max_set(_top, 0, 100); - elm_slider_step_set(_top, 1.0); - evas_object_size_hint_weight_set(_top, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(_top, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_smart_callback_add(_top, "delay,changed", _dial_send_update, eulogium->dbus.proxy[LED]); - eulogium->event_inc = ecore_event_handler_add(INPUT_MOUSE_WHEEL_UP, _dial_change, _top); - eulogium->event_dec = ecore_event_handler_add(INPUT_MOUSE_WHEEL_DOWN, _dial_change, _top); - evas_object_show(_top); - - obj = elm_label_add(_top); - elm_object_text_set(obj, "100%"); - evas_object_show(obj); - elm_object_part_content_set(_top, "end", obj); - - _bottom = elm_button_add(parent); - elm_object_text_set(_bottom, _("Click when done")); /* TODO, make define for this text */ - evas_object_size_hint_weight_set(_bottom, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(_bottom, EVAS_HINT_FILL, EVAS_HINT_FILL); - evas_object_smart_callback_add(_bottom, "clicked", _cb_content_prev_set, eulogium); - evas_object_show(_bottom); - - return eulogium_split_screen(parent, _top, _bottom); -} - -static struct multi_screen screen[] = { - { - .type = NONE, - .text = "Welcome<br>to your new Ultimaker", - .func = NULL, - .data = NULL, - .prev_button = "Skip Wizzard!", - .next_button = "Continue", - }, - { - .type = MATERIAL, - .text = "Choose material", - .func = NULL, - .data = NULL, - .prev_button = "Skip Wizzard!", - .next_button = "Continue", - }, - { - .type = FUNC, - .text = "Level bed", - .func = NULL, - .data = "Bed leveling call", - .prev_button = "Skip Wizzard!", - .next_button = "Continue", - }, - { - .type = PROGRESS, - .text = "Heating ...", - .func = NULL, - .data = "progress object", - .prev_button = "Skip Wizzard!", - .next_button = "Continue", - }, - { - .type = NONE, - .text = "Lets print!", - .func = NULL, - .data = NULL, - .prev_button = NULL, - .next_button = "Let's Print!", - }, - { .type = END, /* sentinel */ }, -}; - -static struct multi_screen_data screen_data = { - .screen = &screen[0], -}; - Evas_Object *eulogium_main_menu(Evas_Object *window, struct eulogium_data *eulogium) { Evas_Object *content; @@ -3042,74 +3528,25 @@ Evas_Object *eulogium_main_menu(Evas_Object *window, struct eulogium_data *eulog eulogium->navi = elm_naviframe_add(window); if (!eulogium->navi) return NULL; - elm_naviframe_prev_btn_auto_pushed_set(eulogium->navi, EINA_FALSE); /* We removed this from the theme, enabling it causes errors */ + /* We removed the prev button from the theme, enabling it causes errors */ + elm_naviframe_prev_btn_auto_pushed_set(eulogium->navi, EINA_FALSE); + /* Except the first frame, never safe any frames after pop */ + elm_naviframe_content_preserve_on_pop_set(eulogium->navi, EINA_FALSE); + /* The main menu should be drawn first, consider changing this to 'get bottom, insert before bottom, pop_to + * instead of assuming the stack is empty */ content = eulogium_tripple_button_menu(eulogium->navi, &but_main_print, &but_main_mathot, &but_main_system); - if (!content) - return NULL; - elm_naviframe_item_simple_push(eulogium->navi, content); + ui_stack_push(eulogium, content, PAGE_BOTTOM); return eulogium->navi; } -static void eulogium_setup(struct eulogium_data *eulogium) -{ - while (screen_data.screen[screen_data.count].type != END) - screen_data.count++; - - /* This is silly, barding redonkylous and will get fixed in the refactoring */ - eulogium->procedures = procedures_init(); - eulogium_button_cb_data_set(&but_return, eulogium); - eulogium_button_cb_data_set(&but_print_abort_confirm, eulogium); - eulogium_button_cb_data_set(&but_print_abort, eulogium); - eulogium_button_cb_data_set(&but_print_tune, eulogium); - eulogium_button_cb_data_set(&but_main_print, eulogium); - eulogium_button_cb_data_set(&but_print_ignore, eulogium); - eulogium_button_cb_data_set(&but_print_local, eulogium); - eulogium_button_cb_data_set(&but_print_usb, eulogium); - eulogium_button_cb_data_set(&but_main_mathot, eulogium); - eulogium_button_cb_data_set(&but_main_system, eulogium); - eulogium_button_cb_data_set(&but_system_maintenance, eulogium); - eulogium_button_cb_data_set(&but_system_settings, eulogium); - eulogium_button_cb_data_set(&but_material_change, eulogium); - eulogium_button_cb_data_set(&but_material_settings, eulogium); - eulogium_button_cb_data_set(&but_settings_material_1, eulogium); - eulogium_button_cb_data_set(&but_settings_material_2, eulogium); - eulogium_button_cb_data_set(&but_change_material_1, eulogium); - eulogium_button_cb_data_set(&but_change_material_2, eulogium); - eulogium_button_cb_data_set(&but_mathot_material, eulogium); - eulogium_button_cb_data_set(&but_mathot_hotend, eulogium); - eulogium_button_cb_data_set(&but_hotend_change, eulogium); - eulogium_button_cb_data_set(&but_hotend_settings, eulogium); - eulogium_button_cb_data_set(&but_settings_hotend_1, eulogium); - eulogium_button_cb_data_set(&but_settings_hotend_2, eulogium); - eulogium_button_cb_data_set(&but_change_hotend_1, eulogium); - eulogium_button_cb_data_set(&but_change_hotend_2, eulogium); -} - -static void _on_get_print_name_ret(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED) -{ - struct eulogium_data *eulogium = data; - const char *errname, *errmsg; - - if (eldbus_message_error_get(msg, &errname, &errmsg)) { - EINA_LOG_ERR("%s %s", errname, errmsg); - return; - } - if (!eldbus_message_arguments_get(msg, "s", &eulogium->print.name)) { - EINA_LOG_ERR("Failed to get printName message."); - return; - } - eulogium->print.name_changed = EINA_TRUE; - EINA_LOG_INFO("Printer name updated"); - /* TODO Call generic error screen in case of trouble here? */ -} - +#if 0 static void eulogium_printer_status_set(struct eulogium_data *eulogium, struct _status_msg *status) { Evas_Object *content = NULL; - EINA_LOG_WARN("Printer status: %s", status->s); + EINA_LOG_ERR("Printer status: %s", status->s); if (eulogium->printer.status != status->i) { switch (status->i) { @@ -3180,6 +3617,7 @@ static void eulogium_printer_status_set(struct eulogium_data *eulogium, struct _ eulogium->printer.status = status->i; } } +#endif static void _on_get_file_handlers_ret(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED) { @@ -3212,14 +3650,10 @@ static void _on_get_file_handlers_ret(void *data, const Eldbus_Message *msg, Eld strncpy(file_handlers[i], file_handler, fhandler_size); } file_handlers[i] = NULL; /* sentinel */ - eulogium->printer.file_handlers = file_handlers; -} - -static void _on_status_changed_ret(void *data, const Eldbus_Message *msg) -{ - _on_get_status_ret(data, msg, NULL); + eulogium->printer.file_handlers = file_handlers; /* TODO do directly, only pass **file_handlers as data */ } +/* XXX TODO: this is being called somewhere where it shouldn't, making only hotplug usb events work */ static void eulogium_disk_free(struct mount_data *mount) { eeze_disk_free(mount->disk); @@ -3227,7 +3661,6 @@ static void eulogium_disk_free(struct mount_data *mount) free(mount->id); eldbus_proxy_unref(mount->proxy); free(mount); - mount = NULL; } static void _on_where_ret(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED) @@ -3253,18 +3686,17 @@ static void _on_where_ret(void *data, const Eldbus_Message *msg, Eldbus_Pending return; /* Never use a medium that is mounted under dev, proc, run or sys. */ - if (!(strncmp(where, "/dev/", 5) && - strncmp(where, "/proc/", 6) && - strncmp(where, "/run/", 5) && - strncmp(where, "/sys/", 5))) + if (!(strncmp(where, "/dev/", sizeof("/dev/") - 1) && + strncmp(where, "/proc/", sizeof("/proc/") - 1) && + strncmp(where, "/run/", sizeof("/run/") - 1) && + strncmp(where, "/sys/", sizeof("/sys/") - 1))) return; mount->disk = eeze_disk_new_from_mount(where); eeze_disk_scan(mount->disk); EINA_LOG_ERR("Medium mounted at %s of type %d", where, eeze_disk_type_get(mount->disk)); - if (eeze_disk_type_get(mount->disk) == EEZE_DISK_TYPE_USB) - *mount->mounts = eina_list_append(*mount->mounts, mount); - if ((eeze_disk_type_get(mount->disk) == EEZE_DISK_TYPE_FLASH) && + if (((eeze_disk_type_get(mount->disk) == EEZE_DISK_TYPE_USB) || + (eeze_disk_type_get(mount->disk) == EEZE_DISK_TYPE_FLASH)) && (!strstr(eeze_disk_devpath_get(mount->disk), "mmcblk0"))) /* XXX skip using mmcblk0 as that is our root fs for now. This may be handled by udev making it invisible. */ *mount->mounts = eina_list_append(*mount->mounts, mount); else @@ -3316,7 +3748,7 @@ static void _on_unit_new_ret(void *data, const Eldbus_Message *msg) return; } ext = ecore_file_ext_get(id); - if (strncmp(ext, "mount", 5)) + if (strcmp(ext, "mount")) return; obj = eldbus_object_get(eulogium->dbus.conn, "org.freedesktop.systemd1", unit); @@ -3338,13 +3770,14 @@ static void _on_unit_new_ret(void *data, const Eldbus_Message *msg) } strncpy(mount->id, id, id_len); mount->proxy = eldbus_proxy_get(obj, "org.freedesktop.systemd1.Mount"); - mount->mounts = &eulogium->mounts; if (!mount->proxy) { EINA_LOG_WARN("Could not get dbus proxy for (%s).", id); free(mount->id); free(mount); return; } + eldbus_proxy_ref(mount->proxy); + mount->mounts = &eulogium->mounts; EINA_LOG_ERR("Medium inserted (%s)", id); eldbus_proxy_property_get(mount->proxy, "Result", _on_result_ret, mount); } @@ -3397,6 +3830,7 @@ static void _on_list_units_ret(void *data, const Eldbus_Message *msg, Eldbus_Pen free(mount); break; } + eldbus_proxy_ref(mount->proxy); mount->mounts = &eulogium->mounts; EINA_LOG_ERR("Medium detected (%s)", id); eldbus_proxy_property_get(mount->proxy, "Result", _on_result_ret, mount); @@ -3432,7 +3866,7 @@ static void _on_unit_removed_ret(void *data, const Eldbus_Message *msg) return; } ext = ecore_file_ext_get(id); - if (strncmp(ext, "mount", 5)) + if (strcmp(ext, "mount")) return; obj = eldbus_object_get(eulogium->dbus.conn, "org.freedesktop.systemd1", unit); @@ -3449,6 +3883,12 @@ static void _on_unit_removed_ret(void *data, const Eldbus_Message *msg) eulogium_disk_free(mount); eulogium->mounts = eina_list_remove_list(eulogium->mounts, list); } + /* XXX if usb/local selection screen is up, pop it from stack and show a 'media removed' popup, + * and show the local without popup instead. + * If we are in the file-selection list, pop the whole stack up until the selection dialog. + * Use PAGE_USB for example to indicate what to pop from the stack. + * ui_stack_page_invalidate(eulogium->navi, PAGE_USB); // XXX Yes, we only support 1 usb mount at a time + */ /* TODO: UI Stuff/signals */ } @@ -3472,8 +3912,8 @@ static void _on_get_available_procedures_ret(void *data, const Eldbus_Message *m if (eldbus_message_iter_arguments_get(avail_proc_struct, "sb", &key, &executable)) { uint_fast16_t i; - for (i = 0; eulogium->procedures[i].key ; i++) { - if (strncmp(key, eulogium->procedures[i].key, eulogium->procedures[i].keylen)) { + for (i = 0; eulogium->procedures[i].key ; i++) { /* XXX use enum/null rather then i to iterate over array */ + if (strcmp(key, eulogium->procedures[i].key)) { eulogium->procedures[i].executable = executable; eulogium->procedures[i].available = EINA_TRUE; } else { @@ -3484,10 +3924,9 @@ static void _on_get_available_procedures_ret(void *data, const Eldbus_Message *m } } -static void _on_get_active_procedures_ret(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED) +static void _on_get_active_procedures_ret(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED) { const char *errname, *errmsg; - struct eulogium_data *eulogium = data; Eldbus_Message_Iter *array, *act_proc_struct; char *key, *step; @@ -3496,28 +3935,36 @@ static void _on_get_active_procedures_ret(void *data, const Eldbus_Message *msg, return; } if (!eldbus_message_arguments_get(msg, "a(ss)", &array)) { - EINA_LOG_ERR("Message content does not match expected \"a(ss)\" signature."); + EINA_LOG_ERR("Message content does not match expected \"a(ss)\" signature."); /* TODO make macro/function of this as we re-use it often */ return; } while (eldbus_message_iter_get_and_next(array, 'r', &act_proc_struct)) { if (eldbus_message_iter_arguments_get(act_proc_struct, "ss", &key, &step)) { - uint_fast16_t i; + struct procedure_data *procedure; - for (i = 0; eulogium->procedures[i].key ; i++) { - if (strncmp(key, eulogium->procedures[i].key, eulogium->procedures[i].keylen)) { - printf("Step: %s\n", step); - } else { - EINA_LOG_WARN("Procedure not found: '%s'", key); - } + EINA_LOG_ERR("Key '%s' step '%s'", key, step); + procedure = procedure_get(key); + if (!procedure) { + EINA_LOG_ERR("Unknown procedure %s", key); + return; + } + procedure->status = PROC_ACTIVE; + procedure->step_active = procedure_step_get(procedure, step); + + if (!procedure->step_active) { + EINA_LOG_ERR("Unknown step %s in procedure %s", step, key); + return; } + procedure_process_step(data, procedure); } } } -static void _on_procedure_start_ret(void *data EINA_UNUSED, const Eldbus_Message *msg) +static void _on_procedure_start_ret(void *data, const Eldbus_Message *msg) { const char *errname, *errmsg; const char *key, *step; + struct procedure_data *procedure; if (eldbus_message_error_get(msg, &errname, &errmsg)) { EINA_LOG_ERR("%s %s", errname, errmsg); @@ -3527,13 +3974,27 @@ static void _on_procedure_start_ret(void *data EINA_UNUSED, const Eldbus_Message EINA_LOG_ERR("Message content does not match expected \"ss\" signature. (%s)", eldbus_message_signature_get(msg)); return; } - EINA_LOG_ERR("Key '%s' step %s", key, step); + EINA_LOG_ERR("Key '%s' step '%s'", key, step); + procedure = procedure_get(key); + if (!procedure) { + EINA_LOG_ERR("Unknown procedure %s", key); + return; + } + procedure->status = PROC_ACTIVE; + procedure->step_active = procedure_step_get(procedure, step); + + if (!procedure->step_active) { + EINA_LOG_ERR("Unknown step %s in procedure %s", step, key); + return; + } + procedure_process_step(data, procedure); } static void _on_procedure_next_step_ret(void *data EINA_UNUSED, const Eldbus_Message *msg) { const char *errname, *errmsg; const char *key, *step; + struct procedure_data *procedure; if (eldbus_message_error_get(msg, &errname, &errmsg)) { EINA_LOG_ERR("%s %s", errname, errmsg); @@ -3543,13 +4004,25 @@ static void _on_procedure_next_step_ret(void *data EINA_UNUSED, const Eldbus_Mes EINA_LOG_ERR("Message content does not match expected \"ss\" signature. (%s)", eldbus_message_signature_get(msg)); return; } - EINA_LOG_ERR("next: Key '%s' step %s", key, step); + EINA_LOG_ERR("next: Key '%s' step '%s'", key, step); + procedure = procedure_get(key); + if (!procedure) { + EINA_LOG_WARN("Unknown procedure, %s.", key); + return; + } + procedure->step_active = procedure_step_get(procedure, step); + if (!procedure->step_active) { + EINA_LOG_ERR("Unknown step %s in procedure %s", step, key); + return; + } + procedure_process_step(data, procedure); } static void _on_procedure_finished_ret(void *data EINA_UNUSED, const Eldbus_Message *msg) { const char *errname, *errmsg; const char *key; + struct procedure_data *procedure; if (eldbus_message_error_get(msg, &errname, &errmsg)) { EINA_LOG_ERR("%s %s", errname, errmsg); @@ -3560,22 +4033,37 @@ static void _on_procedure_finished_ret(void *data EINA_UNUSED, const Eldbus_Mess return; } EINA_LOG_ERR("finshed Key '%s'", key); + procedure = procedure_get(key); + if (!procedure) { + EINA_LOG_ERR("Unknown procedure %s", key); + return; + } + procedure->status = PROC_FINISHED; + procedure->step_active = NULL; + procedure_process_step(data, procedure); + // XXX procedure_metadata_key_get(key) } -static void _on_get_error_ret(void *data EINA_UNUSED, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED) +static void _on_get_error_ret(void *data, const Eldbus_Message *msg, Eldbus_Pending *pending EINA_UNUSED) { - const char *errname, *errmsg, *errormsg; + struct eulogium_data *eulogium = data; + const char *errname, *errmsg, *error_msg; + uint8_t error_level; + uint16_t error_code; if (eldbus_message_error_get(msg, &errname, &errmsg)) { EINA_LOG_ERR("%s %s", errname, errmsg); return; } - if (!eldbus_message_arguments_get(msg, "s", &errormsg)) { - EINA_LOG_ERR("Message content does not match expected \"s\" signature. (%s)", eldbus_message_signature_get(msg)); + if (!eldbus_message_arguments_get(msg, "yqs", &error_level, &error_code, &error_msg)) { + EINA_LOG_ERR("Message content does not match expected \"yqs\" signature. (%s)", eldbus_message_signature_get(msg)); return; } - if (strlen(errormsg) > 0) - EINA_LOG_ERR("Printer Error '%s' received", errormsg); + EINA_LOG_ERR("Printer Error %u '%s' received (level %u)", error_code, error_msg, error_level); + if (error_level > 254) /* TODO: enum */ + return; + + eulogium_generic_error(eulogium, error_code, error_msg); /* TODO Call generic error screen in case of trouble here? */ } @@ -3598,6 +4086,7 @@ static uint_fast16_t _dbus_members_map(Eldbus_Proxy *proxy, struct menu_entry_de return i; } +/* move this to dbus_common */ static int eulogium_dbus_init(struct eulogium_data *eulogium) { Eldbus_Object *obj; @@ -3657,10 +4146,35 @@ static int eulogium_dbus_init(struct eulogium_data *eulogium) EINA_LOG_WARN("Could not get dbus network proxy."); return -EFAULT; } + + /* Find a nice home for these */ + eldbus_proxy_signal_handler_add(proxy, "UnitNew", _on_unit_new_ret, eulogium); + eldbus_proxy_signal_handler_add(proxy, "UnitRemoved", _on_unit_removed_ret, eulogium); + msg = eldbus_proxy_method_call_new(proxy, "ListUnitsFiltered"); + iter = eldbus_message_iter_get(msg); + array = eldbus_message_iter_container_new(iter, 'a', "s"); + if (!array) + EINA_LOG_ERR("Empty container"); + eldbus_message_iter_basic_append(array, 's', "mounted"); + eldbus_message_iter_container_close(iter, array); + eldbus_proxy_send(proxy, msg, _on_list_units_ret, eulogium, -1); + /* eldbus_proxy_call(proxy, "ListUnitsFiltered", _on_list_units_ret, eulogium, -1, "as", "{mounted}"); */ + + return 0; +} + +static void eulogium_setup(struct eulogium_data *eulogium) +{ + /* This is silly, barding redonkylous and will get fixed in the refactoring */ + if (eulogium_dbus_init(eulogium)) + EINA_LOG_CRIT("Griffin D-Bus initialization failed!"); + eulogium->procedures = procedures_init(eulogium->dbus.proxy[PRINTER]); + network_init(eulogium->dbus.proxy[NETWORK]); + _dbus_members_map(eulogium->dbus.proxy[NETWORK], menu_settings_network.entry); /* TODO: put signal/method name strings in macro/LUT */ - eldbus_proxy_call(eulogium->dbus.proxy[NETWORK], "getNetworkInfo", on_method_get_network_info_ret, eulogium, -1, ""); - eldbus_proxy_signal_handler_add(eulogium->dbus.proxy[NETWORK], "NetworkInfoChanged", on_signal_network_info_changed_ret, eulogium); + eldbus_proxy_call(eulogium->dbus.proxy[NETWORK], "getNetworkServicesInfo", on_method_get_network_info_ret, eulogium, -1, "b", 1); + eldbus_proxy_signal_handler_add(eulogium->dbus.proxy[NETWORK], "networkServiceInfoChanged", on_signal_network_info_changed_ret, eulogium); eldbus_proxy_call(eulogium->dbus.proxy[PRINTER], "getError", _on_get_error_ret, eulogium, -1, ""); eldbus_proxy_signal_handler_add(eulogium->dbus.proxy[PRINTER], "onError", _on_error_ret, eulogium); @@ -3672,26 +4186,61 @@ static int eulogium_dbus_init(struct eulogium_data *eulogium) //eldbus_proxy_call(eulogium->dbus.proxy[PRINTER], "getFileHandlers", _on_get_file_handlers_ret, eulogium, -1, ""); //eldbus_proxy_call(eulogium->dbus.proxy[PRINTER], "getStatus", _on_get_status_ret, eulogium, -1, ""); //eldbus_proxy_call(eulogium->dbus.proxy[PRINTER], "getPrintName", _on_get_print_name_ret, eulogium, -1, ""); - //eldbus_proxy_signal_handler_add(eulogium->dbus.proxy[PRINTER], "statusChanged", _on_status_changed_ret, eulogium); + eldbus_proxy_call(eulogium->dbus.proxy[PRINTER], "getProcedureMetaData", on_method_get_procedure_metadata_ret, &eulogium->procedures[PROC_PRINT], -1, "s", eulogium->procedures[PROC_PRINT].key); - eldbus_proxy_signal_handler_add(proxy, "UnitNew", _on_unit_new_ret, eulogium); - eldbus_proxy_signal_handler_add(proxy, "UnitRemoved", _on_unit_removed_ret, eulogium); - msg = eldbus_proxy_method_call_new(proxy, "ListUnitsFiltered"); - iter = eldbus_message_iter_get(msg); - array = eldbus_message_iter_container_new(iter, 'a', "s"); - if (!array) - EINA_LOG_ERR("Empty container"); - eldbus_message_iter_basic_append(array, 's', "mounted"); - eldbus_message_iter_container_close(iter, array); - eldbus_proxy_send(proxy, msg, _on_list_units_ret, eulogium, -1); - /* eldbus_proxy_call(proxy, "ListUnitsFiltered", _on_list_units_ret, eulogium, -1, "as", "{mounted}"); */ + eulogium_button_cb_data_set(&but_return, eulogium); + eulogium_button_cb_data_set(&but_print_abort_confirm, eulogium); + eulogium_button_cb_data_set(&but_print_abort, eulogium); + eulogium_button_cb_data_set(&but_print_tune, eulogium); + eulogium_button_cb_data_set(&but_main_print, eulogium); + eulogium_button_cb_data_set(&but_print_ignore, eulogium); + eulogium_button_cb_data_set(&but_print_local, eulogium); + eulogium_button_cb_data_set(&but_print_usb, eulogium); + eulogium_button_cb_data_set(&but_main_mathot, eulogium); + eulogium_button_cb_data_set(&but_main_system, eulogium); + eulogium_button_cb_data_set(&but_system_maintenance, eulogium); + eulogium_button_cb_data_set(&but_system_settings, eulogium); + eulogium_button_cb_data_set(&but_material_change, eulogium); + eulogium_button_cb_data_set(&but_material_settings, eulogium); + eulogium_button_cb_data_set(&but_settings_material_1, eulogium); + eulogium_button_cb_data_set(&but_settings_material_2, eulogium); + eulogium_button_cb_data_set(&but_change_material_1, eulogium); + eulogium_button_cb_data_set(&but_change_material_2, eulogium); + eulogium_button_cb_data_set(&but_mathot_material, eulogium); + eulogium_button_cb_data_set(&but_mathot_hotend, eulogium); + eulogium_button_cb_data_set(&but_hotend_change, eulogium); + eulogium_button_cb_data_set(&but_hotend_settings, eulogium); + eulogium_button_cb_data_set(&but_settings_hotend_1, eulogium); + eulogium_button_cb_data_set(&but_settings_hotend_2, eulogium); + eulogium_button_cb_data_set(&but_change_hotend_1, eulogium); + eulogium_button_cb_data_set(&but_change_hotend_2, eulogium); - return 0; + procedure_meta_set(&eulogium->procedures[PROC_FIRMWARE_UPDATE], &progressbars[PROC_FIRMWARE_UPDATE]); + procedure_meta_set(&eulogium->procedures[PROC_PRINT], &progressbars[PROC_PRINT]); + procedure_meta_set(&eulogium->procedures[PROC_BED_MOVE], &dials[PROC_BED_MOVE]); + procedure_meta_set(&eulogium->procedures[PROC_BED_HEATUP], &dials[PROC_BED_HEATUP]); + procedure_meta_set(&eulogium->procedures[PROC_HOTEND_HEATUP_0], &dials[PROC_HOTEND_HEATUP_0]); + procedure_meta_set(&eulogium->procedures[PROC_HOTEND_HEATUP_1], &dials[PROC_HOTEND_HEATUP_1]); + procedure_meta_set(&eulogium->procedures[PROC_PRINT_SPEED], &dials[PROC_PRINT_SPEED]); + procedure_meta_set(&eulogium->procedures[PROC_FAN_SPEED], &dials[PROC_FAN_SPEED]); + procedure_meta_set(&eulogium->procedures[PROC_FLOW_RATE], &dials[PROC_FLOW_RATE]); + procedure_meta_set(&eulogium->procedures[PROC_RETRACTION_LENGTH], &dials[PROC_RETRACTION_LENGTH]); + procedure_meta_set(&eulogium->procedures[PROC_RETRACTION_SPEED], &dials[PROC_RETRACTION_SPEED]); + procedure_meta_set(&eulogium->procedures[PROC_RETRACTION_ZHOP], &dials[PROC_RETRACTION_ZHOP]); + procedure_meta_set(&eulogium->procedures[PROC_MATERIAL_MOVE_0], &dials[PROC_MATERIAL_MOVE_0]); + procedure_meta_set(&eulogium->procedures[PROC_MATERIAL_MOVE_1], &dials[PROC_MATERIAL_MOVE_1]); + procedure_meta_set(&eulogium->procedures[PROC_JERK_XY], &dials[PROC_JERK_XY]); + procedure_meta_set(&eulogium->procedures[PROC_JERK_Z], &dials[PROC_JERK_Z]); + procedure_meta_set(&eulogium->procedures[PROC_CURRENT_XY], &dials[PROC_CURRENT_XY]); + procedure_meta_set(&eulogium->procedures[PROC_CURRENT_Z], &dials[PROC_CURRENT_Z]); + procedure_meta_set(&eulogium->procedures[PROC_CURRENT_E], &dials[PROC_CURRENT_E]); + procedure_meta_getall(); } EAPI_MAIN int elm_main(int argc, char **argv) { Eina_Bool quit_option = EINA_FALSE; + Eina_Bool verbose = EINA_FALSE; static const Ecore_Getopt optdesc = { PACKAGE_NAME, "%prog [options]", @@ -3701,6 +4250,7 @@ EAPI_MAIN int elm_main(int argc, char **argv) "eulogium program", 0, { + ECORE_GETOPT_STORE_TRUE('v', "verbose", "Enable debug output"), ECORE_GETOPT_LICENSE('L', "license"), ECORE_GETOPT_COPYRIGHT('C', "copyright"), ECORE_GETOPT_VERSION('V', "version"), @@ -3709,6 +4259,7 @@ EAPI_MAIN int elm_main(int argc, char **argv) } }; Ecore_Getopt_Value values[] = { + ECORE_GETOPT_VALUE_BOOL(verbose), ECORE_GETOPT_VALUE_BOOL(quit_option), ECORE_GETOPT_VALUE_BOOL(quit_option), ECORE_GETOPT_VALUE_BOOL(quit_option), @@ -3717,39 +4268,40 @@ EAPI_MAIN int elm_main(int argc, char **argv) }; int args; uint_fast8_t i; + char *buf; + Eina_List *flist, *fl; + char *font; struct eulogium_data eulogium = { .mounts = NULL, .progress_data_refresh = NULL, - .print = { - .name = NULL, - .url = NULL, - .block = EINA_TRUE, - .block_active = EINA_FALSE, - }, .printer = { .status = DISCONNECTED, .file_handlers = NULL, }, + .networks = NULL, .footer = NULL, }; Evas_Object *window, *object; // Evas_Object *splash_window; // Eina_List *engines, *l; - eeze_init(); - eeze_disk_function(); - if (!(eeze_disk_can_mount() && eeze_disk_can_unmount())) - EINA_LOG_ERR("No disk (u)mount support available"); - elm_need_eldbus(); - args = ecore_getopt_parse(&optdesc, values, argc, argv); if (args < 0) { EINA_LOG_CRIT("Could not parse arguments."); return EXIT_FAILURE; } - INPUT_MOUSE_WHEEL_UP = ecore_event_type_new(); - INPUT_MOUSE_WHEEL_DOWN = ecore_event_type_new(); + /* TODO: Fix logging domain stuff */ + if (verbose) + eina_log_domain_level_set(PACKAGE_NAME, EINA_LOG_LEVEL_DBG); + else + eina_log_domain_level_set(PACKAGE_NAME, EINA_LOG_LEVEL_INFO); + + eeze_init(); + eeze_disk_function(); + elm_need_eldbus(); + + input_init(); // elm_prefs_data_new(); /* TODO */ elm_policy_set(ELM_POLICY_QUIT, /* ELM_POLICY_QUIT_NONE */ ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); @@ -3766,10 +4318,13 @@ EAPI_MAIN int elm_main(int argc, char **argv) textdomain(PACKAGE); #endif elm_app_info_set(NULL, PACKAGE, NULL); /* TODO */ -#if (ELM_VERSION_MAJOR > 1) || (ELM_VERSION_MINOR >= 10) - elm_config_accel_preference_set("accel"); -#endif - elm_theme_overlay_add(NULL, "./default.edj"); +// elm_app_info_set(elm_main, PACKAGE, "themes/default.edj"); + + buf = malloc((strlen(elm_app_data_dir_get()) + 20) * sizeof(char)); + snprintf(buf, strlen(elm_app_data_dir_get()) + 20, "%s/themes/default.edj", elm_app_data_dir_get()); + elm_theme_overlay_add(NULL, buf); /* TODO let preprocessor at work here with theme subdir and theme name */ + printf("app data dir: %s\n", buf); + free(buf); #if 0 /* TODO make icon */ icon = evas_object_image_add(evas_object_evas_get(win)); @@ -3777,12 +4332,14 @@ EAPI_MAIN int elm_main(int argc, char **argv) evas_object_image_file_set(o, buf, NULL); elm_win_icon_object_set(win, o); #endif +#if (ELM_VERSION_MAJOR > 1) || (ELM_VERSION_MINOR >= 10) + elm_config_accel_preference_set("accel"); +#endif elm_config_focus_highlight_enabled_set(EINA_FALSE); elm_config_focus_highlight_animate_set(EINA_FALSE); elm_config_softcursor_mode_set(ELM_SOFTCURSOR_MODE_OFF); - if (eulogium_dbus_init(&eulogium)) - EINA_LOG_CRIT("Griffin D-Bus initialization failed!"); + ui_init(); /* TODO: move into its own init */ window = elm_win_add(NULL, PACKAGE_NAME, ELM_WIN_BASIC); @@ -3793,6 +4350,8 @@ EAPI_MAIN int elm_main(int argc, char **argv) evas_object_repeat_events_set(window, EINA_TRUE); elm_win_autodel_set(window, EINA_TRUE); evas_object_smart_callback_add(window, "delete,request", _cb_eulogium_exit, NULL); + elm_win_focus_highlight_enabled_set(window, EINA_FALSE); + elm_win_focus_highlight_animate_set(window, EINA_FALSE); object = elm_bg_add(window); if (!object) @@ -3821,7 +4380,7 @@ EAPI_MAIN int elm_main(int argc, char **argv) evas_object_size_hint_weight_set(object, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_color_set(object, 0, 0, 0, 0); evas_object_repeat_events_set(object, EINA_TRUE); - evas_object_event_callback_add(object, EVAS_CALLBACK_MOUSE_WHEEL, _cb_eulogium_input_wheel, window); /* TODO elm_obj_ev? event propagation issues? */ + evas_object_event_callback_add(object, EVAS_CALLBACK_MOUSE_WHEEL, input_mouse_wheel_cb, window); /* TODO elm_obj_ev? event propagation issues? */ /* TODO: don't these two input events repeat/fall through, everything else, may/should. */ evas_object_show(object); elm_win_resize_object_add(window, object); @@ -3829,6 +4388,10 @@ EAPI_MAIN int elm_main(int argc, char **argv) evas_object_show(window); + flist = evas_font_available_list(evas_object_evas_get(window)); + EINA_LIST_FOREACH(flist, fl, font) + printf("font: %s\n", font); + elm_run(); eldbus_connection_unref(eulogium.dbus.conn); @@ -3838,6 +4401,8 @@ EAPI_MAIN int elm_main(int argc, char **argv) free(eulogium.printer.file_handlers[i]); free(eulogium.printer.file_handlers); /* TODO: Cleanup function? */ + procedures_shutdown(); + elm_shutdown(); eeze_shutdown(); |