From 259d3ec5856f99e4006a401e381ccf84ac0a8d25 Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Wed, 8 Jan 2014 15:59:02 +0100 Subject: [PATCH] added register for direct overcurrent detection --- web/htdocs/.cvsignore | 2 - xml-db/database/CbController.xml | 108 +++++++++---------------------- 2 files changed, 30 insertions(+), 80 deletions(-) delete mode 100644 web/htdocs/.cvsignore diff --git a/web/htdocs/.cvsignore b/web/htdocs/.cvsignore deleted file mode 100644 index 6db58d0..0000000 --- a/web/htdocs/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -monitor -access.log diff --git a/xml-db/database/CbController.xml b/xml-db/database/CbController.xml index 403473b..b75a393 100644 --- a/xml-db/database/CbController.xml +++ b/xml-db/database/CbController.xml @@ -101,6 +101,22 @@ start="0" bits="1" mode="rw" purpose="config" format="bitmask" > + + Status of the four overcurrent detection inputs of the FPGA. + + Overcurrent on digital voltage of sensor 0. + + + Overcurrent on analog voltage of sensor 0. + + + Overcurrent on digital voltage of sensor 1. + + + Overcurrent on analog voltage of sensor 1. + + + - - - indicates current limit is exceeded for analog sensor power - - - indicates current limit is exceeded for digital sensor power - - + + indicates current limit is exceeded for analog sensor power. Register is read from uC. + + + indicates current limit is exceeded for digital sensor power Register is read from uC. + + - - - - periodically measure all reference voltages + periodically measure all reference voltages - periodically measure read all sensor power supply voltages/currents + periodically measure read all sensor power supply voltages/currents - continuously measure the ADC channel selected by ADC_sel, MuxAddr, ZeroCalib, ADC0_chan and ADC1_chan + continuously measure the ADC channel selected by ADC_sel, MuxAddr, ZeroCalib, ADC0_chan and ADC1_chan 0 => ADC0 selected, 1=> ADC1 selected - select reference voltage multiplexer channel + select reference voltage multiplexer channel - - switch to a reference zero position to calibrate the instrumentation amplifier + switch to a reference zero position to calibrate the instrumentation amplifier - select ADC0 channel - + select ADC0 channel - select ADC1 channel - + select ADC1 channel @@ -428,26 +400,6 @@ - - - - settings for the debug spi interface -- 2.43.0