From 5ed70476e61e13893d3f5e0496f554cab443e737 Mon Sep 17 00:00:00 2001
From: ROBBE Patrick <robbe@lal.in2p3.fr>
Date: Thu, 30 Jan 2020 14:36:12 +0100
Subject: [PATCH] Display firmware version in pll_status window
---
Pcie40Applications/main_pcie40_readFPGAversion.c | 2 +-
Python/components/fpga_comp.py | 2 +-
Scripts/pll_status_small.py | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Pcie40Applications/main_pcie40_readFPGAversion.c b/Pcie40Applications/main_pcie40_readFPGAversion.c
index 625bfc1..c31f90c 100644
--- a/Pcie40Applications/main_pcie40_readFPGAversion.c
+++ b/Pcie40Applications/main_pcie40_readFPGAversion.c
@@ -10,7 +10,7 @@
#include <getopt.h>
#include "ecs_driverlib.h"
-#define SIZE_MEMO_FPGA 220 /* taille max de la memoire interne FPG */
+#define SIZE_MEMO_FPGA 1024 /* taille max de la memoire interne FPG */
int main(int argc, char *argv[]){
int board = 0;
diff --git a/Python/components/fpga_comp.py b/Python/components/fpga_comp.py
index 7c007c2..3031e6e 100644
--- a/Python/components/fpga_comp.py
+++ b/Python/components/fpga_comp.py
@@ -548,7 +548,7 @@ class Arria10(object):
string += char
else:
string = "{\"design_version\" : \"not implemented\"}"
-
+ string=string.rstrip('0}')+'}'
return json.loads(string)
def runNumber(self):
diff --git a/Scripts/pll_status_small.py b/Scripts/pll_status_small.py
index beb25c7..7824a7f 100755
--- a/Scripts/pll_status_small.py
+++ b/Scripts/pll_status_small.py
@@ -306,10 +306,10 @@ 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" }
+ #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 )
--
GitLab