From: Michal Skorupinski Date: Tue, 4 Dec 2018 14:47:10 +0000 (+0100) Subject: Function naming refactor X-Git-Url: http://review.tizen.org/git/?p=apps%2Fnative%2Fgear-racing-car.git;a=commitdiff_plain;h=6eded6101aaafd0cb95c325af4682bd2f59d5921 Function naming refactor Change-Id: I68fb3997dc578852cdc8bc5a42ac108a920ada15 Signed-off-by: Michal Skorupinski --- diff --git a/inc/config.h b/inc/config.h index 7189479..8bc86e4 100644 --- a/inc/config.h +++ b/inc/config.h @@ -158,7 +158,7 @@ int config_remove_key(const char *group, const char *key); int config_remove_group(const char *group); bool config_get_string_or_set_default(char *group, char *key, char *default_value, char **value); -bool config_get_int_with_default(char *group, char *key, int default_value, int *value); +bool config_get_int_or_set_default(char *group, char *key, int default_value, int *value); bool config_get_rgb_with_default(char *group, char *key, int default_r, int default_g, int default_b, int *red, int *green, int *blue); diff --git a/src/app.c b/src/app.c index 0330a21..408f14a 100644 --- a/src/app.c +++ b/src/app.c @@ -286,28 +286,28 @@ static void _initialize_config() modified |= config_get_string_or_set_default(CONFIG_GRP_CAR, CONFIG_KEY_NAME, "Pink Car", &name); - modified |= config_get_int_with_default(CONFIG_GRP_STEERING, CONFIG_KEY_STEERING_CENTER, s_info.stering_center, &s_info.stering_center); - modified |= config_get_int_with_default(CONFIG_GRP_STEERING, CONFIG_KEY_STEERING_RANGE, s_info.stering_range, &s_info.stering_range); + modified |= config_get_int_or_set_default(CONFIG_GRP_STEERING, CONFIG_KEY_STEERING_CENTER, s_info.stering_center, &s_info.stering_center); + modified |= config_get_int_or_set_default(CONFIG_GRP_STEERING, CONFIG_KEY_STEERING_RANGE, s_info.stering_range, &s_info.stering_range); - modified |= config_get_int_with_default(CONFIG_GRP_CAMERA, CONFIG_KEY_CAMERA_AZIMUTH_CENTER, s_info.camera_azimuth_center, &s_info.camera_azimuth_center); - modified |= config_get_int_with_default(CONFIG_GRP_CAMERA, CONFIG_KEY_CAMERA_AZIMUTH_RANGE, s_info.camera_azimuth_range, &s_info.camera_azimuth_range); - modified |= config_get_int_with_default(CONFIG_GRP_CAMERA, CONFIG_KEY_CAMERA_ELEVATION_MIN, s_info.camera_elevation_min, &s_info.camera_elevation_min); - modified |= config_get_int_with_default(CONFIG_GRP_CAMERA, CONFIG_KEY_CAMERA_ELEVATION_MAX, s_info.camera_elevation_max, &s_info.camera_elevation_max); + modified |= config_get_int_or_set_default(CONFIG_GRP_CAMERA, CONFIG_KEY_CAMERA_AZIMUTH_CENTER, s_info.camera_azimuth_center, &s_info.camera_azimuth_center); + modified |= config_get_int_or_set_default(CONFIG_GRP_CAMERA, CONFIG_KEY_CAMERA_AZIMUTH_RANGE, s_info.camera_azimuth_range, &s_info.camera_azimuth_range); + modified |= config_get_int_or_set_default(CONFIG_GRP_CAMERA, CONFIG_KEY_CAMERA_ELEVATION_MIN, s_info.camera_elevation_min, &s_info.camera_elevation_min); + modified |= config_get_int_or_set_default(CONFIG_GRP_CAMERA, CONFIG_KEY_CAMERA_ELEVATION_MAX, s_info.camera_elevation_max, &s_info.camera_elevation_max); - modified |= config_get_int_with_default(CONFIG_GRP_ENGINE, CONFIG_KEY_CAMERA_ENGINE_MIN, s_info.engine_min, &s_info.engine_min); - modified |= config_get_int_with_default(CONFIG_GRP_ENGINE, CONFIG_KEY_CAMERA_ENGINE_MAX, s_info.engine_max, &s_info.engine_max); + modified |= config_get_int_or_set_default(CONFIG_GRP_ENGINE, CONFIG_KEY_CAMERA_ENGINE_MIN, s_info.engine_min, &s_info.engine_min); + modified |= config_get_int_or_set_default(CONFIG_GRP_ENGINE, CONFIG_KEY_CAMERA_ENGINE_MAX, s_info.engine_max, &s_info.engine_max); - modified |= config_get_int_with_default(CONFIG_GRP_RPI, CONFIG_KEY_RPI_PIN_STERING, s_info.stering_pin, &s_info.stering_pin); - modified |= config_get_int_with_default(CONFIG_GRP_RPI, CONFIG_KEY_RPI_PIN_CAMERA_AZIMUTH, s_info.azimuth_pin, &s_info.azimuth_pin); - modified |= config_get_int_with_default(CONFIG_GRP_RPI, CONFIG_KEY_RPI_PIN_CAMERA_ELEVATION, s_info.elevation_pin, &s_info.elevation_pin); + modified |= config_get_int_or_set_default(CONFIG_GRP_RPI, CONFIG_KEY_RPI_PIN_STERING, s_info.stering_pin, &s_info.stering_pin); + modified |= config_get_int_or_set_default(CONFIG_GRP_RPI, CONFIG_KEY_RPI_PIN_CAMERA_AZIMUTH, s_info.azimuth_pin, &s_info.azimuth_pin); + modified |= config_get_int_or_set_default(CONFIG_GRP_RPI, CONFIG_KEY_RPI_PIN_CAMERA_ELEVATION, s_info.elevation_pin, &s_info.elevation_pin); - modified |= config_get_int_with_default(CONFIG_GRP_RPI, CONFIG_KEY_RPI_PIN_ENGINE_1_FORWARD, s_info.engine_1_forward_pin, &s_info.engine_1_forward_pin); - modified |= config_get_int_with_default(CONFIG_GRP_RPI, CONFIG_KEY_RPI_PIN_ENGINE_1_BACK, s_info.engine_1_back_pin, &s_info.engine_1_back_pin); - modified |= config_get_int_with_default(CONFIG_GRP_RPI, CONFIG_KEY_RPI_ENGINE_CHANNEL_1, s_info.engine_1_channel, &s_info.engine_1_channel); + modified |= config_get_int_or_set_default(CONFIG_GRP_RPI, CONFIG_KEY_RPI_PIN_ENGINE_1_FORWARD, s_info.engine_1_forward_pin, &s_info.engine_1_forward_pin); + modified |= config_get_int_or_set_default(CONFIG_GRP_RPI, CONFIG_KEY_RPI_PIN_ENGINE_1_BACK, s_info.engine_1_back_pin, &s_info.engine_1_back_pin); + modified |= config_get_int_or_set_default(CONFIG_GRP_RPI, CONFIG_KEY_RPI_ENGINE_CHANNEL_1, s_info.engine_1_channel, &s_info.engine_1_channel); - modified |= config_get_int_with_default(CONFIG_GRP_RPI, CONFIG_KEY_RPI_PIN_ENGINE_2_FORWARD, s_info.engine_2_forward_pin, &s_info.engine_2_forward_pin); - modified |= config_get_int_with_default(CONFIG_GRP_RPI, CONFIG_KEY_RPI_PIN_ENGINE_2_BACK, s_info.engine_2_back_pin, &s_info.engine_2_back_pin); - modified |= config_get_int_with_default(CONFIG_GRP_RPI, CONFIG_KEY_RPI_ENGINE_CHANNEL_2, s_info.engine_2_channel, &s_info.engine_2_channel); + modified |= config_get_int_or_set_default(CONFIG_GRP_RPI, CONFIG_KEY_RPI_PIN_ENGINE_2_FORWARD, s_info.engine_2_forward_pin, &s_info.engine_2_forward_pin); + modified |= config_get_int_or_set_default(CONFIG_GRP_RPI, CONFIG_KEY_RPI_PIN_ENGINE_2_BACK, s_info.engine_2_back_pin, &s_info.engine_2_back_pin); + modified |= config_get_int_or_set_default(CONFIG_GRP_RPI, CONFIG_KEY_RPI_ENGINE_CHANNEL_2, s_info.engine_2_channel, &s_info.engine_2_channel); if (modified == true) { config_save(); diff --git a/src/cloud/cloud_communication.c b/src/cloud/cloud_communication.c index c14ade9..30e75f5 100644 --- a/src/cloud/cloud_communication.c +++ b/src/cloud/cloud_communication.c @@ -134,10 +134,12 @@ static void post_response_cb(request_result_e result, void *user_data) static gboolean post_timer_cb(gpointer data) { + FUNCTION_START; retv_if(!data, FALSE); retvm_if(!_communication.is_connected, TRUE, "Car is not connected to network"); car_info_t *car = (car_info_t *)data; cloud_request_api_racing_post(car, post_response_cb, NULL); + FUNCTION_END; return TRUE; } diff --git a/src/config.c b/src/config.c index 6689d86..c5cba3f 100644 --- a/src/config.c +++ b/src/config.c @@ -247,7 +247,7 @@ bool config_get_string_or_set_default(char *group, char *key, char *default_valu return modified; } -bool config_get_int_with_default(char *group, char *key, int default_value, int *value) +bool config_get_int_or_set_default(char *group, char *key, int default_value, int *value) { bool modified = false; diff --git a/src/resource/resource_lap_counter.c b/src/resource/resource_lap_counter.c index 72aac8a..4dad50d 100644 --- a/src/resource/resource_lap_counter.c +++ b/src/resource/resource_lap_counter.c @@ -63,7 +63,7 @@ void resource_lap_counter_init(void) int ret = PERIPHERAL_ERROR_NONE; int pin = DEFAULT_LAP_GPIO; - bool modified = config_get_int_with_default(CONFIG_GRP_RPI, CONFIG_KEY_RPI_PIN_LAP_COUNTER, DEFAULT_LAP_GPIO, &pin); + bool modified = config_get_int_or_set_default(CONFIG_GRP_RPI, CONFIG_KEY_RPI_PIN_LAP_COUNTER, DEFAULT_LAP_GPIO, &pin); _D("Lap gpio: %d", pin); diff --git a/src/resource/resource_led.c b/src/resource/resource_led.c index 1640343..df12dab 100644 --- a/src/resource/resource_led.c +++ b/src/resource/resource_led.c @@ -243,7 +243,7 @@ static peripheral_gpio_h _init_gpio(int default_gpio, char *key) peripheral_gpio_h gpio; int pin = 0; - bool modified = config_get_int_with_default(CONFIG_GRP_RPI, key, default_gpio, &pin); + bool modified = config_get_int_or_set_default(CONFIG_GRP_RPI, key, default_gpio, &pin); _D("Initializing gpio: %d", pin); @@ -263,7 +263,7 @@ static peripheral_gpio_h _init_gpio(int default_gpio, char *key) static void _init_bi_led(void) { - bool modified = config_get_int_with_default(CONFIG_GRP_RPI, CONFIG_KEY_RPI_USE_BI_LED, 1, &s_info.use_bi_led); + bool modified = config_get_int_or_set_default(CONFIG_GRP_RPI, CONFIG_KEY_RPI_USE_BI_LED, 1, &s_info.use_bi_led); if (modified) { config_save(); } @@ -281,7 +281,7 @@ static void _init_bi_led(void) static void _init_rgb_gpio_led(void) { - bool modified = config_get_int_with_default(CONFIG_GRP_RPI, CONFIG_KEY_RPI_USE_GPIO_RGB, 1, &s_info.use_rgb_gpio); + bool modified = config_get_int_or_set_default(CONFIG_GRP_RPI, CONFIG_KEY_RPI_USE_GPIO_RGB, 1, &s_info.use_rgb_gpio); if (modified) { config_save(); } @@ -301,7 +301,7 @@ static void _init_rgb_gpio_led(void) void _init_l2c(int default_channel, char *config_key) { int channel; - bool modified = config_get_int_with_default(CONFIG_GRP_RPI, config_key, default_channel, &channel); + bool modified = config_get_int_or_set_default(CONFIG_GRP_RPI, config_key, default_channel, &channel); if (modified) { config_save(); } @@ -312,7 +312,7 @@ void _init_l2c(int default_channel, char *config_key) static void _init_rgb_l2c_led(void) { - bool modified = config_get_int_with_default(CONFIG_GRP_RPI, CONFIG_KEY_RPI_USE_L2C_RGB, 1, &s_info.use_rgb_l2c); + bool modified = config_get_int_or_set_default(CONFIG_GRP_RPI, CONFIG_KEY_RPI_USE_L2C_RGB, 1, &s_info.use_rgb_l2c); if (modified) { config_save(); } @@ -373,7 +373,7 @@ static void _set_rgb(char *key, bool store_current, int value; snprintf(final_key, PATH_MAX, "bicolor.%s", key); - modified |= config_get_int_with_default("Rpi.led", final_key, bi_led, &value); + modified |= config_get_int_or_set_default("Rpi.led", final_key, bi_led, &value); _led_bi_set(value, store_current); if (modified) {