samples: mesh: replaced magic numbers with values defined in stdint.h (35f14bc3) · Commits · Wenxi XU / zephyr

samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/src/mesh/state_binding.c

+13 −13

Original line number	Diff line number	Diff line
		@@ -53,14 +53,14 @@ static u16_t actual_to_linear(u16_t val)
		{
		float tmp;

		tmp = ((float) val / 65535);
		tmp = ((float) val / UINT16_MAX);

		return (u16_t) ceiling(65535 * tmp * tmp);
		return (u16_t) ceiling(UINT16_MAX * tmp * tmp);
		}

		static u16_t linear_to_actual(u16_t val)
		{
		return (u16_t) (65535 * sqrt(((float) val / 65535)));
		return (u16_t) (UINT16_MAX * sqrt(((float) val / UINT16_MAX)));
		}

		static void constrain_lightness(u16_t var)
		@@ -108,12 +108,12 @@ static s16_t light_ctl_temp_to_level(u16_t temp)

		/* Mesh Model Specification 6.1.3.1.1 2nd formula start */

		tmp = (temp - light_ctl_srv_user_data.temp_range_min) * 65535U;
		tmp = (temp - light_ctl_srv_user_data.temp_range_min) * UINT16_MAX;

		tmp = tmp / (light_ctl_srv_user_data.temp_range_max -
		light_ctl_srv_user_data.temp_range_min);

		return (s16_t) (tmp - 32768);
		return (s16_t) (tmp + INT16_MIN);

		/* 6.1.3.1.1 2nd formula end */
		}
		@@ -125,10 +125,10 @@ static u16_t level_to_light_ctl_temp(s16_t level)

		/* Mesh Model Specification 6.1.3.1.1 1st formula start */
		diff = (float) (light_ctl_srv_user_data.temp_range_max -
		light_ctl_srv_user_data.temp_range_min) / 65535;
		light_ctl_srv_user_data.temp_range_min) / UINT16_MAX;


		tmp = (u16_t) ((level + 32768) * diff);
		tmp = (u16_t) ((level - INT16_MIN) * diff);

		return (light_ctl_srv_user_data.temp_range_min + tmp);

		@@ -147,7 +147,7 @@ void readjust_lightness(void)
		gen_onoff_srv_root_user_data.onoff = STATE_OFF;
		}

		gen_level_srv_root_user_data.level = lightness - 32768;
		gen_level_srv_root_user_data.level = lightness + INT16_MIN;
		light_lightness_srv_user_data.actual = lightness;
		light_lightness_srv_user_data.linear = actual_to_linear(lightness);
		light_ctl_srv_user_data.lightness = lightness;
		@@ -198,10 +198,10 @@ void state_binding(u8_t light, u8_t temp)
		}
		break;
		case LEVEL:
		lightness = gen_level_srv_root_user_data.level + 32768;
		lightness = gen_level_srv_root_user_data.level - INT16_MIN;
		break;
		case DELTA_LEVEL:
		lightness = gen_level_srv_root_user_data.level + 32768;
		lightness = gen_level_srv_root_user_data.level - INT16_MIN;
		constrain_lightness2(lightness);
		goto jump;
		case ACTUAL:
		@@ -234,7 +234,7 @@ void init_lightness_target_values(void)
		gen_onoff_srv_root_user_data.target_onoff = STATE_OFF;
		}

		gen_level_srv_root_user_data.target_level = target_lightness - 32768;
		gen_level_srv_root_user_data.target_level = target_lightness + INT16_MIN;

		light_lightness_srv_user_data.target_actual = target_lightness;

		@@ -261,7 +261,7 @@ void calculate_lightness_target_values(u8_t type)
		}
		break;
		case LEVEL:
		tmp = gen_level_srv_root_user_data.target_level + 32768;
		tmp = gen_level_srv_root_user_data.target_level - INT16_MIN;
		break;
		case ACTUAL:
		tmp = light_lightness_srv_user_data.target_actual;
		@@ -287,7 +287,7 @@ void calculate_lightness_target_values(u8_t type)
		gen_onoff_srv_root_user_data.target_onoff = STATE_OFF;
		}

		gen_level_srv_root_user_data.target_level = target_lightness - 32768;
		gen_level_srv_root_user_data.target_level = target_lightness + INT16_MIN;

		light_lightness_srv_user_data.target_actual = target_lightness;

Admin message