Skip to content

W
White Rabbit Switch - Software
Commit 6f3298e0 authored by Benoit Rat's avatar Benoit Rat Committed by Adam Wujek
Browse files
Options

userspace/tools: update webinterface output for wr_mon

parent 9f585478
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 17 deletions
userspace/tools/wr_mon.c
View file @ 6f3298e0
...@@ -494,14 +494,33 @@ void show_ports(int alive) ...@@ -494,14 +494,33 @@ void show_ports(int alive)
} }
term_cprintf(C_WHITE, "\n"); term_cprintf(C_WHITE, "\n");
} else if (mode & WEB_INTERFACE) { } else if (mode & WEB_INTERFACE) {
printf("%-5s ", if_name);
printf("%s ", state_up(port_state->state) printf("%s ", state_up(port_state->state)
? "up" : "down"); ? "up" : "down");
printf("%s ", if_mode); printf("%s ", if_mode);
printf("%s ", port_state->locked printf("%s ", port_state->locked
? "Locked" : "NoLock"); ? "Locked" : "NoLock");
printf("%s\n", port_state->calib.rx_calibrated printf("%s ", port_state->calib.rx_calibrated
&& port_state->calib.tx_calibrated && port_state->calib.tx_calibrated
? "Calibrated" : "Uncalibrated"); ? "Calibrated" : "Uncalibrated");
for (j = 0; j < ppg->nlinks; j++) {
if (strcmp(if_name,
pp_array[j].cfg.iface_name)
) {
/* Instance not for this interface
* skip */
continue;
}
if (state_up(port_state->state)) {
unsigned char *p = pp_array[j].peer;
printf("%02x:%02x:%02x:%02x:%02x:%02x"
" ", p[0], p[1], p[2], p[3],
p[4], p[5]);
}
}
printf("\n");
} else if (print_port) { } else if (print_port) {
printf("port:%s ", if_name); printf("port:%s ", if_name);
printf("lnk:%d ", state_up(port_state->state)); printf("lnk:%d ", state_up(port_state->state));
...@@ -648,18 +667,15 @@ void show_servo(int alive) ...@@ -648,18 +667,15 @@ void show_servo(int alive)
/* SPEC shows temperature, but that can be selected separately /* SPEC shows temperature, but that can be selected separately
* in this program * in this program
*/ */
if (mode == WEB_INTERFACE)
printf("\n");
} }
} }
void show_temperatures(void) void show_temperatures(void)
{ {
if ((mode == SHOW_GUI) || (mode & WEB_INTERFACE)) { if ((mode == SHOW_GUI)) {
if (mode == SHOW_GUI) { term_cprintf(C_CYAN, "\n-------------------------------- Temperatures ---------------------------------\n");
/* -------------------------------------------------------------------------------*/
term_cprintf(C_CYAN, "\n-------------------------------- Temperatures ---------------------------------\n");
} else {
term_cprintf(C_CYAN, "\nTemperatures:\n");
}
term_cprintf(C_BLUE, "FPGA: "); term_cprintf(C_BLUE, "FPGA: ");
term_cprintf(C_WHITE, "%2.2f ", term_cprintf(C_WHITE, "%2.2f ",
...@@ -679,12 +695,16 @@ void show_temperatures(void) ...@@ -679,12 +695,16 @@ void show_temperatures(void)
printf("pll:%2.2f ", temp_sensors_local.pll/256.0); printf("pll:%2.2f ", temp_sensors_local.pll/256.0);
printf("psl:%2.2f ", temp_sensors_local.psl/256.0); printf("psl:%2.2f ", temp_sensors_local.psl/256.0);
printf("psr:%2.2f", temp_sensors_local.psr/256.0); printf("psr:%2.2f", temp_sensors_local.psr/256.0);
if (mode == WEB_INTERFACE)
printf("\n");
} }
} }
void show_time(void) void show_time(void)
{ {
printf("TIME sec:%lld nsec:%d ", seconds, nanoseconds); printf("TIME sec:%lld nsec:%d ", seconds, nanoseconds);
if (mode == WEB_INTERFACE)
printf("\n");
} }
void show_all(void) void show_all(void)
...@@ -704,7 +724,7 @@ void show_all(void) ...@@ -704,7 +724,7 @@ void show_all(void)
ppsi_alive = (ppsi_head->pid && (kill(ppsi_head->pid, 0) == 0)) ppsi_alive = (ppsi_head->pid && (kill(ppsi_head->pid, 0) == 0))
+ ignore_alive; + ignore_alive;
if (mode & SHOW_WR_TIME) { if (mode & (SHOW_WR_TIME | WEB_INTERFACE)) {
if (ppsi_alive) if (ppsi_alive)
show_time(); show_time();
else if (mode == SHOW_ALL) else if (mode == SHOW_ALL)
...@@ -715,7 +735,7 @@ void show_all(void) ...@@ -715,7 +735,7 @@ void show_all(void)
show_ports(hal_alive); show_ports(hal_alive);
} }
if (mode & SHOW_SERVO || mode == SHOW_GUI) { if (mode & (SHOW_SERVO | WEB_INTERFACE) || mode == SHOW_GUI) {
show_servo(ppsi_alive); show_servo(ppsi_alive);
} }
...@@ -789,7 +809,13 @@ int main(int argc, char *argv[]) ...@@ -789,7 +809,13 @@ int main(int argc, char *argv[])
init_shm(); init_shm();
if (shw_fpga_mmap_init() < 0) {
pr_error("Can't initialize FPGA mmap\n");
exit(1);
}
if (mode & WEB_INTERFACE) { if (mode & WEB_INTERFACE) {
shw_pps_gen_read_time(&seconds, &nanoseconds);
read_servo(); read_servo();
read_hal(); read_hal();
show_all(); show_all();
...@@ -797,12 +823,6 @@ int main(int argc, char *argv[]) ...@@ -797,12 +823,6 @@ int main(int argc, char *argv[])
} }
term_init(usecolor); term_init(usecolor);
if (shw_fpga_mmap_init() < 0) {
pr_error("Can't initialize FPGA mmap\n");
exit(1);
}
setvbuf(stdout, NULL, _IOFBF, 4096); setvbuf(stdout, NULL, _IOFBF, 4096);
/* main loop */ /* main loop */
...@@ -832,7 +852,6 @@ int main(int argc, char *argv[]) ...@@ -832,7 +852,6 @@ int main(int argc, char *argv[])
if (seconds != last_seconds) { if (seconds != last_seconds) {
read_servo(); read_servo();
read_hal(); read_hal();
show_all(); show_all();
last_seconds = seconds; last_seconds = seconds;
......
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