summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorOlliver Schinagl <o.schinagl@ultimaker.com>2015-04-22 11:30:13 (GMT)
committerOlliver Schinagl <o.schinagl@ultimaker.com>2015-04-28 05:07:15 (GMT)
commit7347e233c5206f987ab5719d3a7a5c51a93de9e3 (patch)
tree020cad7dcc3ceb54cf275090434a57bf5b238aaa /src
parent5e7491cf7ec9ae1eaca7160b44c07d8a9a70da37 (diff)
downloadeulogium-7347e233c5206f987ab5719d3a7a5c51a93de9e3.zip
eulogium-7347e233c5206f987ab5719d3a7a5c51a93de9e3.tar.gz
eulogium-7347e233c5206f987ab5719d3a7a5c51a93de9e3.tar.bz2
Add additional button callbacks for debugging
This patch adds several callback functions to unused buttons purely for printf-ing. This will need to be filled in later. Additionally, some debugging/comments was added. Signed-off-by: Olliver Schinagl <o.schinagl@ultimaker.com>
Diffstat (limited to 'src')
-rw-r--r--src/eulogium.c45
1 files changed, 33 insertions, 12 deletions
diff --git a/src/eulogium.c b/src/eulogium.c
index ed5524f..6f75fdc 100644
--- a/src/eulogium.c
+++ b/src/eulogium.c
@@ -366,7 +366,7 @@ static void _cb_populate_filelist(const char *name, const char *path, void *data
if (!ext)
return;
len = strlen(ext);
- if (strncmp(ext, "gcode", len) != 0) /* TODO: compare to list of filetypes/filterlist/mimetype */
+ if (strncmp(ext, "gcode", len) != 0) /* TODO: compare to list of filetypes/filterlist/mimetype. Get from griffin. */
return;
}
@@ -391,6 +391,7 @@ static void _cb_content_prev_set(void *data, Evas_Object *obj EINA_UNUSED, void
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 contruct */
@@ -546,6 +547,26 @@ static void _eulogium_multi_screen_next_cb(void *data, Evas_Object *obj EINA_UNU
free(data);
}
+static void _but_maint_adv_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+ printf("But maint advanced\n");
+}
+
+static void _but_maint_bp_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+ printf("But build-plate\n");
+}
+
+static void _but_mat_ch_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+ printf("But matterial change\n");
+}
+
+static void _but_mat_set_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+{
+ printf("But matterial settings\n");
+}
+
static void _cb_material_set(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
printf("Material: %s selected\n", (char *)data);
@@ -710,19 +731,17 @@ Evas_Object *eulogium_tripple_button_menu(Evas_Object *parent, const struct butt
static struct button_def but_maintanance_advanced = {
.text = "ADVANCED",
.cb = {
- .func = &_cb_eulogium_button,
+ .func = &_but_maint_adv_cb,
.data = NULL,
- .info = "advanced button pressed",
},
.data = NULL,
};
static struct button_def but_maintanance_buildplate = {
- .text = "BUILD- PLATE",
+ .text = "BUILD-PLATE",
.cb = {
- .func = &_cb_eulogium_button,
+ .func = &_but_maint_bp_cb,
.data = NULL,
- .info = "buildplate button pressed",
},
.data = NULL,
};
@@ -730,9 +749,8 @@ static struct button_def but_maintanance_buildplate = {
static struct button_def but_mat_change = {
.text = "CHANGE",
.cb = {
- .func = &_cb_eulogium_button,
+ .func = &_but_mat_ch_cb,
.data = NULL,
- .info = "material change button pressed",
},
.data = NULL,
};
@@ -740,9 +758,8 @@ static struct button_def but_mat_change = {
static struct button_def but_mat_settings = {
.text = "SETTINGS",
.cb = {
- .func = &_cb_eulogium_button,
+ .func = &_but_mat_set_cb,
.data = NULL,
- .info = "settings button pressed",
},
.data = NULL,
};
@@ -752,6 +769,8 @@ static void _eulogium_button_main_mat_cb(void *data, Evas_Object *object EINA_UN
struct eulogium_data *eulogium = data;
Evas_Object *content;
+ printf("Button matts pressed\n");
+
content = eulogium_tripple_button_menu(eulogium->navi, &but_mat_change, &but_mat_settings, &but_return);
if (!content)
return;
@@ -763,6 +782,7 @@ static void _eulogium_button_main_maintanance_cb(void *data, Evas_Object *object
struct eulogium_data *eulogium = data;
Evas_Object *content;
+ printf("Button maintanance pressed\n");
content = eulogium_tripple_button_menu(eulogium->navi, &but_maintanance_buildplate, &but_maintanance_advanced, &but_return);
if (!content)
return;
@@ -774,8 +794,9 @@ static void _cb_button_main_print(void *data, Evas_Object *object EINA_UNUSED, v
struct eulogium_data *eulogium = data;
Evas_Object *content;
- /* TODO: add intermediate window to list drive/youmagine */
- content = eulogium_print_menu(eulogium, "/home/"); /* TODO: replace later */
+ printf("Button print pressed\n");
+ /* TODO: add intermediate window to list usbdrive/sdcard/youmagine */
+ content = eulogium_print_menu(eulogium, "/home"); /* TODO: replace later */
if (!content)
return;
elm_naviframe_item_simple_push(eulogium->navi, content);