From 2dece5c635731ea03e5dd91278eac59d37bd75ef Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 6 Jun 2018 16:15:30 +0200 Subject: [PATCH] jungfrau server: reading power status (fixed in firmware) --- .../bin/jungfrauDetectorServer_developer | Bin 116212 -> 116212 bytes .../slsDetectorFunctionList.c | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer b/slsDetectorSoftware/jungfrauDetectorServer/bin/jungfrauDetectorServer_developer index 078adf493d406d70dde1d63a10eec787e8008d71..87d433a9ca3dc73a6708cd3394ce4af901a9b6a7 100755 GIT binary patch delta 13782 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 JT}jPN{~y)f0N4Nk delta 13727 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 diff --git a/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c b/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c index 1fba10512..3ea7be47d 100644 --- a/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c +++ b/slsDetectorSoftware/jungfrauDetectorServer/slsDetectorFunctionList.c @@ -518,9 +518,9 @@ int powerChip (int on){ } } - return ((bus_r(CHIP_POWER_REG) & CHIP_POWER_ENABLE_MSK) >> CHIP_POWER_ENABLE_OFST); + //return ((bus_r(CHIP_POWER_REG) & CHIP_POWER_ENABLE_MSK) >> CHIP_POWER_ENABLE_OFST); /**temporary fix until power reg status can be read */ - //return ((bus_r(CHIP_POWER_REG) & CHIP_POWER_STATUS_MSK) >> CHIP_POWER_STATUS_OFST); + return ((bus_r(CHIP_POWER_REG) & CHIP_POWER_STATUS_MSK) >> CHIP_POWER_STATUS_OFST); }