From 866fb6f300d13e7293479e9887a6896434dab95f Mon Sep 17 00:00:00 2001 From: Michal Skorupinski Date: Wed, 5 Dec 2018 14:59:50 +0100 Subject: [PATCH] Help text read from config Change-Id: I35ef4b75a9e1c09e26f1fc9a399ec0b228bb5aed Signed-off-by: Michal Skorupinski --- inc/steering_setup.h | 4 ---- src/steering_setup.c | 2 -- src/view/view_help.c | 13 ++++++++++++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/inc/steering_setup.h b/inc/steering_setup.h index 715d9bd..fcada52 100644 --- a/inc/steering_setup.h +++ b/inc/steering_setup.h @@ -17,10 +17,6 @@ #ifndef STEERING_SETUP_H_ #define STEERING_SETUP_H_ -void steering_setup_set_sensor_steering_bezel_velocity(); -void steering_setup_set_bezel_steering_sensor_velocity(); -void steering_setup_set_sensor_steering_sensor_velocity_bezel_elev(); -void steering_setup_set_sensor_steering_sensor_velocity_bezel_azimuth(); void steering_setup(); diff --git a/src/steering_setup.c b/src/steering_setup.c index b6dab69..bdcd0de 100644 --- a/src/steering_setup.c +++ b/src/steering_setup.c @@ -177,8 +177,6 @@ void _set_buttons() void steering_setup() { - config_set_string("steering", "mode", "axis_x->direction;axis_y->cam.elevation;bezel->throttle;buttons->cam.azimuth"); - _set_roles(); _set_bezel(); diff --git a/src/view/view_help.c b/src/view/view_help.c index 15faede..399ce51 100644 --- a/src/view/view_help.c +++ b/src/view/view_help.c @@ -18,6 +18,7 @@ #include "view/view_help.h" #include "view_manager/view_manager.h" #include "controller/controller_help.h" +#include "config.h" typedef struct _s_view_help { s_view_base view_base; @@ -41,7 +42,17 @@ static void _view_help_create_gui(Evas_Object *parent) eext_object_event_callback_add(s_info.view_base.view, EEXT_CALLBACK_BACK, _layout_back_cb, NULL); //Setting text - elm_layout_text_set(s_info.view_base.view, "txt_title", "Help view text, that can be long enough to fill these lines"); + char *help_text; + + config_get_string_or_set_default("info", "description", + "axis_x: direction
" + "axis_y: camera elevation
" + "bezel: throttle
" + "buttons: camera azimuth
", &help_text); + + elm_layout_text_set(s_info.view_base.view, "txt_title", help_text); + + free(help_text); //Creating OK button view_base_create_button(s_info.view_base.view, "Button_Ok", "OK", NULL, "racing_bottom", _ok_button_clicked_cb, NULL); -- 2.7.4