From aee766a195646ab6408432bd6faa38c5ec76090a Mon Sep 17 00:00:00 2001 From: Michal Skorupinski Date: Mon, 24 Sep 2018 17:58:42 +0200 Subject: [PATCH] Set stering type based on the app's name Change-Id: Icfdc8f228c148a51d430c7c328fad39ab5a2035e Signed-off-by: Michal Skorupinski --- inc/config.h | 4 ++-- src/config.c | 6 +++--- src/gear-racing-controller.c | 19 ++++++++++++++++--- tizen-manifest.xml | 6 +++--- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/inc/config.h b/inc/config.h index 23a7c33..ec1acb5 100644 --- a/inc/config.h +++ b/inc/config.h @@ -19,8 +19,8 @@ void config_set_sensor_steering_bezel_velocity(); void config_set_bezel_steering_sensor_velocity(); -void config_set_sensor_stering_sensor_velocity_bezel_elev(); -void config_set_sensor_stering_sensor_velocity_bezel_azimuth(); +void config_set_sensor_steering_sensor_velocity_bezel_elev(); +void config_set_sensor_steering_sensor_velocity_bezel_azimuth(); #endif /* CONFIG_H_ */ diff --git a/src/config.c b/src/config.c index d13a4f0..e4c88b4 100644 --- a/src/config.c +++ b/src/config.c @@ -75,7 +75,7 @@ void config_set_bezel_steering_sensor_velocity() view_racing_set_direction_indicator_multiplier(-BUTTON_MULTIPLIER); } -void config_set_sensor_stering_sensor_velocity_bezel_elev() +void config_set_sensor_steering_sensor_velocity_bezel_elev() { model_device_to_connection_set_control_roles(STERING_MODE_DIRETION, STERING_MODE_THROTTLE, STERING_MODE_CAM_ELEVATION, STERING_MODE_CAM_AZIMUTH); model_hw_set_bezel_params(BEZEL_SLOW_STEP, BEZEL_DEADZONE, false, 0, false); @@ -88,14 +88,14 @@ void config_set_sensor_stering_sensor_velocity_bezel_elev() view_racing_set_direction_indicator_multiplier(BUTTON_MULTIPLIER); } -void config_set_sensor_stering_sensor_velocity_bezel_azimuth() +void config_set_sensor_steering_sensor_velocity_bezel_azimuth() { model_device_to_connection_set_control_roles(STERING_MODE_DIRETION, STERING_MODE_THROTTLE, STERING_MODE_CAM_AZIMUTH, STERING_MODE_CAM_ELEVATION); model_hw_set_bezel_params(BEZEL_SLOW_STEP, BEZEL_DEADZONE, false, 0, false); model_hw_set_bezel_max_min(-MAX_BEZEL_VALUE, MAX_BEZEL_VALUE); model_sensors_set_acceleration_sensor_params(MAX_DIRECTION, MAX_ABSOLOUTE_SENSORS_OUTPUT_VALUE, DIRECTION_DEADZONE, FINAL_SENSOR_MULTIPLIER, false, 0.0f, 0.0f); - model_sensors_set_gravity_sensor_params(MAX_GRAVITY, 1.0f, GRAVITY_DEADZONE, 1.0f, false, 0.0f, 0.0f); + model_sensors_set_gravity_sensor_params(MAX_GRAVITY, MAX_ABSOLOUTE_SENSORS_OUTPUT_VALUE, GRAVITY_DEADZONE, FINAL_SENSOR_MULTIPLIER, false, 0.0f, 0.0f); view_racing_set_button_params(-MAX_BUTTON_VALUE, MAX_ELEVATION_VALUE, -CAM_AZIMUTH_STEP); view_racing_set_direction_indicator_multiplier(BUTTON_MULTIPLIER); diff --git a/src/gear-racing-controller.c b/src/gear-racing-controller.c index b613e57..f61dbb8 100644 --- a/src/gear-racing-controller.c +++ b/src/gear-racing-controller.c @@ -21,11 +21,10 @@ #include "model/model_car_connection.h" #include "net-util.h" #include "config.h" +#include "log.h" static bool app_create(void *data) { - config_set_sensor_steering_bezel_velocity(); - model_sensors_init(); model_hw_init(); model_car_connection_init(); @@ -37,7 +36,21 @@ static bool app_create(void *data) static void app_control(app_control_h app_control, void *data) { - /* Handle the launch request. */ + char *appid; + int ret = app_control_get_app_id(app_control, &appid); + ASSERT_FUNCTION(ret != APP_CONTROL_ERROR_NONE); + + if (!strncmp(appid, "org.tizen.gear-racing-controller-bs", strlen(appid))) { + config_set_bezel_steering_sensor_velocity(); + } else if (!strncmp(appid, "org.tizen.gear-racing-controller-sb", strlen(appid))) { + config_set_sensor_steering_bezel_velocity(); + } else if (!strncmp(appid, "org.tizen.gear-racing-controller-ssa", strlen(appid))) { + config_set_sensor_steering_sensor_velocity_bezel_azimuth(); + } else if (!strncmp(appid, "org.tizen.gear-racing-controller-sse", strlen(appid))) { + config_set_sensor_steering_sensor_velocity_bezel_elev(); + } else { + config_set_bezel_steering_sensor_velocity(); + } } static void diff --git a/tizen-manifest.xml b/tizen-manifest.xml index 926ed25..60105ad 100644 --- a/tizen-manifest.xml +++ b/tizen-manifest.xml @@ -1,8 +1,8 @@ - + - - + + gear-racing-controller.png -- 2.7.4