samples: mesh: nrf52: coding style improvements. Removed extra blank line. Add new bound_states_transition_type_reassignment() function in transition.c to improve code readability & understanding. Signed-off-by: Vikrant More <vikrant8051@gmail.com>
diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.c b/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.c index aa59122..ccf922b 100644 --- a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.c +++ b/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.c
@@ -34,7 +34,6 @@ duration_remainder = transition->total_duration - (now - transition->start_timestamp); - if (duration_remainder > 620000) { /* > 620 seconds -> resolution = 0b11 [10 minutes] */ resolution = 0x03; @@ -62,6 +61,29 @@ /* Function to calculate Remaining Time (End) */ +static void bound_states_transition_type_reassignment(u8_t type) +{ + switch (type) { + case ONOFF: + case LEVEL: + case ACTUAL: + case LINEAR: + light_ctl_srv_user_data.transition = &lightness_transition; + break; + case CTL: + light_ctl_srv_user_data.transition = &lightness_transition; + gen_level_srv_s0_user_data.transition = &lightness_transition; + break; + case LEVEL_TEMP: + case CTL_TEMP: + gen_level_srv_s0_user_data.transition = &temp_transition; + light_ctl_srv_user_data.transition = &temp_transition; + break; + default: + break; + } +} + static void tt_values_calculator(struct transition *transition) { u8_t steps_multiplier, resolution; @@ -95,7 +117,7 @@ void onoff_tt_values(struct generic_onoff_state *state) { - light_ctl_srv_user_data.transition = &lightness_transition; + bound_states_transition_type_reassignment(ONOFF); tt_values_calculator(state->transition); @@ -114,10 +136,9 @@ u32_t counter; if (state == &gen_level_srv_root_user_data) { - light_ctl_srv_user_data.transition = &lightness_transition; + bound_states_transition_type_reassignment(LEVEL); } else if (state == &gen_level_srv_s0_user_data) { - state->transition = &temp_transition; - light_ctl_srv_user_data.transition = &temp_transition; + bound_states_transition_type_reassignment(LEVEL_TEMP); } tt_values_calculator(state->transition); @@ -145,7 +166,7 @@ { u32_t counter; - light_ctl_srv_user_data.transition = &lightness_transition; + bound_states_transition_type_reassignment(ACTUAL); tt_values_calculator(state->transition); @@ -169,7 +190,7 @@ { u32_t counter; - light_ctl_srv_user_data.transition = &lightness_transition; + bound_states_transition_type_reassignment(LINEAR); tt_values_calculator(state->transition); @@ -193,8 +214,7 @@ { u32_t counter; - state->transition = &lightness_transition; - gen_level_srv_s0_user_data.transition = &lightness_transition; + bound_states_transition_type_reassignment(CTL); tt_values_calculator(state->transition); @@ -226,8 +246,7 @@ { u32_t counter; - state->transition = &temp_transition; - gen_level_srv_s0_user_data.transition = &temp_transition; + bound_states_transition_type_reassignment(CTL_TEMP); tt_values_calculator(state->transition);
diff --git a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.h b/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.h index 6617fa4..36c9927 100644 --- a/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.h +++ b/samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/transition.h
@@ -37,14 +37,14 @@ extern struct transition lightness_transition, temp_transition; -struct k_timer dummy_timer; -struct k_timer onoff_transition_timer; +extern struct k_timer dummy_timer; +extern struct k_timer onoff_transition_timer; extern struct k_timer level_lightness_transition_timer; extern struct k_timer level_temp_transition_timer; -struct k_timer light_lightness_actual_transition_timer; -struct k_timer light_lightness_linear_transition_timer; -struct k_timer light_ctl_transition_timer; -struct k_timer light_ctl_temp_transition_timer; +extern struct k_timer light_lightness_actual_transition_timer; +extern struct k_timer light_lightness_linear_transition_timer; +extern struct k_timer light_ctl_transition_timer; +extern struct k_timer light_ctl_temp_transition_timer; void calculate_rt(struct transition *transition);