Skip to content

W
White Rabbit Switch - Software
Commit cfb947e8 authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

userspace/tools: restore printing temperatures for webinterface from wr_mon 

Fix not displaying temperatures for webinterface in wr_mon. The bug was
introduced by commit:
userspace/tools: improve wr_mon to display statistics in a more segregated way
Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent 94ba4169
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 6 deletions
userspace/tools/wr_mon.c
View file @ cfb947e8
......@@ -24,9 +24,7 @@
#define SHOW_OTHER_PORTS (1<<2)
#define SHOW_SERVO (1<<3)
#define SHOW_TEMPERATURES (1<<4)
#define WEB_INTERFACE (1<<5) /* TJP: still has it's own print
* function, ugly
*/
#define WEB_INTERFACE (1<<5)
#define SHOW_WR_TIME (1<<6)
/* for convenience when any or all ports needs a print statement */
......@@ -485,7 +483,7 @@ void show_servo(void)
void show_temperatures(void)
{
if (mode == SHOW_GUI) {
if ((mode == SHOW_GUI) || (mode & WEB_INTERFACE)) {
term_cprintf(C_BLUE, "\nTemperatures:\n");
term_cprintf(C_GREY, "FPGA: ");
......@@ -552,7 +550,7 @@ void show_all(void)
show_servo();
}
if (mode & SHOW_TEMPERATURES || mode == SHOW_GUI) {
if (mode & (SHOW_TEMPERATURES | WEB_INTERFACE) || mode == SHOW_GUI) {
if (hal_alive)
show_temperatures();
}
......@@ -616,7 +614,6 @@ int main(int argc, char *argv[])
}
init_shm();
term_init(usecolor);
if (mode & WEB_INTERFACE) {
read_servo();
......@@ -625,6 +622,8 @@ int main(int argc, char *argv[])
exit(0);
}
term_init(usecolor);
if (shw_fpga_mmap_init() < 0) {
pr_error("Can't initialize FPGA mmap\n");
exit(1);
......
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