Skip to content

B
Beam Positoning Monitor - Gateware
Commit cf7f4c19 authored by Lucas Russo's avatar Lucas Russo
Browse files
Options

emb-sw/*: cleanup some files

parent f70e34f3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2287 additions and 2356 deletions
embedded-sw/boards/ml605/board.h
View file @ cf7f4c19
......@@ -67,7 +67,7 @@
#define TICS_ID 0
/*
* IDs of some FMC516 components
* IDs of FMC516 components
*/
#define FMC516_SYS_I2C_ID 0
#define FMC516_VCXO_I2C_ID 1
......
embedded-sw/dbe.vhd
View file @ cf7f4c19
This source diff could not be displayed because it is too large. You can view the blob instead.
embedded-sw/dbe_main.c
View file @ cf7f4c19
#include "gpio.h" // GPIO device funtions
#include "gpio.h" // GPIO device funtions
#include "i2c.h" // I2V device functions
#include "onewire.h" // Onewire device functions
#include "dma.h" // DMA device functions
#include "fmc150.h" // FMC150 device functions
//#include "fmc150.h" // FMC150 device functions
#include "fmc516.h" // FMC516 device functions
#include "uart.h" // UART device functions
#include "memmgr.h" // memory pool functions
......@@ -357,6 +359,54 @@ void button_test()
// pp_printf("> FMC150 CDCE72010 initialized\n");
//}
void print_fmc516_data(unsigned int id)
{
pp_printf("> ADC data0 %d\n", fmc516_read_adc0(DEFAULT_FMC516_ID));
delay(LED_DELAY+32);
pp_printf("> ADC data0 %d\n", fmc516_read_adc0(DEFAULT_FMC516_ID));
delay(LED_DELAY+124);
pp_printf("> ADC data0 %d\n", fmc516_read_adc0(DEFAULT_FMC516_ID));
delay(LED_DELAY+1);
pp_printf("> ADC data0 %d\n", fmc516_read_adc0(DEFAULT_FMC516_ID));
delay(LED_DELAY);
pp_printf("> ADC data0 %d\n", fmc516_read_adc0(DEFAULT_FMC516_ID));
delay(LED_DELAY+12384);
pp_printf("> ADC data1 %d\n", fmc516_read_adc1(DEFAULT_FMC516_ID));
delay(LED_DELAY+32);
pp_printf("> ADC data1 %d\n", fmc516_read_adc1(DEFAULT_FMC516_ID));
delay(LED_DELAY+124);
pp_printf("> ADC data1 %d\n", fmc516_read_adc1(DEFAULT_FMC516_ID));
delay(LED_DELAY+1);
pp_printf("> ADC data1 %d\n", fmc516_read_adc1(DEFAULT_FMC516_ID));
delay(LED_DELAY);
pp_printf("> ADC data1 %d\n", fmc516_read_adc1(DEFAULT_FMC516_ID));
delay(LED_DELAY+12384);
pp_printf("> ADC data2 %d\n", fmc516_read_adc2(DEFAULT_FMC516_ID));
delay(LED_DELAY+32);
pp_printf("> ADC data2 %d\n", fmc516_read_adc2(DEFAULT_FMC516_ID));
delay(LED_DELAY+124);
pp_printf("> ADC data2 %d\n", fmc516_read_adc2(DEFAULT_FMC516_ID));
delay(LED_DELAY+1);
pp_printf("> ADC data2 %d\n", fmc516_read_adc2(DEFAULT_FMC516_ID));
delay(LED_DELAY);
pp_printf("> ADC data2 %d\n", fmc516_read_adc2(DEFAULT_FMC516_ID));
delay(LED_DELAY+456);
pp_printf("> ADC data3 %d\n", fmc516_read_adc3(DEFAULT_FMC516_ID));
delay(LED_DELAY+32);
pp_printf("> ADC data3 %d\n", fmc516_read_adc3(DEFAULT_FMC516_ID));
delay(LED_DELAY+124);
pp_printf("> ADC data3 %d\n", fmc516_read_adc3(DEFAULT_FMC516_ID));
delay(LED_DELAY+1);
pp_printf("> ADC data3 %d\n", fmc516_read_adc3(DEFAULT_FMC516_ID));
delay(LED_DELAY);
pp_printf("> ADC data3 %d\n", fmc516_read_adc3(DEFAULT_FMC516_ID));
delay(LED_DELAY+79);
}
void fmc516_test()
{
int i;
......@@ -398,17 +448,17 @@ void fmc516_test()
i, fmc516_isla216_get_chipver(i));
}
//for (i = 0; i < FMC516_NUM_ISLA216; ++i) {
// pp_printf("> FMC516_ISLA216_ADC%d test mode off\n", i);
// fmc516_isla216_write_byte(ISLA216_OUT_TESTMODE(ISLA216_OUT_TESTIO_OFF),
// ISLA216_TESTIO_REG, i);
//}
for (i = 0; i < FMC516_NUM_ISLA216; ++i) {
fmc516_isla216_test_ramp(i);
pp_printf("> FMC516_ISLA216_ADC%d: ramp test enabled!\n", i);
pp_printf("> FMC516_ISLA216_ADC%d test mode off\n", i);
fmc516_isla216_write_byte(ISLA216_OUT_TESTMODE(ISLA216_OUT_TESTIO_OFF),
ISLA216_TESTIO_REG, i);
}
//for (i = 0; i < FMC516_NUM_ISLA216; ++i) {
// fmc516_isla216_test_ramp(i);
// pp_printf("> FMC516_ISLA216_ADC%d: ramp test enabled!\n", i);
//}
//for (i = 0; i < FMC516_NUM_ISLA216; ++i) {
// fmc516_isla216_test_midscale(i);
// pp_printf("> FMC516_ISLA216_ADC%d: test miscale enabled!\n", i);
......@@ -419,51 +469,9 @@ void fmc516_test()
fmc516_isla216_read_byte(ISLA216_TESTIO_REG, i));
}
pp_printf("> ADC data0 %d\n", fmc516_read_adc0(DEFAULT_FMC516_ID));
delay(LED_DELAY+32);
pp_printf("> ADC data0 %d\n", fmc516_read_adc0(DEFAULT_FMC516_ID));
delay(LED_DELAY+124);
pp_printf("> ADC data0 %d\n", fmc516_read_adc0(DEFAULT_FMC516_ID));
delay(LED_DELAY+1);
pp_printf("> ADC data0 %d\n", fmc516_read_adc0(DEFAULT_FMC516_ID));
delay(LED_DELAY);
pp_printf("> ADC data0 %d\n", fmc516_read_adc0(DEFAULT_FMC516_ID));
delay(LED_DELAY+12384);
pp_printf("> ADC data1 %d\n", fmc516_read_adc1(DEFAULT_FMC516_ID));
delay(LED_DELAY+32);
pp_printf("> ADC data1 %d\n", fmc516_read_adc1(DEFAULT_FMC516_ID));
delay(LED_DELAY+124);
pp_printf("> ADC data1 %d\n", fmc516_read_adc1(DEFAULT_FMC516_ID));
delay(LED_DELAY+1);
pp_printf("> ADC data1 %d\n", fmc516_read_adc1(DEFAULT_FMC516_ID));
delay(LED_DELAY);
pp_printf("> ADC data1 %d\n", fmc516_read_adc1(DEFAULT_FMC516_ID));
delay(LED_DELAY+12384);
pp_printf("> ADC data2 %d\n", fmc516_read_adc2(DEFAULT_FMC516_ID));
delay(LED_DELAY+32);
pp_printf("> ADC data2 %d\n", fmc516_read_adc2(DEFAULT_FMC516_ID));
delay(LED_DELAY+124);
pp_printf("> ADC data2 %d\n", fmc516_read_adc2(DEFAULT_FMC516_ID));
delay(LED_DELAY+1);
pp_printf("> ADC data2 %d\n", fmc516_read_adc2(DEFAULT_FMC516_ID));
delay(LED_DELAY);
pp_printf("> ADC data2 %d\n", fmc516_read_adc2(DEFAULT_FMC516_ID));
delay(LED_DELAY+456);
pp_printf("> ADC data3 %d\n", fmc516_read_adc3(DEFAULT_FMC516_ID));
delay(LED_DELAY+32);
pp_printf("> ADC data3 %d\n", fmc516_read_adc3(DEFAULT_FMC516_ID));
delay(LED_DELAY+124);
pp_printf("> ADC data3 %d\n", fmc516_read_adc3(DEFAULT_FMC516_ID));
delay(LED_DELAY+1);
pp_printf("> ADC data3 %d\n", fmc516_read_adc3(DEFAULT_FMC516_ID));
delay(LED_DELAY);
pp_printf("> ADC data3 %d\n", fmc516_read_adc3(DEFAULT_FMC516_ID));
delay(LED_DELAY+79);
//print_fmc516_data(DEFAULT_FMC516_ID);
//dbg_print("> initilizing fmc516 delays\n");
dbg_print("> initilizing fmc516 delays\n");
fmc516_sweep_delays(DEFAULT_FMC516_ID);
pp_printf("> test finished...\n");
......
embedded-sw/dev/spi.c
View file @ cf7f4c19
......@@ -99,7 +99,6 @@ void oc_spi_config(unsigned int id, int ass, int rx_neg, int tx_neg,
// For use only with spi three-wire mode
int oc_spi_three_mode_tx(unsigned int id, int ss, int nbits, uint32_t in)
{
dbg_print("> oc_spi_three_mode_tx...\n");
// Write configuration to SPI core. SPI_CTRL_DIR = 1
spi[id]->CTRL = spi_config[id] | SPI_CTRL_DIR | SPI_CTRL_CHAR_LEN(nbits);
......@@ -117,7 +116,7 @@ int oc_spi_three_mode_tx(unsigned int id, int ss, int nbits, uint32_t in)
spi[id]->CTRL |= SPI_CTRL_GO_BSY;
// Wait for completion
dbg_print("> oc_spi_three_mode_tx: waiting to spi...\n");
dbg_print("> waiting for spi...\n");
while(oc_spi_poll(id))
delay(SPI_DELAY);
......@@ -132,7 +131,6 @@ int oc_spi_three_mode_tx(unsigned int id, int ss, int nbits, uint32_t in)
// For use only with spi three-wire mode
int oc_spi_three_mode_rx(unsigned int id, int ss, int nbits, uint32_t *out)
{
dbg_print("> oc_spi_three_mode_rx...\n");
// Write configuration to SPI core. SPI_CTRL_DIR = 0
spi[id]->CTRL = spi_config[id] | SPI_CTRL_CHAR_LEN(nbits);
spi[id]->SS = (1 << ss);
......@@ -144,18 +142,16 @@ int oc_spi_three_mode_rx(unsigned int id, int ss, int nbits, uint32_t *out)
spi[id]->CTRL |= SPI_CTRL_GO_BSY;
// Wait for reception
dbg_print("> oc_spi_three_mode_rx: waiting to spi...\n");
dbg_print("> waiting for spi...\n");
while(oc_spi_poll(id))
delay(SPI_DELAY);
delay(SPI_DELAY);
dbg_print("> spi[id]->TX0: 0x%8X\n", spi[id]->TX0);
dbg_print("> spi[id]->RX0: 0x%8X\n", spi[id]->RX0);
*out = spi[id]->RX0;
dbg_print("> *out: 0x%8X\n", *out);
dbg_print("> spi[id]->TX0: 0x%8X\n", spi[id]->TX0);
dbg_print("> spi[id]->RX0: 0x%8X\n", spi[id]->RX0);
return 0;
}
......@@ -164,7 +160,6 @@ int oc_spi_txrx(unsigned int id, int ss, int nbits, uint32_t in, uint32_t *out)
{
uint32_t rval;
dbg_print("> oc_spi_txrx...\n");
// Avoid breaking the code when just issuing a read command (out can be null)
if (!out)
out = &rval;
......@@ -179,7 +174,7 @@ int oc_spi_txrx(unsigned int id, int ss, int nbits, uint32_t in, uint32_t *out)
spi[id]->SS = (1 << ss);
spi[id]->CTRL |= SPI_CTRL_GO_BSY;
dbg_print("> oc_spi_txrx: waiting to spi...\n");
dbg_print("> waiting for spi...\n");
while(oc_spi_poll(id))
delay(SPI_DELAY);
......
embedded-sw/fmc/fmc516/fmc516.c
View file @ cf7f4c19
This diff is collapsed.
embedded-sw/include/fmc/fmc516/fmc516.h
View file @ cf7f4c19
......@@ -25,6 +25,7 @@ void fmc516_clk_sel(unsigned int id, int ext_clk);
void fmc516_led0(unsigned int id, int on);
void fmc516_led1(unsigned int id, int on);
void fmc516_reset_adcs(unsigned int id);
void fmc516_resetdiv_adcs(unsigned int id);
void fmc516_update_clk_dly(unsigned int id);
void fmc516_update_data_dly(unsigned int id);
......@@ -41,3 +42,5 @@ uint32_t fmc516_read_adc1(unsigned int id);
uint32_t fmc516_read_adc2(unsigned int id);
uint32_t fmc516_read_adc3(unsigned int id);
void fmc516_fe_dly(unsigned int id, int ch, int fe_dly_d1, int fe_dly_d2);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment