From 9fd8fdc5b7fe94a8330e14f6666121e913c9c6de Mon Sep 17 00:00:00 2001 From: Zhifei Yang Date: Thu, 3 Nov 2016 15:51:13 +0800 Subject: [PATCH] issue #224: LISA energy model notebook fails to run in Juno r0 board solution: fix hwmon settings for Juno r0 board Signed-off-by: Zhifei Yang --- ipynb/energy/EnergyModel_ClusterEnergy.ipynb | 6 +++--- libs/utils/energy.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ipynb/energy/EnergyModel_ClusterEnergy.ipynb b/ipynb/energy/EnergyModel_ClusterEnergy.ipynb index d444a4c90..323177e2e 100644 --- a/ipynb/energy/EnergyModel_ClusterEnergy.ipynb +++ b/ipynb/energy/EnergyModel_ClusterEnergy.ipynb @@ -106,12 +106,12 @@ " \"emeter\" : {\n", " 'instrument' : 'hwmon',\n", " 'conf' : {\n", - " 'sites' : [ 'a53', 'a57' ],\n", + " 'sites' : [ 'BOARDLITTLE', 'BOARDBIG' ],\n", " 'kinds' : [ 'energy' ],\n", " },\n", " 'channel_map' : {\n", - " 'little' : 'a53',\n", - " 'big' : 'a57',\n", + " 'little' : 'BOARDLITTLE',\n", + " 'big' : 'BOARDBIG',\n", " }\n", " },\n", " \n", diff --git a/libs/utils/energy.py b/libs/utils/energy.py index 36166de12..8308bf86a 100644 --- a/libs/utils/energy.py +++ b/libs/utils/energy.py @@ -46,12 +46,12 @@ DEFAULT_ENERGY_METER = { 'juno' : { 'instrument' : 'hwmon', 'conf' : { - 'sites' : [ 'a53', 'a57' ], + 'sites' : [ 'BOARDLITTLE', 'BOARDBIG' ], 'kinds' : [ 'energy' ], }, 'channel_map' : { - 'LITTLE' : 'a53', - 'big' : 'a57', + 'LITTLE' : 'BOARDLITTLE', + 'big' : 'BOARDBIG', } }, 'juno2' : { -- GitLab