From b9d01b1dc18170e699a66527b98668a1b745120d Mon Sep 17 00:00:00 2001 From: "www@jspc55" Date: Mon, 7 Jul 2014 15:57:57 +0200 Subject: [PATCH] updated the CbController register definitions --- web/htdocs/mvd/cb_controller.pl | 22 +-- xml-db/database/CbController.xml | 232 ++++++++++++++++++++----------- 2 files changed, 159 insertions(+), 95 deletions(-) diff --git a/web/htdocs/mvd/cb_controller.pl b/web/htdocs/mvd/cb_controller.pl index 955082a..1ceb9bf 100755 --- a/web/htdocs/mvd/cb_controller.pl +++ b/web/htdocs/mvd/cb_controller.pl @@ -19,29 +19,29 @@ use xmlpage; my $page; -$page->{title} = "Converter Board Controller Register"; +$page->{title} = "Converter Board Controller"; $page->{link} = "../"; my @setup; -$setup[0]->{name} = "Status"; -$setup[0]->{cmd} = "CbController-0xfe4d-CbStatus"; +$setup[0]->{name} = "CbCtrlReg"; +$setup[0]->{cmd} = "CbController-0xfe4d-CbCtrlReg"; $setup[0]->{period} = 1000; $setup[0]->{address} = 1; -$setup[1]->{name} = "SpiRam"; -$setup[1]->{cmd} = "CbController-0xfe4d-CbSpiRam"; +$setup[1]->{name} = "CbSpiStream"; +$setup[1]->{cmd} = "CbController-0xfe4d-CbSpiStream"; $setup[1]->{period} = 1000; $setup[1]->{address} = 1; -$setup[2]->{name} = "ADC"; -$setup[2]->{cmd} = "CbController-0xfe4d-CbAdc"; +$setup[2]->{name} = "CbUcReg"; +$setup[2]->{cmd} = "CbController-0xfe4d-CbUcReg"; $setup[2]->{period} = 1000; $setup[2]->{address} = 1; -$setup[3]->{name} = "UcRegs"; -$setup[3]->{cmd} = "CbController-0xfe4d-CbUcRegs"; -$setup[3]->{period} = 1000; -$setup[3]->{address} = 1; +# $setup[3]->{name} = "UcRegs"; +# $setup[3]->{cmd} = "CbController-0xfe4d-CbUcRegs"; +# $setup[3]->{period} = 1000; +# $setup[3]->{address} = 1; xmlpage::initPage(\@setup,$page); diff --git a/xml-db/database/CbController.xml b/xml-db/database/CbController.xml index 59d2637..b52d91b 100644 --- a/xml-db/database/CbController.xml +++ b/xml-db/database/CbController.xml @@ -13,33 +13,33 @@ - - Register containing the bit pattern that can be measured at the corresponding pins. - + Output bit pattern of the TRB3 peripheral SPARE lines + - Register containing the bit pattern that can be measured at the corresponding pins. - + Current state of the SPARE lines + - a bitmask that defines the data direction (input or output) of the GPIO pins - + Bitmask defining data direction (LO=input, HI=output) of the SPARE lines + - Select UART baudrate: 0->300, 1->600, 2->1200, 3->2400, 4->4800, 5->9600, 6->19200, 7->38400, 8->57600, 9->115200 - Select UART baudrate: 0->300, 1->600, 2->1200, 3->2400, 4->4800, 5->9600, 6->19200, 7->38400, 8->57600, 9->115200 + @@ -47,20 +47,25 @@ Write a byte here to send it via UART, returns fill status of input FIFO - - Shows rx_buffer_empty_bit(MSB) and the last received UART byte. + Pops a byte from the UART receive buffer + start="0" bits="8" mode="r" purpose="config" format="hex" > + Received byte + + + HI if UART receive buffer empty - Override the default UART functionality for debug reasons. If set to 1, UartDataIn and UartDataOut operate the UART directly. + Override the default UART functionality for debug reasons. If set HI, UartDataIn and UartDataOut operate the UART directly. @@ -75,51 +80,62 @@ - the last received SPI word - Last received SPI word from CB uC + - Set what the FPGA returns to the microcontroller over SPI line. + This word is returned by the FPGA's SPI slave each transmission - counts how many spi data words have been received + Counts received SPI data words. 1 SPI word = 16 bit. - Select a SPI channel to monitor in the Fifo + Select an SPI data channel to monitor in the FIFO + + Pops a word from the SPI monitor FIFO + + SPI data word + + + Reception timestamp + + - Brings the uC to reset, when set Lo. + Reset CB uC when LO - Status of the four overcurrent detection inputs of the FPGA. + Status of the four overcurrent detection inputs of the FPGA that are directly + connected to the current drain comparators of the CB power supplies - Overcurrent on digital voltage of sensor 0. + HI if overcurrent on digital voltage of sensor 0 - Overcurrent on analog voltage of sensor 0. + HI if overcurrent on analog voltage of sensor 0 - Overcurrent on digital voltage of sensor 1. + HI if overcurrent on digital voltage of sensor 1 - Overcurrent on analog voltage of sensor 1. + HI if overcurrent on analog voltage of sensor 1 @@ -132,190 +148,218 @@ - - Current on the digital power supply. + Current on the digital power supply + Current [mA] = AdcVal x 0.0038147 - Current on the analog power supply. + Current on the analog power supply + Current [mA] = AdcVal x 0.0038147 + Reception timestamp Voltage of the digital power supply, sensed at the FEB + Voltage [mV] = AdcVal x 0.116752 + Reception timestamp Voltage of the analog power supply, sensed at the FEB + Voltage [mV] = AdcVal x 0.116752 + Reception timestamp Voltage on the ground sense line from the FEB + Voltage [mV] = AdcVal x 0.038147 + Reception timestamp - Voltage measured at the Temperature diode, relative to Gnd sense + Voltage measured at the M26 temperature diode, relative to GND sense + Voltage [mV] = AdcVal x 0.038147 + Reception timestamp Zero calibration of amplifier, single ended + Voltage [mV] = AdcVal x 0.038147 + Reception timestamp Zero calibration of amplifier, differential + Voltage [mV] = (AdcVal x 0.0012186)-39.932 + Reception timestamp - Discriminator reference voltage A, absolute value + Discr. baseline A + Voltage [mV] = AdcVal x 0.116752 + Reception timestamp - Discriminator reference voltage B, absolute value + Discr. baseline B + Voltage [mV] = AdcVal x 0.116752 + Reception timestamp - Discriminator reference voltage C, absolute value + Discr. baseline C + Voltage [mV] = AdcVal x 0.116752 + Reception timestamp - Discriminator reference voltage D, absolute value + Discr. baseline D + Voltage [mV] = AdcVal x 0.116752 + Reception timestamp - Discriminator reference voltage A, differential 1-2 + Discr. threshold voltage A (w/o baseline) + Voltage [mV] = (AdcVal x 0.0012186)-39.932 + Reception timestamp - Discriminator reference voltage B, differential 1-2 + Discr. threshold voltage B (w/o baseline) + Voltage [mV] = (AdcVal x 0.0012186)-39.932 + Reception timestamp - Discriminator reference voltage C, differential 1-2 + Discr. threshold voltage C (w/o baseline) + Voltage [mV] = (AdcVal x 0.0012186)-39.932 + Reception timestamp - Discriminator reference voltage D, differential 1-2 + Discr. threshold voltage D (w/o baseline) + Voltage [mV] = (AdcVal x 0.0012186)-39.932 + Reception timestamp - Status of CB switches and Overcurrent indicators (read only) - + Status of CB switches and Overcurrent indicators (read only) - Discharge analog sensor power. + Discharge analog sensor power - Discharge digital sensor power.. + Discharge digital sensor power - - Enable analog sensor power. + Analog sensor power enabled - Enable digital sensor power. + Digital sensor power enabled - Enable Reset, Start and Clock signals for current sensor. + Reset, Start and Clock signals enabled for current sensor - Enable JTAG for current sensor. + JTAG enabled for current sensor - - indicates current limit is exceeded for analog sensor power. + + Current limit exceeded for analog sensor power - indicates current limit is exceeded for digital sensor power. + Current limit exceeded for digital sensor power - @@ -348,7 +392,7 @@ - - Read back register values from the microcontroller. + Read back register values from the microcontroller - Set to 1 when you want to read back all registers from the microcontroller. + Set to 1 when you want to read back all registers from the microcontroller - Address of the register that has to be sent to the FPGA. + Address of the register that has to be sent to the FPGA - Set Converter Board switches for current sensor. + Set Converter Board switches for current sensor - Discharge analog sensor power. + Discharge analog sensor power filter caps - Discharge digital sensor power.. + Discharge digital sensor power filter caps - Enable analog sensor power. + Enable analog sensor power - Enable digital sensor power. + Enable digital sensor power - Enable Reset, Start and Clock signals for current sensor. + Enable Reset, Start and Clock signals for current sensor - Enable JTAG for current sensor. + Enable JTAG for current sensor - sets current limit for analog sensor power + Current limit for analog sensor power. Max current [mA] = AdcVal x 0.005035 - sets current limit for digital sensor power + Current limit for digital sensor power. Max current [mA] = AdcVal x 0.005035 - sets clamping voltage for current sensor + Clamping voltage for current sensor (if DAC physically connected to sensor via jumper). + Vclp [mV] = AdcVal x 0.05035 - + Indicates overcurrent situation. Register has to be read from uC for update. + Do not use to trigger latchup protection! - indicates current limit is exceeded for analog sensor power. Register is read from uC. + HI if analog current limit exceeded. - indicates current limit is exceeded for digital sensor power Register is read from uC. + HI if digital current limit exceeded. @@ -433,9 +479,9 @@ - periodically measure all reference voltages + If HI, periodically read out all ADC channels and send the data - + - + - The day the µC firmware was compiled - - - + The day the CB uC firmware was compiled + + Day (1-31) + + + Month (1-12) + + + Year (0-99) + - The time the µC firmware was compiled - - + The time the CB uC firmware was compiled + + Minutes (0-59) + + + Hours (0-23) + - + Miscellaneous configuration options + If HI, enable external control over LED 4 + If HI, enable external control over LED 3 + If HI, enable external control over LED 2 + If HI, enable external control over LED 1 + LED4 on if HI + LED3 on if HI + LED2 on if HI + LED1 on if HI - + shows count of uC register read back operations -- 2.43.0