This commit is contained in:
alan
2019-05-08 11:42:01 +08:00
parent 0ff285882e
commit ea23cf7f6e
2 changed files with 12 additions and 1 deletions
@@ -445,6 +445,7 @@ static SPI_Params spiParams0;
static SPI_Params spiParams1;
static SPI_Transaction ZM_transaction;
static SPI_Transaction LED_transaction;
static SPI_Transaction ADC_transaction;
// static void headstage_spi_init();
static void DAC_spi_init();
@@ -453,6 +454,7 @@ static void LED_spi_init();
// static void headstage_spi_transaction(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi_rxbuf);
// for Z meter
static void DAC_spi_transaction(uint8_t lenght, uint8_t *spi_txbuf, uint8_t *spi_rxbuf);
static void ADC_spi_transaction(uint8_t lenght, uint8_t *spi_txbuf, uint8_t *spi_rxbuf);
static void LED_spi_transaction(uint8_t lenght, uint16_t *spi_txbuf, uint16_t *spi_rxbuf);
/*===================================
@@ -266,7 +266,7 @@ static void ZM_update_instruction_callback(uint8_t ins_type, uint8_t ins_len, ui
static void ADC_SPI(uint8_t ADCin) {
// read ADC data
PIN_setOutputValue(pin_handle, ADC_CS, 0); // ADC_CS HIGH
// ZM_spi_transaction(SPI_ADC_TX_SIZE, spi_ADCrxbuf, spi_ADCrxbuf);
ADC_spi_transaction(SPI_ADC_TX_SIZE, spi_ADCrxbuf, spi_ADCrxbuf);
PIN_setOutputValue(pin_handle, ADC_CS, 1); // ADC_CS HIGH
}
@@ -418,6 +418,15 @@ static void DAC_spi_transaction(uint8_t length, uint8_t *spi_txbuf, uint8_t *spi
SPI_transfer(spiHandle0, &ZM_transaction);
}
static void ADC_spi_transaction(uint8_t length, uint16_t *spi_txbuf, uint16_t *spi_rxbuf){
ADC_transaction.count = length;
ADC_transaction.txBuf = spi_txbuf;
ADC_transaction.rxBuf = spi_rxbuf;
SPI_transfer(spiHandle1, &ADC_transaction)
}
// for LED
static void LED_spi_transaction(uint8_t length, uint16_t *spi_txbuf, uint16_t *spi_rxbuf) {
LED_transaction.count = length;