From 60e2e9b55888c89eb9fb528ba89fc33bb2585b6a Mon Sep 17 00:00:00 2001
From: ROBBE Patrick <robbe@lal.in2p3.fr>
Date: Thu, 30 Jan 2020 12:21:24 +0100
Subject: [PATCH] Add firmware version information on pll_status screen

---
 Scripts/pll_status_small.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/Scripts/pll_status_small.py b/Scripts/pll_status_small.py
index a576e7e..beb25c7 100755
--- a/Scripts/pll_status_small.py
+++ b/Scripts/pll_status_small.py
@@ -159,7 +159,7 @@ def program_plls(plls, devices, files, win):
     #win.move(2,1)
     win.clrtobot()
     win.box()
-    line = 3
+    line = 4
 
     for i in plls.keys():  # programs the 3 PLLs
         (status, part_number) = plls[i].read_part_number()
@@ -306,6 +306,15 @@ def draw_menu(stdscr, dev):
     val = val.replace("\"","")
     val = val.split(",")[0]
     win1.addstr("                           Running on : " + val, CYAN | curses.A_BOLD)
+    try: 
+        vers = fpga.read_version()
+    except ValueError:
+        vers = { "design_version": "N/A" , "server" : "N/A" , "links" : "N/A" } 
+        
+    win1.addstr(2 , 1 , "    Firmware version : " + vers[ 'design_version' ] , CYAN | curses.A_BOLD ) 
+    win1.addstr( ", for server : " + vers[ 'server' ] , CYAN | curses.A_BOLD ) 
+    win1.addstr( ", and number of links : " + vers[ 'links' ] , CYAN | curses.A_BOLD ) 
+    
     win1.refresh()
 
     win2 = stdscr.subwin(y_max/6,
@@ -365,10 +374,10 @@ def draw_menu(stdscr, dev):
         elif k == curses.KEY_LEFT:
             cursor_x = cursor_x - 1
         elif k == curses.KEY_F2:
-            win1.move(2, 1)
+            win1.move(3, 1)
             win1.clrtobot()
             win1.box()
-            win1.addstr(2, 1, "Programming PLLs (source = FTSW)" , curses.A_BOLD)
+            win1.addstr(3, 1, "Programming PLLs (source = FTSW)" , curses.A_BOLD)
             files = files1b
             conf = conf1
             program_plls(plls, devices, files, win1)
-- 
GitLab