Skip to content

DIOT Zynq Ultrascale-based System Board
DIOT Zynq Ultrascale-based System Board
Commit 068ebb42 authored by Grzegorz Daniluk's avatar Grzegorz Daniluk
Browse files
Options

diot_util pts: fixes after Adam's review

parent a6d07c15
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 25 deletions
sw/petalinux/project-spec/meta-user/recipes-apps/diot-util/files/diot_util_clk.c
View file @ 068ebb42
......@@ -164,27 +164,27 @@ int pts_clocks(void)
printf("Test Clocks");
get_file_content(INPUT_PRESENT_FILE, &val);
ret = get_file_content(INPUT_PRESENT_FILE, &val);
pts_sensor_p = find_pts_sensor("PLL Input Present");
if (!pts_sensor_inrange(val, pts_sensor_p)) {
if (ret < 0 || !pts_sensor_inrange(val, pts_sensor_p)) {
if (errors++ == 0)
printf("\rFAIL Clocks\n");
printf("\t%s: ERROR (%d vs [%.1f;%.1f])\n", pts_sensor_p->short_name,
val, pts_sensor_p->allowed_min, pts_sensor_p->allowed_max);
}
get_file_content(PLL_LOCKED_FILE, &val);
ret = get_file_content(PLL_LOCKED_FILE, &val);
pts_sensor_p = find_pts_sensor("PLL Locked");
if (!pts_sensor_inrange(val, pts_sensor_p)) {
if (ret < 0 || !pts_sensor_inrange(val, pts_sensor_p)) {
if (errors++ == 0)
printf("\rFAIL Clocks\n");
printf("\t%s: ERROR (%d vs [%.1f;%.1f])\n", pts_sensor_p->short_name,
val, pts_sensor_p->allowed_min, pts_sensor_p->allowed_max);
}
get_selected_input(&val, NULL, NULL);
ret = get_selected_input(&val, NULL, NULL);
pts_sensor_p = find_pts_sensor("PLL Input");
if (!pts_sensor_inrange(val, pts_sensor_p)) {
if (ret < 0 || !pts_sensor_inrange(val, pts_sensor_p)) {
if (errors++ == 0)
printf("\rFAIL Clocks\n");
printf("\t%s: ERROR (%d vs [%.1f;%.1f])\n", pts_sensor_p->short_name,
......@@ -194,10 +194,10 @@ int pts_clocks(void)
for (i = 0; i < SI5341_N_CH_OUT; i++) {
snprintf(path_buff, sizeof(path_buff), "%s.%d/clk_rate",
SI5341_PREFIX_PATH, i);
get_file_content(path_buff, &val);
ret = get_file_content(path_buff, &val);
snprintf(path_buff, sizeof(path_buff), "PLL Out%d", i);
pts_sensor_p = find_pts_sensor(path_buff);
if (!pts_sensor_inrange((float)val/1000000, pts_sensor_p)) {
if (ret < 0 || !pts_sensor_inrange((float)val/1000000, pts_sensor_p)) {
if (errors++ == 0)
printf("\rFAIL Clocks\n");
printf("\t%s: ERROR (%.1f vs [%.1f;%.1f])\n", pts_sensor_p->short_name,
......
sw/petalinux/project-spec/meta-user/recipes-apps/diot-util/files/diot_util_pts.c
View file @ 068ebb42
......@@ -70,7 +70,7 @@ struct pts_sensor * find_pts_sensor(char *sensor_name)
int pts_sensor_inrange(double val, struct pts_sensor *sens)
{
if (val >= sens->allowed_min && val <= sens->allowed_max) {
if (sens && val >= sens->allowed_min && val <= sens->allowed_max) {
return 1;
} else {
return 0;
......
sw/petalinux/project-spec/meta-user/recipes-apps/diot-util/files/diot_util_sensors.c
View file @ 068ebb42
......@@ -877,6 +877,10 @@ int pts_sensors(void)
printf("\t%s: ERROR (%.1f vs [%.1f;%.1f])\n", sensor_p->short_name,
sensor_p->read_val, pts_sensor_p->allowed_min, pts_sensor_p->allowed_max);
}
} else {
if (errors_temp++ == 0)
printf("\rFAIL Temp Sensors\n");
printf("\t%s: ERROR sensor not found\n", pts_sensor_p->short_name);
}
}
/* IRPS1 Temp */
......@@ -911,24 +915,36 @@ int pts_sensors(void)
for (; svcp->short_name; svcp++) {
sensor_p = find_hw_sensor(svcp->voltage_sensor_name, hw_sensors_vcp_list);
pts_sensor_p = find_pts_sensor(svcp->voltage_sensor_name);
if (!pts_sensor_inrange(sensor_p->read_val, pts_sensor_p)) {
if (sensor_p && pts_sensor_p) {
if (!pts_sensor_inrange(sensor_p->read_val, pts_sensor_p)) {
if (errors_vcp++ == 0)
printf("\rFAIL Voltage/Current sensors");
printf("\t%s: ERROR (%.2f vs [%.2f;%.2f])\n", svcp->voltage_sensor_name,
sensor_p->read_val, pts_sensor_p->allowed_min,
pts_sensor_p->allowed_max);
}
} else {
if (errors_vcp++ == 0)
printf("\rFAIL Voltage/Current sensors");
printf("\t%s: ERROR (%.2f vs [%.2f;%.2f])\n", svcp->voltage_sensor_name,
sensor_p->read_val, pts_sensor_p->allowed_min,
pts_sensor_p->allowed_max);
printf("\t%s: ERROR sensor not found\n", pts_sensor_p->short_name);
}
}
/* IRPS1 Input Current */
svcp = irps1_entries;
sensor_p = find_hw_sensor(svcp->current_sensor_name, hw_sensors_vcp_list);
pts_sensor_p = find_pts_sensor(svcp->current_sensor_name);
if (!pts_sensor_inrange(sensor_p->read_val, pts_sensor_p)) {
if (sensor_p && pts_sensor_p) {
if (!pts_sensor_inrange(sensor_p->read_val, pts_sensor_p)) {
if (errors_vcp++ == 0)
printf("\rFAIL Voltage/Current sensors");
printf("\t%s: ERROR (%.2f vs [%.2f;%.2f])\n", svcp->current_sensor_name,
sensor_p->read_val, pts_sensor_p->allowed_min,
pts_sensor_p->allowed_max);
}
} else {
if (errors_vcp++ == 0)
printf("\rFAIL Voltage/Current sensors");
printf("\t%s: ERROR (%.2f vs [%.2f;%.2f])\n", svcp->current_sensor_name,
sensor_p->read_val, pts_sensor_p->allowed_min,
pts_sensor_p->allowed_max);
printf("\t%s: ERROR sensor not found\n", pts_sensor_p->short_name);
}
/* IRPS2 VCP */
......@@ -936,24 +952,36 @@ int pts_sensors(void)
for (; svcp->short_name; svcp++) {
sensor_p = find_hw_sensor(svcp->voltage_sensor_name, hw_sensors_vcp_list);
pts_sensor_p = find_pts_sensor(svcp->voltage_sensor_name);
if (!pts_sensor_inrange(sensor_p->read_val, pts_sensor_p)) {
if (sensor_p && pts_sensor_p) {
if (!pts_sensor_inrange(sensor_p->read_val, pts_sensor_p)) {
if (errors_vcp++ == 0)
printf("\rFAIL Voltage/Current sensors");
printf("%s: ERROR (%.2f vs [%.2f;%.2f])\n", svcp->voltage_sensor_name,
sensor_p->read_val, pts_sensor_p->allowed_min,
pts_sensor_p->allowed_max);
}
} else {
if (errors_vcp++ == 0)
printf("\rFAIL Voltage/Current sensors");
printf("%s: ERROR (%.2f vs [%.2f;%.2f])\n", svcp->voltage_sensor_name,
sensor_p->read_val, pts_sensor_p->allowed_min,
pts_sensor_p->allowed_max);
printf("\t%s: ERROR sensor not found\n", pts_sensor_p->short_name);
}
}
/* IRPS2 Input Current */
svcp = irps2_entries;
sensor_p = find_hw_sensor(svcp->current_sensor_name, hw_sensors_vcp_list);
pts_sensor_p = find_pts_sensor(svcp->current_sensor_name);
if (!pts_sensor_inrange(sensor_p->read_val, pts_sensor_p)) {
if (sensor_p && pts_sensor_p) {
if (!pts_sensor_inrange(sensor_p->read_val, pts_sensor_p)) {
if (errors_vcp++ == 0)
printf("\rFAIL Voltage/Current sensors");
printf("%s: ERROR (%.2f vs [%.2f;%.2f])\n", svcp->current_sensor_name,
sensor_p->read_val, pts_sensor_p->allowed_min,
pts_sensor_p->allowed_max);
}
} else {
if (errors_vcp++ == 0)
printf("\rFAIL Voltage/Current sensors");
printf("%s: ERROR (%.2f vs [%.2f;%.2f])\n", svcp->current_sensor_name,
sensor_p->read_val, pts_sensor_p->allowed_min,
pts_sensor_p->allowed_max);
printf("\t%s: ERROR sensor not found\n", pts_sensor_p->short_name);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment